diff --git a/Makefile b/Makefile index 4d87fa23..bcb6cffc 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's/ /\@/g') TM_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::') # grab everything after the space in "github.com/cometbft/cometbft v0.34.7" DOCKER := $(shell which docker) BUILDDIR ?= $(CURDIR)/build -TEST_DOCKER_REPO=cosmos/contrib-atomeonetest +TEST_DOCKER_REPO=cosmos/contrib-atomonetest GO_SYSTEM_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1-2) REQUIRE_GO_VERSION = 1.21 diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index c58452ed..1790de67 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -66,19 +66,19 @@ Once the automated releases process is completed, please add any missing informa With every release, the `goreleaser` tool will create a file with all the build artifact checksums and upload it alongside the artifacts. The file is called `SHA256SUMS-{{.version}}.txt` and contains the following: ``` -098b00ed78ca01456c388d7f1f22d09a93927d7a234429681071b45d94730a05 atomeoned_0.0.4_windows_arm64.exe -15b2b9146d99426a64c19d219234cd0fa725589c7dc84e9d4dc4d531ccc58bec atomeoned_0.0.4_darwin_amd64 -604912ee7800055b0a1ac36ed31021d2161d7404cea8db8776287eb512cd67a9 atomeoned_0.0.4_darwin_arm64 -76e5ff7751d66807ee85bc5301484d0f0bcc5c90582d4ba1692acefc189392be atomeoned_0.0.4_linux_arm64 -bcbca82da2cb2387ad6d24c1f6401b229a9b4752156573327250d37e5cc9bb1c atomeoned_0.0.4_windows_amd64.exe -f39552cbfcfb2b06f1bd66fd324af54ac9ee06625cfa652b71eba1869efe8670 atomeoned_0.0.4_linux_amd64 +098b00ed78ca01456c388d7f1f22d09a93927d7a234429681071b45d94730a05 atomoned_0.0.4_windows_arm64.exe +15b2b9146d99426a64c19d219234cd0fa725589c7dc84e9d4dc4d531ccc58bec atomoned_0.0.4_darwin_amd64 +604912ee7800055b0a1ac36ed31021d2161d7404cea8db8776287eb512cd67a9 atomoned_0.0.4_darwin_arm64 +76e5ff7751d66807ee85bc5301484d0f0bcc5c90582d4ba1692acefc189392be atomoned_0.0.4_linux_arm64 +bcbca82da2cb2387ad6d24c1f6401b229a9b4752156573327250d37e5cc9bb1c atomoned_0.0.4_windows_amd64.exe +f39552cbfcfb2b06f1bd66fd324af54ac9ee06625cfa652b71eba1869efe8670 atomoned_0.0.4_linux_amd64 ``` ### Tagging Procedure **Important**: _**Always create tags from your local machine**_ since all release tags should be signed and annotated. -Using Github UI will create a `lightweight` tag, so it's possible that `atomeoned version` returns a commit hash, instead of a tag. -This is important because most operators build from source, and having incorrect information when you run `make install && atomeoned version` raises confusion. +Using Github UI will create a `lightweight` tag, so it's possible that `atomoned version` returns a commit hash, instead of a tag. +This is important because most operators build from source, and having incorrect information when you run `make install && atomoned version` raises confusion. The following steps are the default for tagging a specific branch commit using git on your local machine. Usually, release branches are labeled `release/v*`: diff --git a/app/app_test.go b/app/app_test.go index fd60b659..0758c5f5 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -13,6 +13,7 @@ import ( atomone "github.com/atomone-hub/atomone/app" atomonehelpers "github.com/atomone-hub/atomone/app/helpers" + govtypes "github.com/atomone-hub/atomone/x/gov/types" ) type EmptyAppOptions struct{} diff --git a/app/gov_handlers.go b/app/gov_handlers.go new file mode 100644 index 00000000..6fcdbb82 --- /dev/null +++ b/app/gov_handlers.go @@ -0,0 +1,294 @@ +package atomone + +import ( + "fmt" + "os" + "path/filepath" + "strings" + + "github.com/spf13/cobra" + "github.com/spf13/pflag" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/version" + paramscutils "github.com/cosmos/cosmos-sdk/x/params/client/utils" + paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" + "github.com/cosmos/cosmos-sdk/x/upgrade/plan" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + govclient "github.com/atomone-hub/atomone/x/gov/client" + "github.com/atomone-hub/atomone/x/gov/client/cli" + govv1beta1 "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +) + +var ( + paramsChangeProposalHandler = govclient.NewProposalHandler(newSubmitParamChangeProposalTxCmd) + upgradeProposalHandler = govclient.NewProposalHandler(newCmdSubmitLegacyUpgradeProposal) + cancelUpgradeProposalHandler = govclient.NewProposalHandler(newCmdSubmitLegacyCancelUpgradeProposal) +) + +func init() { + // Proposal types are registered within their specific module in the SDK, but + // using the legacy gov module. To register them in the atomone gov module, + // we need to do it here. + govv1beta1.RegisterProposalType(paramproposal.ProposalTypeChange) + govv1beta1.RegisterProposalType(upgradetypes.ProposalTypeSoftwareUpgrade) + govv1beta1.RegisterProposalType(upgradetypes.ProposalTypeCancelSoftwareUpgrade) +} + +// NewSubmitParamChangeProposalTxCmd returns a CLI command handler for creating +// a parameter change proposal governance transaction. +// +// NOTE: copy of x/params/client.newSubmitParamChangeProposalTxCmd() except +// that it creates a atomone.gov.MsgSubmitProposal instead of a +// cosmos.gov.MsgSubmitProposal. +func newSubmitParamChangeProposalTxCmd() *cobra.Command { + return &cobra.Command{ + Use: "param-change [proposal-file]", + Args: cobra.ExactArgs(1), + Short: "Submit a parameter change proposal", + Long: strings.TrimSpace( + fmt.Sprintf(`Submit a parameter proposal along with an initial deposit. +The proposal details must be supplied via a JSON file. For values that contains +objects, only non-empty fields will be updated. + +IMPORTANT: Currently parameter changes are evaluated but not validated, so it is +very important that any "value" change is valid (ie. correct type and within bounds) +for its respective parameter, eg. "MaxValidators" should be an integer and not a decimal. + +Proper vetting of a parameter change proposal should prevent this from happening +(no deposits should occur during the governance process), but it should be noted +regardless. + +Example: +$ %s tx gov submit-proposal param-change --from= + +Where proposal.json contains: + +{ + "title": "Staking Param Change", + "description": "Update max validators", + "changes": [ + { + "subspace": "staking", + "key": "MaxValidators", + "value": 105 + } + ], + "deposit": "1000stake" +} +`, + version.AppName, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + proposal, err := paramscutils.ParseParamChangeProposalJSON(clientCtx.LegacyAmino, args[0]) + if err != nil { + return err + } + + from := clientCtx.GetFromAddress() + content := paramproposal.NewParameterChangeProposal( + proposal.Title, proposal.Description, proposal.Changes.ToParamChanges(), + ) + + deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit) + if err != nil { + return err + } + + msg, err := govv1beta1.NewMsgSubmitProposal(content, deposit, from) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } +} + +const ( + // Deprecated: only used for v1beta1 legacy proposals. + FlagUpgradeHeight = "upgrade-height" + // Deprecated: only used for v1beta1 legacy proposals. + FlagUpgradeInfo = "upgrade-info" + FlagNoValidate = "no-validate" + FlagDaemonName = "daemon-name" +) + +// newCmdSubmitLegacyUpgradeProposal implements a command handler for submitting a software upgrade proposal transaction. +// Deprecated: please use NewCmdSubmitUpgradeProposal instead.ck +// +// NOTE: copy of x/upgrade/client.NewCmdSubmitUpgradeProposal() except +// that it creates a atomone.gov.MsgSubmitProposal instead of a +// cosmos.gov.MsgSubmitProposal. +func newCmdSubmitLegacyUpgradeProposal() *cobra.Command { + cmd := &cobra.Command{ + Use: "software-upgrade [name] (--upgrade-height [height]) (--upgrade-info [info]) [flags]", + Args: cobra.ExactArgs(1), + Short: "Submit a software upgrade proposal", + Long: "Submit a software upgrade along with an initial deposit.\n" + + "Please specify a unique name and height for the upgrade to take effect.\n" + + "You may include info to reference a binary download link, in a format compatible with: https://github.com/cosmos/cosmos-sdk/tree/main/cosmovisor", + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + name := args[0] + content, err := parseArgsToContent(cmd.Flags(), name) + if err != nil { + return err + } + noValidate, err := cmd.Flags().GetBool(FlagNoValidate) + if err != nil { + return err + } + if !noValidate { + prop := content.(*upgradetypes.SoftwareUpgradeProposal) //nolint:staticcheck // we are intentionally using a deprecated proposal type. + var daemonName string + if daemonName, err = cmd.Flags().GetString(FlagDaemonName); err != nil { + return err + } + var planInfo *plan.Info + if planInfo, err = plan.ParseInfo(prop.Plan.Info); err != nil { + return err + } + if err = planInfo.ValidateFull(daemonName); err != nil { + return err + } + } + + from := clientCtx.GetFromAddress() + + depositStr, err := cmd.Flags().GetString(cli.FlagDeposit) + if err != nil { + return err + } + deposit, err := sdk.ParseCoinsNormalized(depositStr) + if err != nil { + return err + } + + msg, err := govv1beta1.NewMsgSubmitProposal(content, deposit, from) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + cmd.Flags().String(cli.FlagTitle, "", "title of proposal") + cmd.Flags().String(cli.FlagDescription, "", "description of proposal") //nolint:staticcheck // we are intentionally using a deprecated flag here. + cmd.Flags().String(cli.FlagDeposit, "", "deposit of proposal") + cmd.Flags().Int64(FlagUpgradeHeight, 0, "The height at which the upgrade must happen") + cmd.Flags().String(FlagUpgradeInfo, "", "Info for the upgrade plan such as new version download urls, etc.") + cmd.Flags().Bool(FlagNoValidate, false, "Skip validation of the upgrade info") + cmd.Flags().String(FlagDaemonName, getDefaultDaemonName(), "The name of the executable being upgraded (for upgrade-info validation). Default is the DAEMON_NAME env var if set, or else this executable") + + return cmd +} + +// newCmdSubmitLegacyCancelUpgradeProposal implements a command handler for submitting a software upgrade cancel proposal transaction. +// Deprecated: please use NewCmdSubmitCancelUpgradeProposal instead. +// +// NOTE: copy of x/upgrade/client.newcmdsubmitcancelupgradeproposal() except +// that it creates a atomone.gov.msgsubmitproposal instead of a +// cosmos.gov.msgsubmitproposal. +func newCmdSubmitLegacyCancelUpgradeProposal() *cobra.Command { + cmd := &cobra.Command{ + Use: "cancel-software-upgrade [flags]", + Args: cobra.ExactArgs(0), + Short: "Cancel the current software upgrade proposal", + Long: "Cancel a software upgrade along with an initial deposit.", + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + from := clientCtx.GetFromAddress() + + depositStr, err := cmd.Flags().GetString(cli.FlagDeposit) + if err != nil { + return err + } + + deposit, err := sdk.ParseCoinsNormalized(depositStr) + if err != nil { + return err + } + + title, err := cmd.Flags().GetString(cli.FlagTitle) + if err != nil { + return err + } + + description, err := cmd.Flags().GetString(cli.FlagDescription) //nolint:staticcheck // we are intentionally using a deprecated flag here. + if err != nil { + return err + } + + content := upgradetypes.NewCancelSoftwareUpgradeProposal(title, description) + + msg, err := govv1beta1.NewMsgSubmitProposal(content, deposit, from) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + cmd.Flags().String(cli.FlagTitle, "", "title of proposal") + cmd.Flags().String(cli.FlagDescription, "", "description of proposal") //nolint:staticcheck // we are intentionally using a deprecated flag here. + cmd.Flags().String(cli.FlagDeposit, "", "deposit of proposal") + cmd.MarkFlagRequired(cli.FlagTitle) //nolint:errcheck + cmd.MarkFlagRequired(cli.FlagDescription) //nolint:staticcheck,errcheck // we are intentionally using a deprecated flag here. + + return cmd +} + +// getDefaultDaemonName gets the default name to use for the daemon. +// If a DAEMON_NAME env var is set, that is used. +// Otherwise, the last part of the currently running executable is used. +func getDefaultDaemonName() string { + // DAEMON_NAME is specifically used here to correspond with the Cosmovisor setup env vars. + name := os.Getenv("DAEMON_NAME") + if len(name) == 0 { + _, name = filepath.Split(os.Args[0]) + } + return name +} + +func parseArgsToContent(fs *pflag.FlagSet, name string) (govv1beta1.Content, error) { + title, err := fs.GetString(cli.FlagTitle) + if err != nil { + return nil, err + } + + description, err := fs.GetString(cli.FlagDescription) //nolint:staticcheck // we are intentionally using a deprecated flag here. + if err != nil { + return nil, err + } + + height, err := fs.GetInt64(FlagUpgradeHeight) + if err != nil { + return nil, err + } + + info, err := fs.GetString(FlagUpgradeInfo) + if err != nil { + return nil, err + } + + plan := upgradetypes.Plan{Name: name, Height: height, Info: info} + content := upgradetypes.NewSoftwareUpgradeProposal(title, description, plan) + return content, nil +} diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 347835e7..b5d0bb84 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -250,8 +250,8 @@ func NewAppKeeper( govRouter := govv1beta1.NewRouter() govRouter. AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). - AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper)). - AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(appKeepers.UpgradeKeeper)) + AddRoute(paramproposal.RouterKey, govv1beta1.WrapSDKHandler(params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper))). + AddRoute(upgradetypes.RouterKey, govv1beta1.WrapSDKHandler(upgrade.NewSoftwareUpgradeProposalHandler(appKeepers.UpgradeKeeper))) // Set legacy router for backwards compatibility with gov v1beta1 appKeepers.GovKeeper.SetLegacyRouter(govRouter) diff --git a/app/modules.go b/app/modules.go index c1444a25..69e40921 100644 --- a/app/modules.go +++ b/app/modules.go @@ -32,14 +32,12 @@ import ( "github.com/atomone-hub/atomone/x/mint" minttypes "github.com/atomone-hub/atomone/x/mint/types" sdkparams "github.com/atomone-hub/atomone/x/params" - paramsclient "github.com/atomone-hub/atomone/x/params/client" paramstypes "github.com/atomone-hub/atomone/x/params/types" "github.com/atomone-hub/atomone/x/slashing" slashingtypes "github.com/atomone-hub/atomone/x/slashing/types" "github.com/atomone-hub/atomone/x/staking" stakingtypes "github.com/atomone-hub/atomone/x/staking/types" "github.com/atomone-hub/atomone/x/upgrade" - upgradeclient "github.com/atomone-hub/atomone/x/upgrade/client" upgradetypes "github.com/atomone-hub/atomone/x/upgrade/types" ) @@ -67,9 +65,9 @@ var ModuleBasics = module.NewBasicManager( gov.NewAppModuleBasic( // TODO remove since no compat needed with old gov handler system? []govclient.ProposalHandler{ - paramsclient.ProposalHandler, - upgradeclient.LegacyProposalHandler, - upgradeclient.LegacyCancelProposalHandler, + paramsChangeProposalHandler, + upgradeProposalHandler, + cancelUpgradeProposalHandler, }, ), sdkparams.AppModuleBasic{}, diff --git a/contrib/githooks/pre-commit b/contrib/githooks/pre-commit index eab16280..9db39478 100755 --- a/contrib/githooks/pre-commit +++ b/contrib/githooks/pre-commit @@ -31,7 +31,7 @@ if [[ $STAGED_GO_FILES != "" ]]; then gofmt -w -s $file misspell -w $file - goimports -w -local github.com/atomeone-hub/atomone $file + goimports -w -local github.com/atomone-hub/atomone $file git add $file done diff --git a/contrib/githooks/precommit b/contrib/githooks/precommit index 8a69ba9c..9db39478 100644 --- a/contrib/githooks/precommit +++ b/contrib/githooks/precommit @@ -31,7 +31,7 @@ if [[ $STAGED_GO_FILES != "" ]]; then gofmt -w -s $file misspell -w $file - goimports -w -local github.com/atomeone-hub/atomeone $file + goimports -w -local github.com/atomone-hub/atomone $file git add $file done diff --git a/go.mod b/go.mod index 1f791d12..48be39c9 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,6 @@ require ( github.com/tidwall/btree v1.6.0 golang.org/x/crypto v0.21.0 golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb - golang.org/x/sync v0.6.0 google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 google.golang.org/protobuf v1.33.0 gotest.tools/v3 v3.5.1 @@ -199,6 +198,7 @@ require ( golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.22.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect + golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/go.sum b/go.sum index bce0d3ea..e2c6b2c2 100644 --- a/go.sum +++ b/go.sum @@ -203,6 +203,8 @@ cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= +cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= +cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= diff --git a/proto/atomone/gov/module/v1/module.proto b/proto/atomone/gov/module/v1/module.proto index 1a981c6a..61d5b5c5 100644 --- a/proto/atomone/gov/module/v1/module.proto +++ b/proto/atomone/gov/module/v1/module.proto @@ -17,4 +17,4 @@ message Module { // authority defines the custom module authority. If not set, defaults to the // governance module. string authority = 2; -} \ No newline at end of file +} diff --git a/x/gov/abci.go b/x/gov/abci.go index e4db2e36..a82182f6 100644 --- a/x/gov/abci.go +++ b/x/gov/abci.go @@ -5,6 +5,10 @@ import ( "time" "github.com/cosmos/cosmos-sdk/telemetry" +<<<<<<< HEAD +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main "github.com/atomone-hub/atomone/baseapp" sdk "github.com/atomone-hub/atomone/types" diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index df6508ef..0a958d18 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -4,10 +4,29 @@ import ( "testing" "time" +<<<<<<< HEAD +======= + "github.com/stretchr/testify/require" + + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + + "cosmossdk.io/math" + + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/cosmos/cosmos-sdk/x/staking" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov" "github.com/atomone-hub/atomone/x/gov/keeper" "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +<<<<<<< HEAD "cosmossdk.io/math" simtestutil "github.com/atomone-hub/atomone/testutil/sims" @@ -20,6 +39,8 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/require" +======= +>>>>>>> main ) func TestTickExpiredDepositPeriod(t *testing.T) { diff --git a/x/gov/client/cli/prompt.go b/x/gov/client/cli/prompt.go index 0fddbb60..c1ed5f4e 100644 --- a/x/gov/client/cli/prompt.go +++ b/x/gov/client/cli/prompt.go @@ -12,11 +12,20 @@ import ( "github.com/manifoldco/promptui" "github.com/spf13/cobra" +<<<<<<< HEAD "github.com/atomone-hub/atomone/client" "github.com/atomone-hub/atomone/client/flags" "github.com/atomone-hub/atomone/codec" sdk "github.com/atomone-hub/atomone/types" authtypes "github.com/atomone-hub/atomone/x/auth/types" +======= + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" ) @@ -34,6 +43,7 @@ var suggestedProposalTypes = []proposalType{ }, { Name: "community-pool-spend", +<<<<<<< HEAD MsgType: "/atomone.distribution.v1beta1.MsgCommunityPoolSpend", }, { @@ -43,6 +53,17 @@ var suggestedProposalTypes = []proposalType{ { Name: "cancel-software-upgrade", MsgType: "/atomone.upgrade.v1beta1.MsgCancelUpgrade", +======= + MsgType: "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend", + }, + { + Name: "software-upgrade", + MsgType: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade", + }, + { + Name: "cancel-software-upgrade", + MsgType: "/cosmos.upgrade.v1beta1.MsgCancelUpgrade", +>>>>>>> main }, { Name: proposalOther, diff --git a/x/gov/client/cli/query.go b/x/gov/client/cli/query.go index fb6a9c53..5513546d 100644 --- a/x/gov/client/cli/query.go +++ b/x/gov/client/cli/query.go @@ -7,11 +7,19 @@ import ( "github.com/spf13/cobra" +<<<<<<< HEAD "github.com/cosmos/cosmos-sdk/version" "github.com/atomone-hub/atomone/client" "github.com/atomone-hub/atomone/client/flags" sdk "github.com/atomone-hub/atomone/types" +======= + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/version" + +>>>>>>> main gcutils "github.com/atomone-hub/atomone/x/gov/client/utils" "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" diff --git a/x/gov/client/cli/query_test.go b/x/gov/client/cli/query_test.go index 4cb72b30..c5636f74 100644 --- a/x/gov/client/cli/query_test.go +++ b/x/gov/client/cli/query_test.go @@ -4,8 +4,14 @@ import ( "fmt" "strings" +<<<<<<< HEAD "github.com/atomone-hub/atomone/client/flags" "github.com/atomone-hub/atomone/testutil" +======= + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/testutil" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/client/cli" ) diff --git a/x/gov/client/cli/tx.go b/x/gov/client/cli/tx.go index 45d2860f..c706f8c6 100644 --- a/x/gov/client/cli/tx.go +++ b/x/gov/client/cli/tx.go @@ -7,12 +7,21 @@ import ( "github.com/spf13/cobra" +<<<<<<< HEAD "github.com/cosmos/cosmos-sdk/version" "github.com/atomone-hub/atomone/client" "github.com/atomone-hub/atomone/client/flags" "github.com/atomone-hub/atomone/client/tx" sdk "github.com/atomone-hub/atomone/types" +======= + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/version" + +>>>>>>> main govutils "github.com/atomone-hub/atomone/x/gov/client/utils" "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" @@ -99,7 +108,11 @@ Where proposal.json contains: // array of proto-JSON-encoded sdk.Msgs "messages": [ { +<<<<<<< HEAD "@type": "/atomone.bank.v1beta1.MsgSend", +======= + "@type": "/cosmos.bank.v1beta1.MsgSend", +>>>>>>> main "from_address": "cosmos1...", "to_address": "cosmos1...", "amount":[{"denom": "stake","amount": "10"}] diff --git a/x/gov/client/cli/tx_test.go b/x/gov/client/cli/tx_test.go index 70c822ee..7cccfb1c 100644 --- a/x/gov/client/cli/tx_test.go +++ b/x/gov/client/cli/tx_test.go @@ -7,6 +7,7 @@ import ( "io" "testing" +<<<<<<< HEAD abci "github.com/cometbft/cometbft/abci/types" rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" "github.com/cosmos/gogoproto/proto" @@ -20,6 +21,23 @@ import ( sdk "github.com/atomone-hub/atomone/types" testutilmod "github.com/atomone-hub/atomone/types/module/testutil" authtypes "github.com/atomone-hub/atomone/x/auth/types" +======= + "github.com/cosmos/gogoproto/proto" + "github.com/stretchr/testify/suite" + + abci "github.com/cometbft/cometbft/abci/types" + rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/crypto/keyring" + "github.com/cosmos/cosmos-sdk/testutil" + clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" + sdk "github.com/cosmos/cosmos-sdk/types" + testutilmod "github.com/cosmos/cosmos-sdk/types/module/testutil" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov" "github.com/atomone-hub/atomone/x/gov/client/cli" govclitestutil "github.com/atomone-hub/atomone/x/gov/client/testutil" diff --git a/x/gov/client/cli/util.go b/x/gov/client/cli/util.go index 31bffae8..3645220d 100644 --- a/x/gov/client/cli/util.go +++ b/x/gov/client/cli/util.go @@ -8,9 +8,16 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" +<<<<<<< HEAD "github.com/atomone-hub/atomone/client" "github.com/atomone-hub/atomone/codec" sdk "github.com/atomone-hub/atomone/types" +======= + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main govutils "github.com/atomone-hub/atomone/x/gov/client/utils" govv1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) diff --git a/x/gov/client/cli/util_test.go b/x/gov/client/cli/util_test.go index bfe81718..5f0034a4 100644 --- a/x/gov/client/cli/util_test.go +++ b/x/gov/client/cli/util_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" +<<<<<<< HEAD "github.com/atomone-hub/atomone/client" "github.com/atomone-hub/atomone/codec" codectypes "github.com/atomone-hub/atomone/codec/types" @@ -23,6 +24,19 @@ import ( v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" stakingtypes "github.com/atomone-hub/atomone/x/staking/types" +======= + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/testutil" + "github.com/cosmos/cosmos-sdk/testutil/testdata" + sdk "github.com/cosmos/cosmos-sdk/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +>>>>>>> main ) func TestParseSubmitLegacyProposal(t *testing.T) { @@ -139,13 +153,21 @@ func TestParseSubmitProposal(t *testing.T) { { "messages": [ { +<<<<<<< HEAD "@type": "/atomone.bank.v1beta1.MsgSend", +======= + "@type": "/cosmos.bank.v1beta1.MsgSend", +>>>>>>> main "from_address": "%s", "to_address": "%s", "amount":[{"denom": "stake","amount": "10"}] }, { +<<<<<<< HEAD "@type": "/atomone.staking.v1beta1.MsgDelegate", +======= + "@type": "/cosmos.staking.v1beta1.MsgDelegate", +>>>>>>> main "delegator_address": "%s", "validator_address": "%s", "amount":{"denom": "stake","amount": "10"} diff --git a/x/gov/client/testutil/helpers.go b/x/gov/client/testutil/helpers.go index 423778c0..d220c715 100644 --- a/x/gov/client/testutil/helpers.go +++ b/x/gov/client/testutil/helpers.go @@ -3,11 +3,20 @@ package testutil import ( "fmt" +<<<<<<< HEAD "github.com/atomone-hub/atomone/client" "github.com/atomone-hub/atomone/client/flags" "github.com/atomone-hub/atomone/testutil" clitestutil "github.com/atomone-hub/atomone/testutil/cli" sdk "github.com/atomone-hub/atomone/types" +======= + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/testutil" + clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main govcli "github.com/atomone-hub/atomone/x/gov/client/cli" ) diff --git a/x/gov/client/utils/query.go b/x/gov/client/utils/query.go index bc6e395c..71d1d90d 100644 --- a/x/gov/client/utils/query.go +++ b/x/gov/client/utils/query.go @@ -3,9 +3,16 @@ package utils import ( "fmt" +<<<<<<< HEAD "github.com/atomone-hub/atomone/client" sdk "github.com/atomone-hub/atomone/types" authtx "github.com/atomone-hub/atomone/x/auth/tx" +======= + "github.com/cosmos/cosmos-sdk/client" + sdk "github.com/cosmos/cosmos-sdk/types" + authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" diff --git a/x/gov/client/utils/query_test.go b/x/gov/client/utils/query_test.go index 5b7ad608..b3f21308 100644 --- a/x/gov/client/utils/query_test.go +++ b/x/gov/client/utils/query_test.go @@ -4,6 +4,7 @@ import ( "context" "testing" +<<<<<<< HEAD "github.com/cometbft/cometbft/rpc/client/mock" coretypes "github.com/cometbft/cometbft/rpc/core/types" tmtypes "github.com/cometbft/cometbft/types" @@ -12,6 +13,18 @@ import ( "github.com/atomone-hub/atomone/client" sdk "github.com/atomone-hub/atomone/types" moduletestutil "github.com/atomone-hub/atomone/types/module/testutil" +======= + "github.com/stretchr/testify/require" + + "github.com/cometbft/cometbft/rpc/client/mock" + coretypes "github.com/cometbft/cometbft/rpc/core/types" + tmtypes "github.com/cometbft/cometbft/types" + + "github.com/cosmos/cosmos-sdk/client" + sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov" "github.com/atomone-hub/atomone/x/gov/client/utils" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" diff --git a/x/gov/codec/cdc.go b/x/gov/codec/cdc.go index f39e8685..48700c06 100644 --- a/x/gov/codec/cdc.go +++ b/x/gov/codec/cdc.go @@ -1,9 +1,15 @@ package codec import ( +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec" cryptocodec "github.com/atomone-hub/atomone/crypto/codec" sdk "github.com/atomone-hub/atomone/types" +======= + "github.com/cosmos/cosmos-sdk/codec" + cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) var ( diff --git a/x/gov/common_test.go b/x/gov/common_test.go index 3155092f..5a14d555 100644 --- a/x/gov/common_test.go +++ b/x/gov/common_test.go @@ -16,6 +16,7 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD "github.com/atomone-hub/atomone/crypto/keys/ed25519" cryptotypes "github.com/atomone-hub/atomone/crypto/types" "github.com/atomone-hub/atomone/runtime" @@ -30,8 +31,24 @@ import ( "github.com/atomone-hub/atomone/x/gov/types/v1beta1" stakingkeeper "github.com/atomone-hub/atomone/x/staking/keeper" stakingtypes "github.com/atomone-hub/atomone/x/staking/types" +======= + "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" + "github.com/cosmos/cosmos-sdk/runtime" + "github.com/cosmos/cosmos-sdk/testutil/configurator" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/keeper" + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) var ( diff --git a/x/gov/genesis.go b/x/gov/genesis.go index 702ef678..1fa61b3c 100644 --- a/x/gov/genesis.go +++ b/x/gov/genesis.go @@ -3,7 +3,12 @@ package gov import ( "fmt" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/keeper" "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" diff --git a/x/gov/genesis_test.go b/x/gov/genesis_test.go index 951a94a7..3abb4268 100644 --- a/x/gov/genesis_test.go +++ b/x/gov/genesis_test.go @@ -3,12 +3,23 @@ package gov_test import ( "testing" +<<<<<<< HEAD "github.com/atomone-hub/atomone/x/gov" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" sdk "github.com/atomone-hub/atomone/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/require" +======= + "github.com/stretchr/testify/require" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/atomone-hub/atomone/x/gov" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) func TestImportExportQueues_ErrorUnconsistentState(t *testing.T) { diff --git a/x/gov/keeper/common_test.go b/x/gov/keeper/common_test.go index 60fc12e2..ea1098d3 100644 --- a/x/gov/keeper/common_test.go +++ b/x/gov/keeper/common_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" +<<<<<<< HEAD "github.com/atomone-hub/atomone/x/gov/keeper" govtestutil "github.com/atomone-hub/atomone/x/gov/testutil" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" @@ -22,6 +23,29 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtime "github.com/cometbft/cometbft/types/time" "github.com/golang/mock/gomock" +======= + "github.com/golang/mock/gomock" + + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtime "github.com/cometbft/cometbft/types/time" + + "cosmossdk.io/math" + + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/testutil" + "github.com/cosmos/cosmos-sdk/testutil/testdata" + sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + + "github.com/atomone-hub/atomone/x/gov/keeper" + govtestutil "github.com/atomone-hub/atomone/x/gov/testutil" + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +>>>>>>> main ) var ( diff --git a/x/gov/keeper/deposit.go b/x/gov/keeper/deposit.go index 358caef8..718741ca 100644 --- a/x/gov/keeper/deposit.go +++ b/x/gov/keeper/deposit.go @@ -6,8 +6,13 @@ import ( "github.com/cosmos/cosmos-sdk/types/errors" +<<<<<<< HEAD sdkerrors "github.com/atomone-hub/atomone/errors" sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) diff --git a/x/gov/keeper/deposit_test.go b/x/gov/keeper/deposit_test.go index 8873f9e3..eaa07d5d 100644 --- a/x/gov/keeper/deposit_test.go +++ b/x/gov/keeper/deposit_test.go @@ -5,9 +5,16 @@ import ( v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +<<<<<<< HEAD simtestutil "github.com/atomone-hub/atomone/testutil/sims" sdk "github.com/atomone-hub/atomone/types" "github.com/stretchr/testify/require" +======= + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) const ( diff --git a/x/gov/keeper/grpc_query.go b/x/gov/keeper/grpc_query.go index 6eaf5eec..42a4464e 100644 --- a/x/gov/keeper/grpc_query.go +++ b/x/gov/keeper/grpc_query.go @@ -6,9 +6,16 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" +<<<<<<< HEAD "github.com/atomone-hub/atomone/store/prefix" sdk "github.com/atomone-hub/atomone/types" "github.com/atomone-hub/atomone/types/query" +======= + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + +>>>>>>> main v3 "github.com/atomone-hub/atomone/x/gov/migrations/v3" "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" diff --git a/x/gov/keeper/grpc_query_test.go b/x/gov/keeper/grpc_query_test.go index 7f0cc5b2..5664ce37 100644 --- a/x/gov/keeper/grpc_query_test.go +++ b/x/gov/keeper/grpc_query_test.go @@ -8,10 +8,19 @@ import ( v3 "github.com/atomone-hub/atomone/x/gov/migrations/v3" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +<<<<<<< HEAD "cosmossdk.io/math" simtestutil "github.com/atomone-hub/atomone/testutil/sims" sdk "github.com/atomone-hub/atomone/types" "github.com/atomone-hub/atomone/types/query" +======= + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" + + v3 "github.com/atomone-hub/atomone/x/gov/migrations/v3" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) diff --git a/x/gov/keeper/hooks_test.go b/x/gov/keeper/hooks_test.go index 087fc00b..629def61 100644 --- a/x/gov/keeper/hooks_test.go +++ b/x/gov/keeper/hooks_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" +<<<<<<< HEAD "github.com/atomone-hub/atomone/x/gov" "github.com/atomone-hub/atomone/x/gov/keeper" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" @@ -12,6 +13,17 @@ import ( sdk "github.com/atomone-hub/atomone/types" "github.com/atomone-hub/atomone/x/gov/types" "github.com/stretchr/testify/require" +======= + "github.com/stretchr/testify/require" + + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/atomone-hub/atomone/x/gov" + "github.com/atomone-hub/atomone/x/gov/keeper" + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) var _ types.GovHooks = &MockGovHooksReceiver{} diff --git a/x/gov/keeper/invariants.go b/x/gov/keeper/invariants.go index e0e43da5..01253430 100644 --- a/x/gov/keeper/invariants.go +++ b/x/gov/keeper/invariants.go @@ -5,7 +5,12 @@ package keeper import ( "fmt" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) diff --git a/x/gov/keeper/keeper.go b/x/gov/keeper/keeper.go index 846d71b5..c57a5ac7 100644 --- a/x/gov/keeper/keeper.go +++ b/x/gov/keeper/keeper.go @@ -6,11 +6,20 @@ import ( "github.com/cometbft/cometbft/libs/log" +<<<<<<< HEAD "github.com/atomone-hub/atomone/baseapp" "github.com/atomone-hub/atomone/codec" storetypes "github.com/atomone-hub/atomone/store/types" sdk "github.com/atomone-hub/atomone/types" authtypes "github.com/atomone-hub/atomone/x/auth/types" +======= + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" + storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" diff --git a/x/gov/keeper/keeper_test.go b/x/gov/keeper/keeper_test.go index 0a733967..ec7b3dae 100644 --- a/x/gov/keeper/keeper_test.go +++ b/x/gov/keeper/keeper_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "testing" +<<<<<<< HEAD "github.com/atomone-hub/atomone/x/gov/keeper" govtestutil "github.com/atomone-hub/atomone/x/gov/testutil" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" @@ -16,6 +17,22 @@ import ( minttypes "github.com/atomone-hub/atomone/x/mint/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" +======= + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" + + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + + "github.com/atomone-hub/atomone/x/gov/keeper" + govtestutil "github.com/atomone-hub/atomone/x/gov/testutil" + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +>>>>>>> main ) type KeeperTestSuite struct { diff --git a/x/gov/keeper/msg_server.go b/x/gov/keeper/msg_server.go index e1511392..d93484af 100644 --- a/x/gov/keeper/msg_server.go +++ b/x/gov/keeper/msg_server.go @@ -6,9 +6,14 @@ import ( "cosmossdk.io/errors" +<<<<<<< HEAD sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main govtypes "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" diff --git a/x/gov/keeper/msg_server_test.go b/x/gov/keeper/msg_server_test.go index 202b7d9b..e27ab337 100644 --- a/x/gov/keeper/msg_server_test.go +++ b/x/gov/keeper/msg_server_test.go @@ -4,12 +4,21 @@ import ( "strings" "time" +<<<<<<< HEAD v1 "github.com/atomone-hub/atomone/x/gov/types/v1" simtestutil "github.com/atomone-hub/atomone/testutil/sims" "github.com/atomone-hub/atomone/testutil/testdata" sdk "github.com/atomone-hub/atomone/types" banktypes "github.com/atomone-hub/atomone/x/bank/types" +======= + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + "github.com/cosmos/cosmos-sdk/testutil/testdata" + sdk "github.com/cosmos/cosmos-sdk/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) diff --git a/x/gov/keeper/params.go b/x/gov/keeper/params.go index 6312e181..bb669f11 100644 --- a/x/gov/keeper/params.go +++ b/x/gov/keeper/params.go @@ -1,7 +1,12 @@ package keeper import ( +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) diff --git a/x/gov/keeper/proposal.go b/x/gov/keeper/proposal.go index 4689d845..046a1afd 100644 --- a/x/gov/keeper/proposal.go +++ b/x/gov/keeper/proposal.go @@ -4,9 +4,17 @@ import ( "errors" "fmt" +<<<<<<< HEAD "github.com/atomone-hub/atomone/client" sdkerrors "github.com/atomone-hub/atomone/errors" sdk "github.com/atomone-hub/atomone/types" +======= + sdkerrors "cosmossdk.io/errors" + + "github.com/cosmos/cosmos-sdk/client" + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) @@ -67,7 +75,7 @@ func (keeper Keeper) SubmitProposal(ctx sdk.Context, messages []sdk.Msg, metadat if msg, ok := msg.(*v1.MsgExecLegacyContent); ok { cacheCtx, _ := ctx.CacheContext() if _, err := handler(cacheCtx, msg); err != nil { - if errors.Is(types.ErrNoProposalHandlerExists, err) { + if errors.Is(err, types.ErrNoProposalHandlerExists) { return v1.Proposal{}, err } return v1.Proposal{}, sdkerrors.Wrap(types.ErrInvalidProposalContent, err.Error()) diff --git a/x/gov/keeper/proposal_test.go b/x/gov/keeper/proposal_test.go index ed226d64..0e029d33 100644 --- a/x/gov/keeper/proposal_test.go +++ b/x/gov/keeper/proposal_test.go @@ -9,11 +9,20 @@ import ( v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +<<<<<<< HEAD "github.com/atomone-hub/atomone/testutil/testdata" sdk "github.com/atomone-hub/atomone/types" "github.com/atomone-hub/atomone/x/gov/types" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" "github.com/stretchr/testify/require" +======= + "github.com/cosmos/cosmos-sdk/testutil/testdata" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +>>>>>>> main ) func (suite *KeeperTestSuite) TestGetSetProposal() { diff --git a/x/gov/keeper/tally.go b/x/gov/keeper/tally.go index ff5b77d8..e00ad87f 100644 --- a/x/gov/keeper/tally.go +++ b/x/gov/keeper/tally.go @@ -3,9 +3,16 @@ package keeper import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" stakingtypes "github.com/atomone-hub/atomone/x/staking/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) // TODO: Break into several smaller functions for clarity diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go index e97a1520..798cf306 100644 --- a/x/gov/keeper/tally_test.go +++ b/x/gov/keeper/tally_test.go @@ -10,12 +10,19 @@ import ( sdkmath "cosmossdk.io/math" +<<<<<<< HEAD simtestutil "github.com/atomone-hub/atomone/testutil/sims" sdk "github.com/atomone-hub/atomone/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" stakingtypes "github.com/atomone-hub/atomone/x/staking/types" +======= + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/keeper" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) type tallyFixture struct { diff --git a/x/gov/keeper/vote.go b/x/gov/keeper/vote.go index 59d5a80f..4cabb2c6 100644 --- a/x/gov/keeper/vote.go +++ b/x/gov/keeper/vote.go @@ -3,8 +3,15 @@ package keeper import ( "fmt" +<<<<<<< HEAD sdkerrors "github.com/atomone-hub/atomone/errors" sdk "github.com/atomone-hub/atomone/types" +======= + sdkerrors "cosmossdk.io/errors" + + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) diff --git a/x/gov/keeper/vote_test.go b/x/gov/keeper/vote_test.go index 42deda7d..cf8efa38 100644 --- a/x/gov/keeper/vote_test.go +++ b/x/gov/keeper/vote_test.go @@ -6,9 +6,16 @@ import ( sdkmath "cosmossdk.io/math" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +<<<<<<< HEAD simtestutil "github.com/atomone-hub/atomone/testutil/sims" sdk "github.com/atomone-hub/atomone/types" "github.com/stretchr/testify/require" +======= + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) func TestVotes(t *testing.T) { diff --git a/x/gov/migrations/v3/convert.go b/x/gov/migrations/v3/convert.go index 2fd161a4..711e2b79 100644 --- a/x/gov/migrations/v3/convert.go +++ b/x/gov/migrations/v3/convert.go @@ -3,11 +3,18 @@ package v3 import ( "fmt" +<<<<<<< HEAD sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" codectypes "github.com/atomone-hub/atomone/codec/types" "github.com/atomone-hub/atomone/types" authtypes "github.com/atomone-hub/atomone/x/auth/types" +======= + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + +>>>>>>> main v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) @@ -130,6 +137,7 @@ func ConvertToLegacyDeposit(deposit *v1.Deposit) v1beta1.Deposit { Amount: types.NewCoins(deposit.Amount...), } } +<<<<<<< HEAD func convertToNewDeposits(oldDeps v1beta1.Deposits) v1.Deposits { newDeps := make([]*v1.Deposit, len(oldDeps)) @@ -241,3 +249,5 @@ func convertToNewProposals(oldProps v1beta1.Proposals) (v1.Proposals, error) { return newProps, nil } +======= +>>>>>>> main diff --git a/x/gov/module.go b/x/gov/module.go index f3b487d3..da5da653 100644 --- a/x/gov/module.go +++ b/x/gov/module.go @@ -17,6 +17,7 @@ import ( "cosmossdk.io/depinject" +<<<<<<< HEAD modulev1 "github.com/atomone-hub/atomone/api/atomone/gov/module/v1" "github.com/atomone-hub/atomone/baseapp" "github.com/atomone-hub/atomone/client" @@ -28,6 +29,19 @@ import ( "github.com/atomone-hub/atomone/types/module" simtypes "github.com/atomone-hub/atomone/types/simulation" authtypes "github.com/atomone-hub/atomone/x/auth/types" +======= + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + store "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + +>>>>>>> main govclient "github.com/atomone-hub/atomone/x/gov/client" "github.com/atomone-hub/atomone/x/gov/client/cli" "github.com/atomone-hub/atomone/x/gov/keeper" @@ -35,7 +49,10 @@ import ( govtypes "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +<<<<<<< HEAD paramtypes "github.com/atomone-hub/atomone/x/params/types" +======= +>>>>>>> main ) const ConsensusVersion = 4 diff --git a/x/gov/simulation/decoder.go b/x/gov/simulation/decoder.go index 8b665466..db7639d1 100644 --- a/x/gov/simulation/decoder.go +++ b/x/gov/simulation/decoder.go @@ -7,7 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/kv" +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec" +======= +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) diff --git a/x/gov/simulation/decoder_test.go b/x/gov/simulation/decoder_test.go index d47ec67a..03e1a1fa 100644 --- a/x/gov/simulation/decoder_test.go +++ b/x/gov/simulation/decoder_test.go @@ -16,9 +16,15 @@ import ( "github.com/atomone-hub/atomone/x/gov/types" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/types/kv" +<<<<<<< HEAD +======= + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" +>>>>>>> main "github.com/atomone-hub/atomone/x/gov" "github.com/atomone-hub/atomone/x/gov/simulation" + "github.com/atomone-hub/atomone/x/gov/types" + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) var ( diff --git a/x/gov/simulation/genesis.go b/x/gov/simulation/genesis.go index 69ad24fb..1f771d24 100644 --- a/x/gov/simulation/genesis.go +++ b/x/gov/simulation/genesis.go @@ -10,9 +10,16 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" "github.com/atomone-hub/atomone/types/module" "github.com/atomone-hub/atomone/types/simulation" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + "github.com/cosmos/cosmos-sdk/types/simulation" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" ) diff --git a/x/gov/simulation/genesis_test.go b/x/gov/simulation/genesis_test.go index c0788792..244238ad 100644 --- a/x/gov/simulation/genesis_test.go +++ b/x/gov/simulation/genesis_test.go @@ -9,12 +9,24 @@ import ( v1 "github.com/atomone-hub/atomone/x/gov/types/v1" sdkmath "cosmossdk.io/math" +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec" codectypes "github.com/atomone-hub/atomone/codec/types" "github.com/atomone-hub/atomone/types/module" simtypes "github.com/atomone-hub/atomone/types/simulation" "github.com/atomone-hub/atomone/x/gov/types" "github.com/stretchr/testify/require" +======= + + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/types/module" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + + "github.com/atomone-hub/atomone/x/gov/simulation" + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/x/gov/simulation/operations.go b/x/gov/simulation/operations.go index d03dbb97..af6bd072 100644 --- a/x/gov/simulation/operations.go +++ b/x/gov/simulation/operations.go @@ -5,6 +5,7 @@ import ( "math/rand" "time" +<<<<<<< HEAD "github.com/atomone-hub/atomone/baseapp" "github.com/atomone-hub/atomone/codec" simtestutil "github.com/atomone-hub/atomone/testutil/sims" @@ -15,6 +16,19 @@ import ( "github.com/atomone-hub/atomone/x/gov/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/simulation" +======= + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/cosmos/cosmos-sdk/x/simulation" + + "github.com/atomone-hub/atomone/x/gov/keeper" + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) var initialProposalID = uint64(100000000000000) diff --git a/x/gov/simulation/operations_test.go b/x/gov/simulation/operations_test.go index 9d77599e..e048355c 100644 --- a/x/gov/simulation/operations_test.go +++ b/x/gov/simulation/operations_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" +<<<<<<< HEAD "github.com/atomone-hub/atomone/x/gov/keeper" "github.com/atomone-hub/atomone/x/gov/simulation" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" @@ -33,6 +34,37 @@ import ( abci "github.com/cometbft/cometbft/abci/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/require" +======= + "github.com/stretchr/testify/require" + + _ "github.com/cosmos/cosmos-sdk/x/auth" + _ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" + _ "github.com/cosmos/cosmos-sdk/x/bank" + _ "github.com/cosmos/cosmos-sdk/x/consensus" + _ "github.com/cosmos/cosmos-sdk/x/params" + _ "github.com/cosmos/cosmos-sdk/x/staking" + + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/runtime" + "github.com/cosmos/cosmos-sdk/testutil/configurator" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + "github.com/cosmos/cosmos-sdk/x/bank/testutil" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" + + govcodec "github.com/atomone-hub/atomone/x/gov/codec" + "github.com/atomone-hub/atomone/x/gov/keeper" + "github.com/atomone-hub/atomone/x/gov/simulation" + "github.com/atomone-hub/atomone/x/gov/types" + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +>>>>>>> main ) var ( diff --git a/x/gov/simulation/proposals.go b/x/gov/simulation/proposals.go index 9357b12d..8ade0380 100644 --- a/x/gov/simulation/proposals.go +++ b/x/gov/simulation/proposals.go @@ -3,10 +3,18 @@ package simulation import ( "math/rand" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" simtypes "github.com/atomone-hub/atomone/types/simulation" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" "github.com/atomone-hub/atomone/x/simulation" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/cosmos/cosmos-sdk/x/simulation" + + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +>>>>>>> main ) // OpWeightSubmitTextProposal app params key for text proposal diff --git a/x/gov/testutil/expected_keepers.go b/x/gov/testutil/expected_keepers.go index 64477c4d..f4611e8f 100644 --- a/x/gov/testutil/expected_keepers.go +++ b/x/gov/testutil/expected_keepers.go @@ -5,9 +5,16 @@ package testutil import ( math "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" authtypes "github.com/atomone-hub/atomone/x/auth/types" bankkeeper "github.com/atomone-hub/atomone/x/bank/keeper" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" ) diff --git a/x/gov/types/errors.go b/x/gov/types/errors.go index e85feebf..6ce59630 100644 --- a/x/gov/types/errors.go +++ b/x/gov/types/errors.go @@ -6,6 +6,7 @@ import ( // x/gov module sentinel errors var ( +<<<<<<< HEAD ErrUnknownProposal = sdkerrors.Register(ModuleName, 2, "unknown proposal") //nolint:staticcheck // SA1019 ErrInactiveProposal = sdkerrors.Register(ModuleName, 3, "inactive proposal") //nolint:staticcheck // SA1019 ErrAlreadyActiveProposal = sdkerrors.Register(ModuleName, 4, "proposal already active") //nolint:staticcheck // SA1019 @@ -22,4 +23,22 @@ var ( ErrInvalidSignalMsg = sdkerrors.Register(ModuleName, 14, "signal message is invalid") //nolint:staticcheck // SA1019 ErrMetadataTooLong = sdkerrors.Register(ModuleName, 15, "metadata too long") //nolint:staticcheck // SA1019 ErrMinDepositTooSmall = sdkerrors.Register(ModuleName, 16, "minimum deposit is too small") //nolint:staticcheck // SA1019 +======= + ErrUnknownProposal = sdkerrors.Register(ModuleName, 20, "unknown proposal") //nolint:staticcheck + ErrInactiveProposal = sdkerrors.Register(ModuleName, 30, "inactive proposal") //nolint:staticcheck + ErrAlreadyActiveProposal = sdkerrors.Register(ModuleName, 40, "proposal already active") //nolint:staticcheck + // Errors 5 & 6 are legacy errors related to v1beta1.Proposal. + ErrInvalidProposalContent = sdkerrors.Register(ModuleName, 50, "invalid proposal content") //nolint:staticcheck + ErrInvalidProposalType = sdkerrors.Register(ModuleName, 60, "invalid proposal type") //nolint:staticcheck + ErrInvalidVote = sdkerrors.Register(ModuleName, 70, "invalid vote option") //nolint:staticcheck + ErrInvalidGenesis = sdkerrors.Register(ModuleName, 80, "invalid genesis state") //nolint:staticcheck + ErrNoProposalHandlerExists = sdkerrors.Register(ModuleName, 90, "no handler exists for proposal type") //nolint:staticcheck + ErrUnroutableProposalMsg = sdkerrors.Register(ModuleName, 100, "proposal message not recognized by router") //nolint:staticcheck + ErrNoProposalMsgs = sdkerrors.Register(ModuleName, 110, "no messages proposed") //nolint:staticcheck + ErrInvalidProposalMsg = sdkerrors.Register(ModuleName, 120, "invalid proposal message") //nolint:staticcheck + ErrInvalidSigner = sdkerrors.Register(ModuleName, 130, "expected gov account as only signer for proposal message") //nolint:staticcheck + ErrInvalidSignalMsg = sdkerrors.Register(ModuleName, 140, "signal message is invalid") //nolint:staticcheck + ErrMetadataTooLong = sdkerrors.Register(ModuleName, 150, "metadata too long") //nolint:staticcheck + ErrMinDepositTooSmall = sdkerrors.Register(ModuleName, 160, "minimum deposit is too small") //nolint:staticcheck +>>>>>>> main ) diff --git a/x/gov/types/expected_keepers.go b/x/gov/types/expected_keepers.go index 57a7836c..b15284cd 100644 --- a/x/gov/types/expected_keepers.go +++ b/x/gov/types/expected_keepers.go @@ -3,9 +3,15 @@ package types import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" "github.com/atomone-hub/atomone/x/auth/types" stakingtypes "github.com/atomone-hub/atomone/x/staking/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" +>>>>>>> main ) // ParamSubspace defines the expected Subspace interface for parameters (noalias) diff --git a/x/gov/types/hooks.go b/x/gov/types/hooks.go index 88591667..0c515425 100644 --- a/x/gov/types/hooks.go +++ b/x/gov/types/hooks.go @@ -1,7 +1,11 @@ package types import ( +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) var _ GovHooks = MultiGovHooks{} diff --git a/x/gov/types/keys.go b/x/gov/types/keys.go index c0d6679f..b84ad0c3 100644 --- a/x/gov/types/keys.go +++ b/x/gov/types/keys.go @@ -4,10 +4,16 @@ import ( "encoding/binary" "time" +<<<<<<< HEAD "github.com/cosmos/cosmos-sdk/types/address" "github.com/cosmos/cosmos-sdk/types/kv" sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/address" + "github.com/cosmos/cosmos-sdk/types/kv" +>>>>>>> main ) const ( diff --git a/x/gov/types/keys_test.go b/x/gov/types/keys_test.go index 941c4b9c..bbb1d88d 100644 --- a/x/gov/types/keys_test.go +++ b/x/gov/types/keys_test.go @@ -6,8 +6,13 @@ import ( "github.com/stretchr/testify/require" +<<<<<<< HEAD "github.com/atomone-hub/atomone/crypto/keys/ed25519" sdk "github.com/atomone-hub/atomone/types" +======= + "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) var addr = sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address()) diff --git a/x/gov/types/v1/codec.go b/x/gov/types/v1/codec.go index a6f0f547..fa30f869 100644 --- a/x/gov/types/v1/codec.go +++ b/x/gov/types/v1/codec.go @@ -1,6 +1,7 @@ package v1 import ( +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec" "github.com/atomone-hub/atomone/codec/legacy" codectypes "github.com/atomone-hub/atomone/codec/types" @@ -9,6 +10,26 @@ import ( authzcodec "github.com/atomone-hub/atomone/x/authz/codec" govcodec "github.com/atomone-hub/atomone/x/gov/codec" groupcodec "github.com/atomone-hub/atomone/x/group/codec" +======= + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/codec/legacy" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/msgservice" + authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" + distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" + groupcodec "github.com/cosmos/cosmos-sdk/x/group/codec" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + govcodec "github.com/atomone-hub/atomone/x/gov/codec" +>>>>>>> main ) // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the @@ -42,4 +63,19 @@ func init() { RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) RegisterLegacyAminoCodec(groupcodec.Amino) +<<<<<<< HEAD +======= + + // Need to add registration in the atomone gov amino for all modules that + // register their amino types in the legacy gov module. + banktypes.RegisterLegacyAminoCodec(govcodec.Amino) + consensustypes.RegisterLegacyAminoCodec(govcodec.Amino) + crisistypes.RegisterLegacyAminoCodec(govcodec.Amino) + distributiontypes.RegisterLegacyAminoCodec(govcodec.Amino) + evidencetypes.RegisterLegacyAminoCodec(govcodec.Amino) + minttypes.RegisterLegacyAminoCodec(govcodec.Amino) + slashingtypes.RegisterLegacyAminoCodec(govcodec.Amino) + stakingtypes.RegisterLegacyAminoCodec(govcodec.Amino) + upgradetypes.RegisterLegacyAminoCodec(govcodec.Amino) +>>>>>>> main } diff --git a/x/gov/types/v1/content.go b/x/gov/types/v1/content.go index 59a0f2c4..62478470 100644 --- a/x/gov/types/v1/content.go +++ b/x/gov/types/v1/content.go @@ -5,9 +5,15 @@ import ( "github.com/cosmos/gogoproto/proto" +<<<<<<< HEAD sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" codectypes "github.com/atomone-hub/atomone/codec/types" +======= + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) diff --git a/x/gov/types/v1/deposit.go b/x/gov/types/v1/deposit.go index 1336f051..b50ef29f 100644 --- a/x/gov/types/v1/deposit.go +++ b/x/gov/types/v1/deposit.go @@ -3,7 +3,11 @@ package v1 import ( "fmt" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // NewDeposit creates a new Deposit instance diff --git a/x/gov/types/v1/genesis.go b/x/gov/types/v1/genesis.go index e7238c94..b8c43592 100644 --- a/x/gov/types/v1/genesis.go +++ b/x/gov/types/v1/genesis.go @@ -6,7 +6,11 @@ import ( "golang.org/x/sync/errgroup" +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec/types" +======= + "github.com/cosmos/cosmos-sdk/codec/types" +>>>>>>> main ) // NewGenesisState creates a new genesis state for the governance module diff --git a/x/gov/types/v1/genesis.pb.go b/x/gov/types/v1/genesis.pb.go index 579fa1b3..3918c4bc 100644 --- a/x/gov/types/v1/genesis.pb.go +++ b/x/gov/types/v1/genesis.pb.go @@ -5,6 +5,7 @@ package v1 import ( fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" @@ -18,6 +19,18 @@ var ( _ = fmt.Errorf _ = math.Inf ) +======= + proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -56,11 +69,17 @@ func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { return fileDescriptor_7737a96fb154b10d, []int{0} } +<<<<<<< HEAD func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *GenesisState) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) @@ -73,6 +92,7 @@ func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *GenesisState) XXX_Merge(src proto.Message) { xxx_messageInfo_GenesisState.Merge(m, src) @@ -82,6 +102,14 @@ func (m *GenesisState) XXX_Size() int { return m.Size() } +======= +func (m *GenesisState) XXX_Merge(src proto.Message) { + xxx_messageInfo_GenesisState.Merge(m, src) +} +func (m *GenesisState) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *GenesisState) XXX_DiscardUnknown() { xxx_messageInfo_GenesisState.DiscardUnknown(m) } @@ -309,7 +337,10 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -359,11 +390,17 @@ func (m *GenesisState) Size() (n int) { func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozGenesis(x uint64) (n int) { + return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -679,7 +716,10 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1/genesis_test.go b/x/gov/types/v1/genesis_test.go index 2ef6c41e..0a9b2c69 100644 --- a/x/gov/types/v1/genesis_test.go +++ b/x/gov/types/v1/genesis_test.go @@ -3,9 +3,17 @@ package v1_test import ( "testing" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/stretchr/testify/require" +======= + "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" + + v1 "github.com/atomone-hub/atomone/x/gov/types/v1" +>>>>>>> main ) func TestEmptyGenesis(t *testing.T) { diff --git a/x/gov/types/v1/gov.pb.go b/x/gov/types/v1/gov.pb.go index cee7726d..a43635c5 100644 --- a/x/gov/types/v1/gov.pb.go +++ b/x/gov/types/v1/gov.pb.go @@ -5,6 +5,7 @@ package v1 import ( fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" @@ -14,11 +15,18 @@ import ( types "github.com/atomone-hub/atomone/types" _ "github.com/atomone-hub/atomone/types/tx/amino" _ "github.com/cosmos/cosmos-proto" +======= + _ "github.com/cosmos/cosmos-proto" + types1 "github.com/cosmos/cosmos-sdk/codec/types" + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" +>>>>>>> main _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" +<<<<<<< HEAD ) // Reference imports to suppress errors if they are not otherwise used. @@ -28,6 +36,19 @@ var ( _ = math.Inf _ = time.Kitchen ) +======= + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -126,8 +147,12 @@ func (ProposalStatus) EnumDescriptor() ([]byte, []int) { // WeightedVoteOption defines a unit of vote for vote split. type WeightedVoteOption struct { +<<<<<<< HEAD // option defines the valid vote options, it must not contain duplicate vote // options. +======= + // option defines the valid vote options, it must not contain duplicate vote options. +>>>>>>> main Option VoteOption `protobuf:"varint,1,opt,name=option,proto3,enum=atomone.gov.v1.VoteOption" json:"option,omitempty"` // weight is the vote weight associated with the vote option. Weight string `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` @@ -139,11 +164,17 @@ func (*WeightedVoteOption) ProtoMessage() {} func (*WeightedVoteOption) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{0} } +<<<<<<< HEAD func (m *WeightedVoteOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *WeightedVoteOption) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *WeightedVoteOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_WeightedVoteOption.Marshal(b, m, deterministic) @@ -156,6 +187,7 @@ func (m *WeightedVoteOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *WeightedVoteOption) XXX_Merge(src proto.Message) { xxx_messageInfo_WeightedVoteOption.Merge(m, src) @@ -165,6 +197,14 @@ func (m *WeightedVoteOption) XXX_Size() int { return m.Size() } +======= +func (m *WeightedVoteOption) XXX_Merge(src proto.Message) { + xxx_messageInfo_WeightedVoteOption.Merge(m, src) +} +func (m *WeightedVoteOption) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *WeightedVoteOption) XXX_DiscardUnknown() { xxx_messageInfo_WeightedVoteOption.DiscardUnknown(m) } @@ -202,11 +242,17 @@ func (*Deposit) ProtoMessage() {} func (*Deposit) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{1} } +<<<<<<< HEAD func (m *Deposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *Deposit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *Deposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Deposit.Marshal(b, m, deterministic) @@ -219,6 +265,7 @@ func (m *Deposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *Deposit) XXX_Merge(src proto.Message) { xxx_messageInfo_Deposit.Merge(m, src) @@ -228,6 +275,14 @@ func (m *Deposit) XXX_Size() int { return m.Size() } +======= +func (m *Deposit) XXX_Merge(src proto.Message) { + xxx_messageInfo_Deposit.Merge(m, src) +} +func (m *Deposit) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *Deposit) XXX_DiscardUnknown() { xxx_messageInfo_Deposit.DiscardUnknown(m) } @@ -299,11 +354,17 @@ func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{2} } +<<<<<<< HEAD func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *Proposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *Proposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Proposal.Marshal(b, m, deterministic) @@ -316,6 +377,7 @@ func (m *Proposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *Proposal) XXX_Merge(src proto.Message) { xxx_messageInfo_Proposal.Merge(m, src) @@ -325,6 +387,14 @@ func (m *Proposal) XXX_Size() int { return m.Size() } +======= +func (m *Proposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_Proposal.Merge(m, src) +} +func (m *Proposal) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *Proposal) XXX_DiscardUnknown() { xxx_messageInfo_Proposal.DiscardUnknown(m) } @@ -440,11 +510,17 @@ func (*TallyResult) ProtoMessage() {} func (*TallyResult) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{3} } +<<<<<<< HEAD func (m *TallyResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *TallyResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *TallyResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_TallyResult.Marshal(b, m, deterministic) @@ -457,6 +533,7 @@ func (m *TallyResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *TallyResult) XXX_Merge(src proto.Message) { xxx_messageInfo_TallyResult.Merge(m, src) @@ -466,6 +543,14 @@ func (m *TallyResult) XXX_Size() int { return m.Size() } +======= +func (m *TallyResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_TallyResult.Merge(m, src) +} +func (m *TallyResult) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *TallyResult) XXX_DiscardUnknown() { xxx_messageInfo_TallyResult.DiscardUnknown(m) } @@ -519,11 +604,17 @@ func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{4} } +<<<<<<< HEAD func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *Vote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *Vote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Vote.Marshal(b, m, deterministic) @@ -536,6 +627,7 @@ func (m *Vote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *Vote) XXX_Merge(src proto.Message) { xxx_messageInfo_Vote.Merge(m, src) @@ -545,6 +637,14 @@ func (m *Vote) XXX_Size() int { return m.Size() } +======= +func (m *Vote) XXX_Merge(src proto.Message) { + xxx_messageInfo_Vote.Merge(m, src) +} +func (m *Vote) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *Vote) XXX_DiscardUnknown() { xxx_messageInfo_Vote.DiscardUnknown(m) } @@ -594,11 +694,17 @@ func (*DepositParams) ProtoMessage() {} func (*DepositParams) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{5} } +<<<<<<< HEAD func (m *DepositParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *DepositParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *DepositParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_DepositParams.Marshal(b, m, deterministic) @@ -611,6 +717,7 @@ func (m *DepositParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } +<<<<<<< HEAD func (m *DepositParams) XXX_Merge(src proto.Message) { xxx_messageInfo_DepositParams.Merge(m, src) @@ -620,6 +727,14 @@ func (m *DepositParams) XXX_Size() int { return m.Size() } +======= +func (m *DepositParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_DepositParams.Merge(m, src) +} +func (m *DepositParams) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *DepositParams) XXX_DiscardUnknown() { xxx_messageInfo_DepositParams.DiscardUnknown(m) } @@ -652,11 +767,17 @@ func (*VotingParams) ProtoMessage() {} func (*VotingParams) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{6} } +<<<<<<< HEAD func (m *VotingParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *VotingParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *VotingParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_VotingParams.Marshal(b, m, deterministic) @@ -669,6 +790,7 @@ func (m *VotingParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *VotingParams) XXX_Merge(src proto.Message) { xxx_messageInfo_VotingParams.Merge(m, src) @@ -678,6 +800,14 @@ func (m *VotingParams) XXX_Size() int { return m.Size() } +======= +func (m *VotingParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_VotingParams.Merge(m, src) +} +func (m *VotingParams) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *VotingParams) XXX_DiscardUnknown() { xxx_messageInfo_VotingParams.DiscardUnknown(m) } @@ -709,11 +839,17 @@ func (*TallyParams) ProtoMessage() {} func (*TallyParams) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{7} } +<<<<<<< HEAD func (m *TallyParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *TallyParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *TallyParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_TallyParams.Marshal(b, m, deterministic) @@ -726,6 +862,7 @@ func (m *TallyParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *TallyParams) XXX_Merge(src proto.Message) { xxx_messageInfo_TallyParams.Merge(m, src) @@ -735,6 +872,14 @@ func (m *TallyParams) XXX_Size() int { return m.Size() } +======= +func (m *TallyParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_TallyParams.Merge(m, src) +} +func (m *TallyParams) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *TallyParams) XXX_DiscardUnknown() { xxx_messageInfo_TallyParams.DiscardUnknown(m) } @@ -781,8 +926,12 @@ type Params struct { // Minimum value of Veto votes to Total votes ratio for proposal to be // vetoed. Default value: 1/3. VetoThreshold string `protobuf:"bytes,6,opt,name=veto_threshold,json=vetoThreshold,proto3" json:"veto_threshold,omitempty"` +<<<<<<< HEAD // The ratio representing the proportion of the deposit value that must be // paid at proposal submission. +======= + // The ratio representing the proportion of the deposit value that must be paid at proposal submission. +>>>>>>> main MinInitialDepositRatio string `protobuf:"bytes,7,opt,name=min_initial_deposit_ratio,json=minInitialDepositRatio,proto3" json:"min_initial_deposit_ratio,omitempty"` // burn deposits if a proposal does not meet quorum BurnVoteQuorum bool `protobuf:"varint,13,opt,name=burn_vote_quorum,json=burnVoteQuorum,proto3" json:"burn_vote_quorum,omitempty"` @@ -790,6 +939,7 @@ type Params struct { BurnProposalDepositPrevote bool `protobuf:"varint,14,opt,name=burn_proposal_deposit_prevote,json=burnProposalDepositPrevote,proto3" json:"burn_proposal_deposit_prevote,omitempty"` // burn deposits if quorum with vote type no_veto is met BurnVoteVeto bool `protobuf:"varint,15,opt,name=burn_vote_veto,json=burnVoteVeto,proto3" json:"burn_vote_veto,omitempty"` +<<<<<<< HEAD // The ratio representing the proportion of the deposit value minimum that // must be met when making a deposit. Default value: 0.01. Meaning that for a // chain with a min_deposit of 100stake, a deposit of 1stake would be @@ -798,6 +948,8 @@ type Params struct { // Since: cosmos-sdk 0.50 // NOTE: backported from v50 (https://github.com/cosmos/cosmos-sdk/pull/18146) MinDepositRatio string `protobuf:"bytes,16,opt,name=min_deposit_ratio,json=minDepositRatio,proto3" json:"min_deposit_ratio,omitempty"` +======= +>>>>>>> main } func (m *Params) Reset() { *m = Params{} } @@ -806,11 +958,17 @@ func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { return fileDescriptor_ecf0f9950ff6986c, []int{8} } +<<<<<<< HEAD func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *Params) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Params.Marshal(b, m, deterministic) @@ -823,6 +981,7 @@ func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *Params) XXX_Merge(src proto.Message) { xxx_messageInfo_Params.Merge(m, src) @@ -832,6 +991,14 @@ func (m *Params) XXX_Size() int { return m.Size() } +======= +func (m *Params) XXX_Merge(src proto.Message) { + xxx_messageInfo_Params.Merge(m, src) +} +func (m *Params) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *Params) XXX_DiscardUnknown() { xxx_messageInfo_Params.DiscardUnknown(m) } @@ -908,6 +1075,7 @@ func (m *Params) GetBurnVoteVeto() bool { return false } +<<<<<<< HEAD func (m *Params) GetMinDepositRatio() string { if m != nil { return m.MinDepositRatio @@ -915,6 +1083,8 @@ func (m *Params) GetMinDepositRatio() string { return "" } +======= +>>>>>>> main func init() { proto.RegisterEnum("atomone.gov.v1.VoteOption", VoteOption_name, VoteOption_value) proto.RegisterEnum("atomone.gov.v1.ProposalStatus", ProposalStatus_name, ProposalStatus_value) @@ -932,6 +1102,7 @@ func init() { func init() { proto.RegisterFile("atomone/gov/v1/gov.proto", fileDescriptor_ecf0f9950ff6986c) } var fileDescriptor_ecf0f9950ff6986c = []byte{ +<<<<<<< HEAD // 1306 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x3f, 0x6f, 0xdb, 0x46, 0x14, 0x37, 0xf5, 0xcf, 0xf2, 0x93, 0x2d, 0x33, 0x97, 0x7f, 0xb4, 0x92, 0x48, 0xae, 0x10, 0x20, @@ -1015,6 +1186,90 @@ var fileDescriptor_ecf0f9950ff6986c = []byte{ 0xb4, 0x2b, 0x47, 0xd4, 0xab, 0xca, 0xae, 0xdb, 0xea, 0x0e, 0xda, 0xf1, 0x73, 0xf5, 0x99, 0xf8, 0x65, 0xc1, 0x46, 0x7d, 0x1c, 0xf2, 0x1f, 0x0d, 0x19, 0x31, 0x77, 0x9f, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xca, 0x12, 0x0f, 0x78, 0x0c, 0x00, 0x00, +======= + // 1282 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4f, 0x73, 0xd3, 0x46, + 0x14, 0x8f, 0x6c, 0xd9, 0x71, 0x9e, 0x13, 0xc7, 0x2c, 0x29, 0x28, 0x06, 0xec, 0xd4, 0xc3, 0x30, + 0x29, 0x25, 0x76, 0x13, 0x5a, 0x2e, 0xe5, 0xe2, 0xc4, 0x02, 0xc4, 0xd0, 0xd8, 0x95, 0x45, 0x18, + 0x7a, 0xd1, 0xc8, 0xd1, 0x62, 0xef, 0x8c, 0xa5, 0x75, 0xa5, 0xb5, 0xc1, 0x1f, 0xa1, 0x37, 0x8e, + 0x9d, 0x9e, 0x7a, 0xec, 0xb1, 0x07, 0x66, 0xfa, 0x01, 0x7a, 0xe1, 0xd4, 0x32, 0x5c, 0xda, 0x5e, + 0x68, 0x07, 0x0e, 0x9d, 0xe1, 0x53, 0x74, 0x76, 0xb5, 0xb2, 0x1d, 0xc7, 0x9d, 0x24, 0x5c, 0x12, + 0xe9, 0xbd, 0xdf, 0xef, 0xbd, 0xb7, 0xef, 0xdf, 0xca, 0xa0, 0x39, 0x8c, 0x7a, 0xd4, 0xc7, 0xd5, + 0x0e, 0x1d, 0x56, 0x87, 0xdb, 0xfc, 0x5f, 0xa5, 0x1f, 0x50, 0x46, 0x51, 0x4e, 0x6a, 0x2a, 0x5c, + 0x34, 0xdc, 0x2e, 0x14, 0x0f, 0x69, 0xe8, 0xd1, 0xb0, 0xda, 0x76, 0x42, 0x5c, 0x1d, 0x6e, 0xb7, + 0x31, 0x73, 0xb6, 0xab, 0x87, 0x94, 0xf8, 0x11, 0xbe, 0xb0, 0xd6, 0xa1, 0x1d, 0x2a, 0x1e, 0xab, + 0xfc, 0x49, 0x4a, 0x4b, 0x1d, 0x4a, 0x3b, 0x3d, 0x5c, 0x15, 0x6f, 0xed, 0xc1, 0x93, 0x2a, 0x23, + 0x1e, 0x0e, 0x99, 0xe3, 0xf5, 0x25, 0x60, 0x7d, 0x16, 0xe0, 0xf8, 0x23, 0xa9, 0x2a, 0xce, 0xaa, + 0xdc, 0x41, 0xe0, 0x30, 0x42, 0x63, 0x8f, 0xeb, 0x51, 0x44, 0x76, 0xe4, 0x34, 0x7a, 0x91, 0xaa, + 0x73, 0x8e, 0x47, 0x7c, 0x5a, 0x15, 0x7f, 0x23, 0x51, 0xb9, 0x0f, 0xe8, 0x11, 0x26, 0x9d, 0x2e, + 0xc3, 0xee, 0x01, 0x65, 0xb8, 0xd1, 0xe7, 0x96, 0xd0, 0x0e, 0xa4, 0xa9, 0x78, 0xd2, 0x94, 0x0d, + 0x65, 0x33, 0xb7, 0x53, 0xa8, 0x1c, 0x3d, 0x76, 0x65, 0x82, 0x35, 0x25, 0x12, 0x5d, 0x83, 0xf4, + 0x53, 0x61, 0x49, 0x4b, 0x6c, 0x28, 0x9b, 0x4b, 0xbb, 0xb9, 0xd7, 0x2f, 0xb6, 0x40, 0xba, 0xaf, + 0xe3, 0x43, 0x53, 0x6a, 0xcb, 0x3f, 0x2a, 0xb0, 0x58, 0xc7, 0x7d, 0x1a, 0x12, 0x86, 0x4a, 0x90, + 0xed, 0x07, 0xb4, 0x4f, 0x43, 0xa7, 0x67, 0x13, 0x57, 0x38, 0x53, 0x4d, 0x88, 0x45, 0x86, 0x8b, + 0x6e, 0xc1, 0x92, 0x1b, 0x61, 0x69, 0x20, 0xed, 0x6a, 0xaf, 0x5f, 0x6c, 0xad, 0x49, 0xbb, 0x35, + 0xd7, 0x0d, 0x70, 0x18, 0xb6, 0x58, 0x40, 0xfc, 0x8e, 0x39, 0x81, 0xa2, 0xdb, 0x90, 0x76, 0x3c, + 0x3a, 0xf0, 0x99, 0x96, 0xdc, 0x48, 0x6e, 0x66, 0x77, 0xd6, 0x2b, 0x92, 0xc1, 0xeb, 0x54, 0x91, + 0x75, 0xaa, 0xec, 0x51, 0xe2, 0xef, 0x2e, 0xbd, 0x7c, 0x53, 0x5a, 0xf8, 0xe9, 0xdf, 0x9f, 0xaf, + 0x2b, 0xa6, 0xe4, 0x94, 0x7f, 0x4d, 0x41, 0xa6, 0x29, 0x83, 0x40, 0x39, 0x48, 0x8c, 0x43, 0x4b, + 0x10, 0x17, 0x7d, 0x06, 0x19, 0x0f, 0x87, 0xa1, 0xd3, 0xc1, 0xa1, 0x96, 0x10, 0xc6, 0xd7, 0x2a, + 0x51, 0x49, 0x2a, 0x71, 0x49, 0x2a, 0x35, 0x7f, 0x64, 0x8e, 0x51, 0xe8, 0x16, 0xa4, 0x43, 0xe6, + 0xb0, 0x41, 0xa8, 0x25, 0x45, 0x36, 0x8b, 0xb3, 0xd9, 0x8c, 0x7d, 0xb5, 0x04, 0xca, 0x94, 0x68, + 0x64, 0x00, 0x7a, 0x42, 0x7c, 0xa7, 0x67, 0x33, 0xa7, 0xd7, 0x1b, 0xd9, 0x01, 0x0e, 0x07, 0x3d, + 0xa6, 0xa9, 0x1b, 0xca, 0x66, 0x76, 0xe7, 0xd2, 0xac, 0x0d, 0x8b, 0x63, 0x4c, 0x01, 0x31, 0xf3, + 0x82, 0x36, 0x25, 0x41, 0x35, 0xc8, 0x86, 0x83, 0xb6, 0x47, 0x98, 0xcd, 0x3b, 0x4d, 0x4b, 0x09, + 0x1b, 0x85, 0x63, 0x71, 0x5b, 0x71, 0x1b, 0xee, 0xaa, 0xcf, 0xff, 0x2e, 0x29, 0x26, 0x44, 0x24, + 0x2e, 0x46, 0xf7, 0x21, 0x2f, 0xf3, 0x6b, 0x63, 0xdf, 0x8d, 0xec, 0xa4, 0x4f, 0x69, 0x27, 0x27, + 0x99, 0xba, 0xef, 0x0a, 0x5b, 0x06, 0xac, 0x30, 0xca, 0x9c, 0x9e, 0x2d, 0xe5, 0xda, 0xe2, 0x19, + 0xaa, 0xb4, 0x2c, 0xa8, 0x71, 0x0b, 0x3d, 0x80, 0x73, 0x43, 0xca, 0x88, 0xdf, 0xb1, 0x43, 0xe6, + 0x04, 0xf2, 0x7c, 0x99, 0x53, 0xc6, 0xb5, 0x1a, 0x51, 0x5b, 0x9c, 0x29, 0x02, 0xbb, 0x07, 0x52, + 0x34, 0x39, 0xe3, 0xd2, 0x29, 0x6d, 0xad, 0x44, 0xc4, 0xf8, 0x88, 0x05, 0xde, 0x26, 0xcc, 0x71, + 0x1d, 0xe6, 0x68, 0xc0, 0x1b, 0xd7, 0x1c, 0xbf, 0xa3, 0x35, 0x48, 0x31, 0xc2, 0x7a, 0x58, 0xcb, + 0x0a, 0x45, 0xf4, 0x82, 0x34, 0x58, 0x0c, 0x07, 0x9e, 0xe7, 0x04, 0x23, 0x6d, 0x59, 0xc8, 0xe3, + 0x57, 0xf4, 0x39, 0x64, 0xa2, 0x99, 0xc0, 0x81, 0xb6, 0x72, 0xc2, 0x10, 0x8c, 0x91, 0xe5, 0x3f, + 0x14, 0xc8, 0x4e, 0xf7, 0xc0, 0xa7, 0xb0, 0x34, 0xc2, 0xa1, 0x7d, 0x28, 0xc6, 0x42, 0x39, 0x36, + 0xa3, 0x86, 0xcf, 0xcc, 0xcc, 0x08, 0x87, 0x7b, 0x5c, 0x8f, 0x6e, 0xc2, 0x8a, 0xd3, 0x0e, 0x99, + 0x43, 0x7c, 0x49, 0x48, 0xcc, 0x25, 0x2c, 0x4b, 0x50, 0x44, 0xfa, 0x04, 0x32, 0x3e, 0x95, 0xf8, + 0xe4, 0x5c, 0xfc, 0xa2, 0x4f, 0x23, 0xe8, 0x97, 0x80, 0x7c, 0x6a, 0x3f, 0x25, 0xac, 0x6b, 0x0f, + 0x31, 0x8b, 0x49, 0xea, 0x5c, 0xd2, 0xaa, 0x4f, 0x1f, 0x11, 0xd6, 0x3d, 0xc0, 0x2c, 0x22, 0x97, + 0x7f, 0x51, 0x40, 0xe5, 0x1b, 0xe8, 0xe4, 0xfd, 0x51, 0x81, 0xd4, 0x90, 0x32, 0x7c, 0xf2, 0xee, + 0x88, 0x60, 0xe8, 0x36, 0x2c, 0x46, 0xeb, 0x2c, 0xd4, 0x54, 0xd1, 0x92, 0xe5, 0xd9, 0x39, 0x3b, + 0xbe, 0x2d, 0xcd, 0x98, 0x72, 0xa4, 0xe6, 0xa9, 0xa3, 0x35, 0xbf, 0xaf, 0x66, 0x92, 0x79, 0xb5, + 0xfc, 0x97, 0x02, 0x2b, 0xb2, 0x73, 0x9b, 0x4e, 0xe0, 0x78, 0x21, 0x7a, 0x0c, 0x59, 0x8f, 0xf8, + 0xe3, 0x41, 0x50, 0x4e, 0x1a, 0x84, 0x2b, 0x7c, 0x10, 0xde, 0xbf, 0x29, 0x7d, 0x34, 0xc5, 0xba, + 0x41, 0x3d, 0xc2, 0xb0, 0xd7, 0x67, 0x23, 0x13, 0x3c, 0xe2, 0xc7, 0xa3, 0xe1, 0x01, 0xf2, 0x9c, + 0x67, 0x31, 0xc8, 0xee, 0xe3, 0x80, 0x50, 0x57, 0x64, 0x82, 0x7b, 0x98, 0xed, 0xe7, 0xba, 0xbc, + 0x46, 0x76, 0xaf, 0xbe, 0x7f, 0x53, 0xba, 0x7c, 0x9c, 0x38, 0x71, 0xf2, 0x3d, 0x6f, 0xf7, 0xbc, + 0xe7, 0x3c, 0x8b, 0x4f, 0x22, 0xf4, 0x65, 0x0b, 0x96, 0x0f, 0xc4, 0x08, 0xc8, 0x93, 0xd5, 0x41, + 0x8e, 0x44, 0xec, 0x59, 0x39, 0xc9, 0xb3, 0x2a, 0x2c, 0x2f, 0x47, 0x2c, 0x69, 0xf5, 0x87, 0xb8, + 0x8b, 0xa5, 0xd5, 0x6b, 0x90, 0xfe, 0x76, 0x40, 0x83, 0x81, 0x37, 0xa7, 0x85, 0xc5, 0x35, 0x13, + 0x69, 0xd1, 0x0d, 0x58, 0x62, 0xdd, 0x00, 0x87, 0x5d, 0xda, 0x73, 0xff, 0xe7, 0x46, 0x9a, 0x00, + 0xd0, 0x17, 0x90, 0x13, 0x6d, 0x38, 0xa1, 0x24, 0xe7, 0x52, 0x56, 0x38, 0xca, 0x8a, 0x41, 0xe5, + 0xdf, 0x55, 0x48, 0xcb, 0xb8, 0xf4, 0x33, 0xd6, 0x71, 0x6a, 0xa1, 0x4d, 0xd7, 0xec, 0xab, 0x0f, + 0xab, 0x99, 0x3a, 0xbf, 0x26, 0xc7, 0x6b, 0x90, 0xfc, 0x80, 0x1a, 0x4c, 0xe5, 0x5c, 0x3d, 0x7d, + 0xce, 0x53, 0x67, 0xcf, 0x79, 0xfa, 0x14, 0x39, 0x47, 0x06, 0xac, 0xf3, 0x44, 0x13, 0x9f, 0x30, + 0x32, 0xb9, 0x41, 0x6c, 0x11, 0xbe, 0xb6, 0x38, 0xd7, 0xc2, 0x05, 0x8f, 0xf8, 0x46, 0x84, 0x97, + 0xe9, 0x31, 0x39, 0x1a, 0x6d, 0x42, 0xbe, 0x3d, 0x08, 0x7c, 0x9b, 0xcf, 0xbe, 0x2d, 0x4f, 0xc8, + 0xf7, 0x6b, 0xc6, 0xcc, 0x71, 0x39, 0x1f, 0xf1, 0xaf, 0xa3, 0x93, 0xd5, 0xe0, 0x8a, 0x40, 0x8e, + 0xb7, 0xcd, 0xb8, 0x40, 0x01, 0xe6, 0x6c, 0x2d, 0x27, 0x68, 0x05, 0x0e, 0x8a, 0x6f, 0xf3, 0xb8, + 0x12, 0x11, 0x02, 0x5d, 0x85, 0xdc, 0xc4, 0x19, 0x3f, 0x92, 0xb6, 0x2a, 0x38, 0xcb, 0xb1, 0x2b, + 0xbe, 0xdf, 0xae, 0x7f, 0xa7, 0x00, 0x4c, 0x7d, 0x88, 0x5d, 0x82, 0x8b, 0x07, 0x0d, 0x4b, 0xb7, + 0x1b, 0x4d, 0xcb, 0x68, 0xec, 0xdb, 0x0f, 0xf7, 0x5b, 0x4d, 0x7d, 0xcf, 0xb8, 0x63, 0xe8, 0xf5, + 0xfc, 0x02, 0x3a, 0x0f, 0xab, 0xd3, 0xca, 0xc7, 0x7a, 0x2b, 0xaf, 0xa0, 0x8b, 0x70, 0x7e, 0x5a, + 0x58, 0xdb, 0x6d, 0x59, 0x35, 0x63, 0x3f, 0x9f, 0x40, 0x08, 0x72, 0xd3, 0x8a, 0xfd, 0x46, 0x3e, + 0x89, 0x2e, 0x83, 0x76, 0x54, 0x66, 0x3f, 0x32, 0xac, 0x7b, 0xf6, 0x81, 0x6e, 0x35, 0xf2, 0xea, + 0xf5, 0xdf, 0x14, 0xc8, 0x1d, 0xfd, 0x34, 0x41, 0x25, 0xb8, 0xd4, 0x34, 0x1b, 0xcd, 0x46, 0xab, + 0xf6, 0xc0, 0x6e, 0x59, 0x35, 0xeb, 0x61, 0x6b, 0x26, 0xa6, 0x32, 0x14, 0x67, 0x01, 0x75, 0xbd, + 0xd9, 0x68, 0x19, 0x96, 0xdd, 0xd4, 0x4d, 0xa3, 0x51, 0xcf, 0x2b, 0xe8, 0x63, 0xb8, 0x32, 0x8b, + 0x39, 0x68, 0x58, 0xc6, 0xfe, 0xdd, 0x18, 0x92, 0x40, 0x05, 0xb8, 0x30, 0x0b, 0x69, 0xd6, 0x5a, + 0x2d, 0xbd, 0x1e, 0x05, 0x3d, 0xab, 0x33, 0xf5, 0xfb, 0xfa, 0x9e, 0xa5, 0xd7, 0xf3, 0xea, 0x3c, + 0xe6, 0x9d, 0x9a, 0xf1, 0x40, 0xaf, 0xe7, 0x53, 0xbb, 0x77, 0x5f, 0xbe, 0x2d, 0x2a, 0xaf, 0xde, + 0x16, 0x95, 0x7f, 0xde, 0x16, 0x95, 0xe7, 0xef, 0x8a, 0x0b, 0xaf, 0xde, 0x15, 0x17, 0xfe, 0x7c, + 0x57, 0x5c, 0xf8, 0x66, 0xab, 0x43, 0x58, 0x77, 0xd0, 0xae, 0x1c, 0x52, 0xaf, 0x2a, 0x17, 0xfe, + 0x56, 0x77, 0xd0, 0x8e, 0x9f, 0xab, 0xcf, 0xc4, 0x2f, 0x01, 0x36, 0xea, 0xe3, 0x90, 0x7f, 0xe5, + 0xa7, 0xc5, 0xdc, 0xdc, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x04, 0x79, 0x98, 0x28, 0x0c, + 0x00, 0x00, +>>>>>>> main } func (m *WeightedVoteOption) Marshal() (dAtA []byte, err error) { @@ -1493,6 +1748,7 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l +<<<<<<< HEAD if len(m.MinDepositRatio) > 0 { i -= len(m.MinDepositRatio) copy(dAtA[i:], m.MinDepositRatio) @@ -1502,6 +1758,8 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x82 } +======= +>>>>>>> main if m.BurnVoteVeto { i-- if m.BurnVoteVeto { @@ -1608,7 +1866,10 @@ func encodeVarintGov(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *WeightedVoteOption) Size() (n int) { if m == nil { return 0 @@ -1859,21 +2120,30 @@ func (m *Params) Size() (n int) { if m.BurnVoteVeto { n += 2 } +<<<<<<< HEAD l = len(m.MinDepositRatio) if l > 0 { n += 2 + l + sovGov(uint64(l)) } +======= +>>>>>>> main return n } func sovGov(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozGov(x uint64) (n int) { return sovGov(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozGov(x uint64) (n int) { + return sovGov(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *WeightedVoteOption) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1975,7 +2245,10 @@ func (m *WeightedVoteOption) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *Deposit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2111,7 +2384,10 @@ func (m *Deposit) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *Proposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2576,7 +2852,10 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *TallyResult) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2755,7 +3034,10 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *Vote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2923,7 +3205,10 @@ func (m *Vote) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *DepositParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3044,7 +3329,10 @@ func (m *DepositParams) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *VotingParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3131,7 +3419,10 @@ func (m *VotingParams) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *TallyParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3278,7 +3569,10 @@ func (m *TallyParams) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *Params) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3602,6 +3896,7 @@ func (m *Params) Unmarshal(dAtA []byte) error { } } m.BurnVoteVeto = bool(v != 0) +<<<<<<< HEAD case 16: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MinDepositRatio", wireType) @@ -3634,6 +3929,8 @@ func (m *Params) Unmarshal(dAtA []byte) error { } m.MinDepositRatio = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex +======= +>>>>>>> main default: iNdEx = preIndex skippy, err := skipGov(dAtA[iNdEx:]) @@ -3655,7 +3952,10 @@ func (m *Params) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipGov(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1/msgs.go b/x/gov/types/v1/msgs.go index 39f1a424..da5ba710 100644 --- a/x/gov/types/v1/msgs.go +++ b/x/gov/types/v1/msgs.go @@ -5,11 +5,19 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" codectypes "github.com/atomone-hub/atomone/codec/types" sdk "github.com/atomone-hub/atomone/types" sdktx "github.com/atomone-hub/atomone/types/tx" +======= + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdktx "github.com/cosmos/cosmos-sdk/types/tx" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/codec" "github.com/atomone-hub/atomone/x/gov/types" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" diff --git a/x/gov/types/v1/msgs_test.go b/x/gov/types/v1/msgs_test.go index 5fcd55c5..71ad7052 100644 --- a/x/gov/types/v1/msgs_test.go +++ b/x/gov/types/v1/msgs_test.go @@ -4,11 +4,21 @@ import ( "fmt" "testing" +<<<<<<< HEAD "cosmossdk.io/math" "github.com/stretchr/testify/require" sdk "github.com/atomone-hub/atomone/types" banktypes "github.com/atomone-hub/atomone/x/bank/types" +======= + "github.com/stretchr/testify/require" + + "cosmossdk.io/math" + + sdk "github.com/cosmos/cosmos-sdk/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + +>>>>>>> main v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) @@ -194,7 +204,11 @@ func TestMsgSubmitProposal_GetSignBytes(t *testing.T) { []sdk.Msg{banktypes.NewMsgSend(addrs[0], addrs[0], sdk.NewCoins())}, "bank/MsgSend", "Proposal for a bank msg send", +<<<<<<< HEAD fmt.Sprintf(`{"type":"atomone/v1/MsgSubmitProposal","value":{"initial_deposit":[],"messages":[{"type":"atomone/MsgSend","value":{"amount":[],"from_address":"%s","to_address":"%s"}}],"summary":"Proposal for a bank msg send","title":"bank/MsgSend"}}`, addrs[0], addrs[0]), +======= + fmt.Sprintf(`{"type":"atomone/v1/MsgSubmitProposal","value":{"initial_deposit":[],"messages":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[],"from_address":"%s","to_address":"%s"}}],"summary":"Proposal for a bank msg send","title":"bank/MsgSend"}}`, addrs[0], addrs[0]), +>>>>>>> main }, } diff --git a/x/gov/types/v1/params.go b/x/gov/types/v1/params.go index 907dc2ba..f1a09974 100644 --- a/x/gov/types/v1/params.go +++ b/x/gov/types/v1/params.go @@ -6,7 +6,11 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // Default period for deposits & voting @@ -21,11 +25,17 @@ var ( DefaultThreshold = sdk.NewDecWithPrec(5, 1) DefaultVetoThreshold = sdk.NewDecWithPrec(334, 3) DefaultMinInitialDepositRatio = sdk.ZeroDec() +<<<<<<< HEAD DefaultBurnProposalPrevote = false // set to false to replicate behavior of when this change was made (0.47) DefaultBurnVoteQuorom = false // set to false to replicate behavior of when this change was made (0.47) DefaultBurnVoteVeto = true // set to true to replicate behavior of when this change was made (0.47) DefaultMinDepositRatio = sdk.MustNewDecFromStr("0.01") // NOTE: backport from v50 +======= + DefaultBurnProposalPrevote = false // set to false to replicate behavior of when this change was made (0.47) + DefaultBurnVoteQuorom = false // set to false to replicate behavior of when this change was made (0.47) + DefaultBurnVoteVeto = true // set to true to replicate behavior of when this change was made (0.47) +>>>>>>> main ) // Deprecated: NewDepositParams creates a new DepositParams object @@ -55,7 +65,11 @@ func NewVotingParams(votingPeriod *time.Duration) VotingParams { // NewParams creates a new Params instance with given values. func NewParams( minDeposit sdk.Coins, maxDepositPeriod, votingPeriod time.Duration, +<<<<<<< HEAD quorum, threshold, vetoThreshold, minInitialDepositRatio string, burnProposalDeposit, burnVoteQuorum, burnVoteVeto bool, minDepositRatio string, +======= + quorum, threshold, vetoThreshold, minInitialDepositRatio string, burnProposalDeposit, burnVoteQuorum, burnVoteVeto bool, +>>>>>>> main ) Params { return Params{ MinDeposit: minDeposit, @@ -68,7 +82,10 @@ func NewParams( BurnProposalDepositPrevote: burnProposalDeposit, BurnVoteQuorum: burnVoteQuorum, BurnVoteVeto: burnVoteVeto, +<<<<<<< HEAD MinDepositRatio: minDepositRatio, +======= +>>>>>>> main } } @@ -85,7 +102,10 @@ func DefaultParams() Params { DefaultBurnProposalPrevote, DefaultBurnVoteQuorom, DefaultBurnVoteVeto, +<<<<<<< HEAD DefaultMinDepositRatio.String(), +======= +>>>>>>> main ) } diff --git a/x/gov/types/v1/params_legacy.go b/x/gov/types/v1/params_legacy.go index 1f2a3c3c..95b9361d 100644 --- a/x/gov/types/v1/params_legacy.go +++ b/x/gov/types/v1/params_legacy.go @@ -6,8 +6,13 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" paramtypes "github.com/atomone-hub/atomone/x/params/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" +>>>>>>> main ) // Parameter store key diff --git a/x/gov/types/v1/proposal.go b/x/gov/types/v1/proposal.go index 00e12034..76499073 100644 --- a/x/gov/types/v1/proposal.go +++ b/x/gov/types/v1/proposal.go @@ -5,9 +5,15 @@ import ( "strings" "time" +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec/types" sdk "github.com/atomone-hub/atomone/types" sdktx "github.com/atomone-hub/atomone/types/tx" +======= + "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + sdktx "github.com/cosmos/cosmos-sdk/types/tx" +>>>>>>> main ) const ( diff --git a/x/gov/types/v1/proposals_test.go b/x/gov/types/v1/proposals_test.go index 9be86b77..7c8caa28 100644 --- a/x/gov/types/v1/proposals_test.go +++ b/x/gov/types/v1/proposals_test.go @@ -7,7 +7,12 @@ import ( "github.com/stretchr/testify/require" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" + +>>>>>>> main v1 "github.com/atomone-hub/atomone/x/gov/types/v1" "github.com/atomone-hub/atomone/x/gov/types/v1beta1" ) diff --git a/x/gov/types/v1/querier.go b/x/gov/types/v1/querier.go index 6e674b0e..8fe2c84b 100644 --- a/x/gov/types/v1/querier.go +++ b/x/gov/types/v1/querier.go @@ -1,7 +1,11 @@ package v1 import ( +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // DONTCOVER diff --git a/x/gov/types/v1/query.pb.go b/x/gov/types/v1/query.pb.go index 27265ec2..7d74884a 100644 --- a/x/gov/types/v1/query.pb.go +++ b/x/gov/types/v1/query.pb.go @@ -6,18 +6,24 @@ package v1 import ( context "context" fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" query "github.com/atomone-hub/atomone/types/query" _ "github.com/cosmos/cosmos-proto" +======= + _ "github.com/cosmos/cosmos-proto" + query "github.com/cosmos/cosmos-sdk/types/query" +>>>>>>> main 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" status "google.golang.org/grpc/status" +<<<<<<< HEAD ) // Reference imports to suppress errors if they are not otherwise used. @@ -26,6 +32,17 @@ var ( _ = fmt.Errorf _ = math.Inf ) +======= + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -45,11 +62,17 @@ func (*QueryProposalRequest) ProtoMessage() {} func (*QueryProposalRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{0} } +<<<<<<< HEAD func (m *QueryProposalRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalRequest.Marshal(b, m, deterministic) @@ -62,6 +85,7 @@ func (m *QueryProposalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalRequest.Merge(m, src) @@ -71,6 +95,14 @@ func (m *QueryProposalRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalRequest.Merge(m, src) +} +func (m *QueryProposalRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalRequest.DiscardUnknown(m) } @@ -96,11 +128,17 @@ func (*QueryProposalResponse) ProtoMessage() {} func (*QueryProposalResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{1} } +<<<<<<< HEAD func (m *QueryProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalResponse.Marshal(b, m, deterministic) @@ -113,6 +151,7 @@ func (m *QueryProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalResponse.Merge(m, src) @@ -122,6 +161,14 @@ func (m *QueryProposalResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalResponse.Merge(m, src) +} +func (m *QueryProposalResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalResponse.DiscardUnknown(m) } @@ -153,11 +200,17 @@ func (*QueryProposalsRequest) ProtoMessage() {} func (*QueryProposalsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{2} } +<<<<<<< HEAD func (m *QueryProposalsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalsRequest.Marshal(b, m, deterministic) @@ -170,6 +223,7 @@ func (m *QueryProposalsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalsRequest.Merge(m, src) @@ -179,6 +233,14 @@ func (m *QueryProposalsRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalsRequest.Merge(m, src) +} +func (m *QueryProposalsRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalsRequest.DiscardUnknown(m) } @@ -228,11 +290,17 @@ func (*QueryProposalsResponse) ProtoMessage() {} func (*QueryProposalsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{3} } +<<<<<<< HEAD func (m *QueryProposalsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalsResponse.Marshal(b, m, deterministic) @@ -245,6 +313,7 @@ func (m *QueryProposalsResponse) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalsResponse.Merge(m, src) @@ -254,6 +323,14 @@ func (m *QueryProposalsResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalsResponse.Merge(m, src) +} +func (m *QueryProposalsResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalsResponse.DiscardUnknown(m) } @@ -288,11 +365,17 @@ func (*QueryVoteRequest) ProtoMessage() {} func (*QueryVoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{4} } +<<<<<<< HEAD func (m *QueryVoteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVoteRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVoteRequest.Marshal(b, m, deterministic) @@ -305,6 +388,7 @@ func (m *QueryVoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVoteRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVoteRequest.Merge(m, src) @@ -314,6 +398,14 @@ func (m *QueryVoteRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryVoteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVoteRequest.Merge(m, src) +} +func (m *QueryVoteRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVoteRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryVoteRequest.DiscardUnknown(m) } @@ -346,11 +438,17 @@ func (*QueryVoteResponse) ProtoMessage() {} func (*QueryVoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{5} } +<<<<<<< HEAD func (m *QueryVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVoteResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVoteResponse.Marshal(b, m, deterministic) @@ -363,6 +461,7 @@ func (m *QueryVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVoteResponse.Merge(m, src) @@ -372,6 +471,14 @@ func (m *QueryVoteResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryVoteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVoteResponse.Merge(m, src) +} +func (m *QueryVoteResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryVoteResponse.DiscardUnknown(m) } @@ -399,11 +506,17 @@ func (*QueryVotesRequest) ProtoMessage() {} func (*QueryVotesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{6} } +<<<<<<< HEAD func (m *QueryVotesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVotesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVotesRequest.Marshal(b, m, deterministic) @@ -416,6 +529,7 @@ func (m *QueryVotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVotesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVotesRequest.Merge(m, src) @@ -425,6 +539,14 @@ func (m *QueryVotesRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryVotesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVotesRequest.Merge(m, src) +} +func (m *QueryVotesRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVotesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryVotesRequest.DiscardUnknown(m) } @@ -459,11 +581,17 @@ func (*QueryVotesResponse) ProtoMessage() {} func (*QueryVotesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{7} } +<<<<<<< HEAD func (m *QueryVotesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVotesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVotesResponse.Marshal(b, m, deterministic) @@ -476,6 +604,7 @@ func (m *QueryVotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVotesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVotesResponse.Merge(m, src) @@ -485,6 +614,14 @@ func (m *QueryVotesResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryVotesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVotesResponse.Merge(m, src) +} +func (m *QueryVotesResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVotesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryVotesResponse.DiscardUnknown(m) } @@ -518,11 +655,17 @@ func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{8} } +<<<<<<< HEAD func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) @@ -535,6 +678,7 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsRequest.Merge(m, src) @@ -544,6 +688,14 @@ func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsRequest.Merge(m, src) +} +func (m *QueryParamsRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryParamsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } @@ -580,11 +732,17 @@ func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{9} } +<<<<<<< HEAD func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) @@ -597,6 +755,7 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsResponse.Merge(m, src) @@ -606,6 +765,14 @@ func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsResponse.Merge(m, src) +} +func (m *QueryParamsResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } @@ -657,11 +824,17 @@ func (*QueryDepositRequest) ProtoMessage() {} func (*QueryDepositRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{10} } +<<<<<<< HEAD func (m *QueryDepositRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositRequest.Marshal(b, m, deterministic) @@ -674,6 +847,7 @@ func (m *QueryDepositRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositRequest.Merge(m, src) @@ -683,6 +857,14 @@ func (m *QueryDepositRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositRequest.Merge(m, src) +} +func (m *QueryDepositRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositRequest.DiscardUnknown(m) } @@ -715,11 +897,17 @@ func (*QueryDepositResponse) ProtoMessage() {} func (*QueryDepositResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{11} } +<<<<<<< HEAD func (m *QueryDepositResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositResponse.Marshal(b, m, deterministic) @@ -732,6 +920,7 @@ func (m *QueryDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositResponse.Merge(m, src) @@ -741,6 +930,14 @@ func (m *QueryDepositResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositResponse.Merge(m, src) +} +func (m *QueryDepositResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositResponse.DiscardUnknown(m) } @@ -768,11 +965,17 @@ func (*QueryDepositsRequest) ProtoMessage() {} func (*QueryDepositsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{12} } +<<<<<<< HEAD func (m *QueryDepositsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositsRequest.Marshal(b, m, deterministic) @@ -785,6 +988,7 @@ func (m *QueryDepositsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositsRequest.Merge(m, src) @@ -794,6 +998,14 @@ func (m *QueryDepositsRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositsRequest.Merge(m, src) +} +func (m *QueryDepositsRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositsRequest.DiscardUnknown(m) } @@ -828,11 +1040,17 @@ func (*QueryDepositsResponse) ProtoMessage() {} func (*QueryDepositsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{13} } +<<<<<<< HEAD func (m *QueryDepositsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositsResponse.Marshal(b, m, deterministic) @@ -845,6 +1063,7 @@ func (m *QueryDepositsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositsResponse.Merge(m, src) @@ -854,6 +1073,14 @@ func (m *QueryDepositsResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositsResponse.Merge(m, src) +} +func (m *QueryDepositsResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositsResponse.DiscardUnknown(m) } @@ -886,11 +1113,17 @@ func (*QueryTallyResultRequest) ProtoMessage() {} func (*QueryTallyResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{14} } +<<<<<<< HEAD func (m *QueryTallyResultRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryTallyResultRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryTallyResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTallyResultRequest.Marshal(b, m, deterministic) @@ -903,6 +1136,7 @@ func (m *QueryTallyResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } +<<<<<<< HEAD func (m *QueryTallyResultRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTallyResultRequest.Merge(m, src) @@ -912,6 +1146,14 @@ func (m *QueryTallyResultRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryTallyResultRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryTallyResultRequest.Merge(m, src) +} +func (m *QueryTallyResultRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryTallyResultRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTallyResultRequest.DiscardUnknown(m) } @@ -937,11 +1179,17 @@ func (*QueryTallyResultResponse) ProtoMessage() {} func (*QueryTallyResultResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2290d0188dd70223, []int{15} } +<<<<<<< HEAD func (m *QueryTallyResultResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryTallyResultResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryTallyResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTallyResultResponse.Marshal(b, m, deterministic) @@ -954,6 +1202,7 @@ func (m *QueryTallyResultResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } +<<<<<<< HEAD func (m *QueryTallyResultResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTallyResultResponse.Merge(m, src) @@ -963,6 +1212,14 @@ func (m *QueryTallyResultResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryTallyResultResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryTallyResultResponse.Merge(m, src) +} +func (m *QueryTallyResultResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryTallyResultResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTallyResultResponse.DiscardUnknown(m) } @@ -998,6 +1255,7 @@ func init() { func init() { proto.RegisterFile("atomone/gov/v1/query.proto", fileDescriptor_2290d0188dd70223) } var fileDescriptor_2290d0188dd70223 = []byte{ +<<<<<<< HEAD // 970 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x5b, 0x6f, 0x1b, 0x45, 0x14, 0xce, 0x3a, 0x97, 0xda, 0x27, 0x6d, 0x80, 0x43, 0x2f, 0xce, 0xb6, 0x98, 0x74, 0x09, 0x8d, @@ -1067,6 +1325,75 @@ var ( _ context.Context _ grpc.ClientConn ) +======= + // 971 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdd, 0x6e, 0xdc, 0x44, + 0x14, 0x8e, 0x37, 0x3f, 0xdd, 0x3d, 0x69, 0x03, 0x1c, 0x42, 0xeb, 0xba, 0x65, 0x49, 0x4d, 0x48, + 0x42, 0x45, 0x3c, 0x6c, 0x4a, 0x5a, 0x84, 0x28, 0x12, 0x51, 0x69, 0xe8, 0x05, 0x52, 0xd8, 0x56, + 0x5c, 0x70, 0x13, 0x39, 0x59, 0xcb, 0xb5, 0xb4, 0xf1, 0xb8, 0x3b, 0xb3, 0x2b, 0xa2, 0xb0, 0xaa, + 0x84, 0x84, 0x04, 0x5c, 0x15, 0x21, 0x84, 0xe8, 0x73, 0xf0, 0x10, 0x5c, 0x56, 0x70, 0xc3, 0x25, + 0x4a, 0x78, 0x02, 0x9e, 0x00, 0x79, 0xe6, 0xd8, 0x6b, 0x3b, 0xde, 0x9f, 0x54, 0x15, 0x97, 0x9e, + 0xf9, 0xce, 0x39, 0xdf, 0xf9, 0xfb, 0x66, 0x17, 0x2c, 0x57, 0xf2, 0x03, 0x1e, 0x7a, 0xcc, 0xe7, + 0x3d, 0xd6, 0x6b, 0xb0, 0x47, 0x5d, 0xaf, 0x73, 0xe8, 0x44, 0x1d, 0x2e, 0x39, 0x2e, 0xd0, 0x9d, + 0xe3, 0xf3, 0x9e, 0xd3, 0x6b, 0x58, 0xd7, 0xf7, 0xb9, 0x38, 0xe0, 0x82, 0xed, 0xb9, 0xc2, 0xd3, + 0x40, 0xd6, 0x6b, 0xec, 0x79, 0xd2, 0x6d, 0xb0, 0xc8, 0xf5, 0x83, 0xd0, 0x95, 0x01, 0x0f, 0xb5, + 0xad, 0x75, 0xd5, 0xe7, 0xdc, 0x6f, 0x7b, 0xcc, 0x8d, 0x02, 0xe6, 0x86, 0x21, 0x97, 0xea, 0x52, + 0xd0, 0xad, 0x59, 0x88, 0x1a, 0x07, 0xd0, 0x37, 0x97, 0x75, 0x8c, 0x5d, 0xf5, 0xc5, 0xf4, 0x87, + 0xbe, 0xb2, 0x6f, 0xc1, 0xe2, 0xe7, 0x71, 0xd0, 0x9d, 0x0e, 0x8f, 0xb8, 0x70, 0xdb, 0x4d, 0xef, + 0x51, 0xd7, 0x13, 0x12, 0xdf, 0x80, 0xf9, 0x88, 0x8e, 0x76, 0x83, 0x96, 0x69, 0x2c, 0x19, 0x6b, + 0x33, 0x4d, 0x48, 0x8e, 0xee, 0xb5, 0xec, 0xcf, 0xe0, 0xb5, 0x82, 0xa1, 0x88, 0x78, 0x28, 0x3c, + 0x7c, 0x0f, 0xaa, 0x09, 0x4c, 0x99, 0xcd, 0x6f, 0x98, 0x4e, 0x3e, 0x67, 0x27, 0xb5, 0x49, 0x91, + 0xf6, 0x93, 0x4a, 0xc1, 0x9f, 0x48, 0x98, 0x6c, 0xc3, 0x4b, 0x29, 0x13, 0x21, 0x5d, 0xd9, 0x15, + 0xca, 0xed, 0xc2, 0x46, 0x7d, 0x98, 0xdb, 0xfb, 0x0a, 0xd5, 0x5c, 0x88, 0x72, 0xdf, 0xe8, 0xc0, + 0x6c, 0x8f, 0x4b, 0xaf, 0x63, 0x56, 0x96, 0x8c, 0xb5, 0xda, 0x96, 0xf9, 0xc7, 0x6f, 0xeb, 0x8b, + 0x54, 0x8b, 0x8f, 0x5b, 0xad, 0x8e, 0x27, 0xc4, 0x7d, 0xd9, 0x09, 0x42, 0xbf, 0xa9, 0x61, 0x78, + 0x13, 0x6a, 0x2d, 0x2f, 0xe2, 0x22, 0x90, 0xbc, 0x63, 0x4e, 0x8f, 0xb1, 0x19, 0x40, 0xf1, 0x2e, + 0xc0, 0xa0, 0x73, 0xe6, 0x8c, 0x2a, 0xc1, 0x8a, 0x43, 0x56, 0x71, 0x9b, 0x1d, 0x3d, 0x0f, 0xd4, + 0x66, 0x67, 0xc7, 0xf5, 0x3d, 0x4a, 0xb6, 0x99, 0xb1, 0xb4, 0x7f, 0x35, 0xe0, 0x62, 0xb1, 0x24, + 0x54, 0xe3, 0x9b, 0x50, 0x4b, 0x92, 0x8b, 0xab, 0x31, 0x3d, 0xb2, 0xc8, 0x03, 0x28, 0x6e, 0xe7, + 0xa8, 0x55, 0x14, 0xb5, 0xd5, 0xb1, 0xd4, 0x74, 0xd0, 0x1c, 0xb7, 0x7d, 0x78, 0x59, 0x51, 0xfb, + 0x82, 0x4b, 0x6f, 0xd2, 0x91, 0x39, 0x6b, 0x03, 0xec, 0xdb, 0xf0, 0x4a, 0x26, 0x08, 0xa5, 0xbe, + 0x06, 0x33, 0xf1, 0x2d, 0x8d, 0xd6, 0x62, 0x31, 0x6b, 0x85, 0x55, 0x08, 0xfb, 0xeb, 0x8c, 0xb9, + 0x98, 0x98, 0xe4, 0xdd, 0x92, 0x12, 0x3d, 0x4f, 0xf7, 0xbe, 0x37, 0x00, 0xb3, 0xe1, 0x89, 0xfe, + 0x75, 0x5d, 0x83, 0xa4, 0x6b, 0xe5, 0xfc, 0x35, 0xe4, 0xc5, 0x75, 0x6b, 0x93, 0xa8, 0xec, 0xb8, + 0x1d, 0xf7, 0x20, 0x57, 0x0a, 0x75, 0xb0, 0x2b, 0x0f, 0x23, 0x5d, 0xd0, 0x5a, 0x6c, 0x16, 0x1f, + 0x3d, 0x38, 0x8c, 0x3c, 0xfb, 0x69, 0x05, 0x5e, 0xcd, 0xd9, 0x51, 0x0e, 0x9f, 0xc0, 0x85, 0x1e, + 0x97, 0x41, 0xe8, 0xef, 0x6a, 0x30, 0xf5, 0xe2, 0x6a, 0x49, 0x2e, 0x41, 0xe8, 0x6b, 0xe3, 0xad, + 0x8a, 0x69, 0x34, 0xcf, 0xf7, 0x32, 0x27, 0xf8, 0x29, 0x2c, 0xd0, 0xd2, 0x24, 0x7e, 0x74, 0x8a, + 0xaf, 0x17, 0xfd, 0xdc, 0xd1, 0xa8, 0x8c, 0xa3, 0x0b, 0xad, 0xec, 0x11, 0x6e, 0xc1, 0x79, 0xe9, + 0xb6, 0xdb, 0x87, 0x89, 0x9f, 0x69, 0xe5, 0xe7, 0x4a, 0xd1, 0xcf, 0x83, 0x18, 0x93, 0xf1, 0x32, + 0x2f, 0x07, 0x07, 0xe8, 0xc0, 0x1c, 0x59, 0xeb, 0x8d, 0xbd, 0x78, 0x6a, 0x9f, 0x74, 0x11, 0x08, + 0x65, 0x87, 0x54, 0x1b, 0x22, 0x37, 0xf1, 0x7c, 0xe5, 0x54, 0xa5, 0x32, 0xb1, 0xaa, 0xd8, 0xf7, + 0x48, 0xa8, 0xd3, 0x78, 0xd4, 0x8c, 0x06, 0x9c, 0x23, 0x10, 0xb5, 0xe1, 0xd2, 0x90, 0xf2, 0x35, + 0x13, 0x9c, 0xfd, 0x38, 0xef, 0xea, 0xff, 0xdf, 0x8d, 0x9f, 0x0d, 0x12, 0xfb, 0x01, 0x03, 0xca, + 0xe6, 0x06, 0x54, 0x89, 0x65, 0xb2, 0x21, 0x43, 0xd3, 0x49, 0x81, 0x2f, 0x6e, 0x4f, 0x3e, 0x80, + 0x4b, 0x8a, 0x96, 0x1a, 0x94, 0xa6, 0x27, 0xba, 0x6d, 0x79, 0x86, 0xf7, 0xd0, 0x3c, 0x6d, 0x9b, + 0xf6, 0x68, 0x56, 0x8d, 0x1a, 0x75, 0xa8, 0x7c, 0x30, 0xc9, 0x46, 0x23, 0x37, 0xfe, 0xad, 0xc2, + 0xac, 0xf2, 0x87, 0xdf, 0x19, 0x50, 0x4d, 0xb4, 0x1c, 0x97, 0x8b, 0xa6, 0x65, 0x8f, 0xb7, 0xf5, + 0xd6, 0x18, 0x94, 0xa6, 0x65, 0xb3, 0x6f, 0xfe, 0xfc, 0xe7, 0xa7, 0xca, 0xdb, 0xb8, 0xca, 0x0a, + 0xbf, 0x1c, 0xd2, 0x07, 0x83, 0x1d, 0x65, 0x92, 0xee, 0x63, 0x1f, 0x6a, 0xe9, 0x5b, 0x84, 0xa3, + 0x83, 0x24, 0x43, 0x65, 0xad, 0x8c, 0x83, 0x11, 0x99, 0x6b, 0x8a, 0xcc, 0x15, 0xbc, 0x3c, 0x94, + 0x0c, 0xfe, 0x60, 0xc0, 0x4c, 0xac, 0x8f, 0xb8, 0x54, 0xea, 0x33, 0xf3, 0x16, 0x59, 0xd7, 0x46, + 0x20, 0x28, 0xe0, 0x6d, 0x15, 0xf0, 0x16, 0x6e, 0x4e, 0x98, 0x3d, 0x53, 0xa2, 0xcc, 0x8e, 0xd4, + 0xdb, 0xd4, 0xc7, 0x6f, 0x0d, 0x98, 0x55, 0xd2, 0x8e, 0xc3, 0x63, 0xa5, 0x45, 0xb0, 0x47, 0x41, + 0x88, 0xcf, 0xa6, 0xe2, 0xc3, 0x70, 0xfd, 0x4c, 0x7c, 0xf0, 0x31, 0xcc, 0x91, 0x82, 0x95, 0x07, + 0xc9, 0x69, 0xbe, 0xf5, 0xe6, 0x48, 0x0c, 0x31, 0x79, 0x47, 0x31, 0x59, 0xc1, 0xe5, 0x53, 0x4c, + 0x14, 0x8e, 0x1d, 0x65, 0x9e, 0x8d, 0x3e, 0x3e, 0x35, 0xe0, 0x1c, 0xed, 0x24, 0x96, 0xbb, 0xcf, + 0x4b, 0xa4, 0xb5, 0x3c, 0x1a, 0x44, 0x24, 0xee, 0x28, 0x12, 0x1f, 0xe1, 0x87, 0x93, 0x96, 0x23, + 0x91, 0x03, 0x76, 0x94, 0x8a, 0x66, 0x1f, 0x7f, 0x34, 0xa0, 0x9a, 0x88, 0x0c, 0x8e, 0x0c, 0x2c, + 0x46, 0x2f, 0x4f, 0x51, 0xa9, 0xec, 0xf7, 0x15, 0xbf, 0x0d, 0x7c, 0xf7, 0xac, 0xfc, 0xf0, 0x17, + 0x03, 0xe6, 0x33, 0x1b, 0x8f, 0xab, 0xa5, 0x01, 0x4f, 0x6b, 0x90, 0xb5, 0x36, 0x1e, 0xf8, 0xbc, + 0xb3, 0xa4, 0x44, 0x67, 0x6b, 0xfb, 0xf7, 0xe3, 0xba, 0xf1, 0xec, 0xb8, 0x6e, 0xfc, 0x7d, 0x5c, + 0x37, 0x9e, 0x9c, 0xd4, 0xa7, 0x9e, 0x9d, 0xd4, 0xa7, 0xfe, 0x3a, 0xa9, 0x4f, 0x7d, 0xb9, 0xee, + 0x07, 0xf2, 0x61, 0x77, 0xcf, 0xd9, 0xe7, 0x07, 0x89, 0xcb, 0xf5, 0x87, 0xdd, 0xbd, 0xd4, 0xfd, + 0x57, 0x2a, 0x40, 0x3c, 0x10, 0x22, 0xfe, 0xfb, 0x32, 0xa7, 0xfe, 0x5c, 0xdc, 0xf8, 0x2f, 0x00, + 0x00, 0xff, 0xff, 0x34, 0x71, 0xdf, 0xcf, 0x09, 0x0d, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -1195,11 +1522,17 @@ type QueryServer interface { } // UnimplementedQueryServer can be embedded to have forward compatible implementations. +<<<<<<< HEAD type UnimplementedQueryServer struct{} +======= +type UnimplementedQueryServer struct { +} +>>>>>>> main func (*UnimplementedQueryServer) Proposal(ctx context.Context, req *QueryProposalRequest) (*QueryProposalResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Proposal not implemented") } +<<<<<<< HEAD func (*UnimplementedQueryServer) Proposals(ctx context.Context, req *QueryProposalsRequest) (*QueryProposalsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Proposals not implemented") @@ -1225,6 +1558,26 @@ func (*UnimplementedQueryServer) Deposits(ctx context.Context, req *QueryDeposit return nil, status.Errorf(codes.Unimplemented, "method Deposits not implemented") } +======= +func (*UnimplementedQueryServer) Proposals(ctx context.Context, req *QueryProposalsRequest) (*QueryProposalsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Proposals not implemented") +} +func (*UnimplementedQueryServer) Vote(ctx context.Context, req *QueryVoteRequest) (*QueryVoteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Vote not implemented") +} +func (*UnimplementedQueryServer) Votes(ctx context.Context, req *QueryVotesRequest) (*QueryVotesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Votes not implemented") +} +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") +} +func (*UnimplementedQueryServer) Deposit(ctx context.Context, req *QueryDepositRequest) (*QueryDepositResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deposit not implemented") +} +func (*UnimplementedQueryServer) Deposits(ctx context.Context, req *QueryDepositsRequest) (*QueryDepositsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deposits not implemented") +} +>>>>>>> main func (*UnimplementedQueryServer) TallyResult(ctx context.Context, req *QueryTallyResultRequest) (*QueryTallyResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TallyResult not implemented") } @@ -2077,7 +2430,10 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalRequest) Size() (n int) { if m == nil { return 0 @@ -2340,11 +2696,17 @@ func (m *QueryTallyResultResponse) Size() (n int) { func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozQuery(x uint64) (n int) { + return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *QueryProposalRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2414,7 +2776,10 @@ func (m *QueryProposalRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2501,7 +2866,10 @@ func (m *QueryProposalResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2671,7 +3039,10 @@ func (m *QueryProposalsRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2792,7 +3163,10 @@ func (m *QueryProposalsResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVoteRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2894,7 +3268,10 @@ func (m *QueryVoteRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2981,7 +3358,10 @@ func (m *QueryVoteResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVotesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3087,7 +3467,10 @@ func (m *QueryVotesRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVotesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3208,7 +3591,10 @@ func (m *QueryVotesResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3291,7 +3677,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3486,7 +3875,10 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3588,7 +3980,10 @@ func (m *QueryDepositRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3675,7 +4070,10 @@ func (m *QueryDepositResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3781,7 +4179,10 @@ func (m *QueryDepositsRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3902,7 +4303,10 @@ func (m *QueryDepositsResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryTallyResultRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3972,7 +4376,10 @@ func (m *QueryTallyResultRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryTallyResultResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4059,7 +4466,10 @@ func (m *QueryTallyResultResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1/query.pb.gw.go b/x/gov/types/v1/query.pb.gw.go index 87a1a875..3c31629d 100644 --- a/x/gov/types/v1/query.pb.gw.go +++ b/x/gov/types/v1/query.pb.gw.go @@ -25,6 +25,7 @@ import ( ) // Suppress "imported and not used" errors +<<<<<<< HEAD var ( _ codes.Code _ io.Reader @@ -34,6 +35,15 @@ var ( _ = descriptor.ForMessage _ = metadata.Join ) +======= +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join +>>>>>>> main func request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProposalRequest @@ -52,12 +62,20 @@ func request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marshaler, } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := client.Proposal(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -77,15 +95,28 @@ func local_request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marsh } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := server.Proposal(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD } var filter_Query_Proposals_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +======= + +} + +var ( + filter_Query_Proposals_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) +>>>>>>> main func request_Query_Proposals_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProposalsRequest @@ -100,6 +131,10 @@ func request_Query_Proposals_0(ctx context.Context, marshaler runtime.Marshaler, msg, err := client.Proposals(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Proposals_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -115,6 +150,10 @@ func local_request_Query_Proposals_0(ctx context.Context, marshaler runtime.Mars msg, err := server.Proposals(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -134,6 +173,10 @@ func request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, clie } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -144,12 +187,20 @@ func request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, clie } protoReq.Voter, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "voter", err) } msg, err := client.Vote(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -169,6 +220,10 @@ func local_request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -179,15 +234,28 @@ func local_request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler } protoReq.Voter, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "voter", err) } msg, err := server.Vote(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD } var filter_Query_Votes_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +======= + +} + +var ( + filter_Query_Votes_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) +>>>>>>> main func request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryVotesRequest @@ -206,6 +274,10 @@ func request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, cli } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -219,6 +291,10 @@ func request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, cli msg, err := client.Votes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -238,6 +314,10 @@ func local_request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshale } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -251,6 +331,10 @@ func local_request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshale msg, err := server.Votes(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } 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) { @@ -270,12 +354,20 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } protoReq.ParamsType, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "params_type", err) } msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -295,12 +387,20 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } protoReq.ParamsType, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "params_type", err) } msg, err := server.Params(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -320,6 +420,10 @@ func request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, c } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -330,12 +434,20 @@ func request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, c } protoReq.Depositor, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "depositor", err) } msg, err := client.Deposit(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -355,6 +467,10 @@ func local_request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marsha } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -365,15 +481,28 @@ func local_request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marsha } protoReq.Depositor, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "depositor", err) } msg, err := server.Deposit(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD } var filter_Query_Deposits_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +======= + +} + +var ( + filter_Query_Deposits_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) +>>>>>>> main func request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryDepositsRequest @@ -392,6 +521,10 @@ func request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -405,6 +538,10 @@ func request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, msg, err := client.Deposits(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -424,6 +561,10 @@ func local_request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marsh } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -437,6 +578,10 @@ func local_request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marsh msg, err := server.Deposits(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -456,12 +601,20 @@ func request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Marshale } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := client.TallyResult(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -481,12 +634,20 @@ func local_request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Ma } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := server.TallyResult(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -494,6 +655,10 @@ func local_request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Ma // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // 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 { +<<<<<<< HEAD +======= + +>>>>>>> main mux.Handle("GET", pattern_Query_Proposal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -514,6 +679,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Proposal_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Proposals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -536,6 +705,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Proposals_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Vote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -558,6 +731,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Vote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Votes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -580,6 +757,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Votes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -602,6 +783,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -624,6 +809,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Deposit_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposits_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -646,6 +835,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Deposits_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_TallyResult_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -668,6 +861,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TallyResult_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) return nil @@ -710,6 +907,10 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { +<<<<<<< HEAD +======= + +>>>>>>> main mux.Handle("GET", pattern_Query_Proposal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -727,6 +928,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Proposal_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Proposals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -746,6 +951,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Proposals_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Vote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -765,6 +974,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Vote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Votes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -784,6 +997,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Votes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -803,6 +1020,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -822,6 +1043,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Deposit_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposits_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -841,6 +1066,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Deposits_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_TallyResult_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -860,6 +1089,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TallyResult_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) return nil diff --git a/x/gov/types/v1/tally.go b/x/gov/types/v1/tally.go index 8a5fc7de..4dbfb551 100644 --- a/x/gov/types/v1/tally.go +++ b/x/gov/types/v1/tally.go @@ -3,7 +3,11 @@ package v1 import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // ValidatorGovInfo used for tallying diff --git a/x/gov/types/v1/tx.pb.go b/x/gov/types/v1/tx.pb.go index 7e57c1bd..8faa9979 100644 --- a/x/gov/types/v1/tx.pb.go +++ b/x/gov/types/v1/tx.pb.go @@ -6,6 +6,7 @@ package v1 import ( context "context" fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" @@ -15,12 +16,20 @@ import ( _ "github.com/atomone-hub/atomone/types/msgservice" _ "github.com/atomone-hub/atomone/types/tx/amino" _ "github.com/cosmos/cosmos-proto" +======= + _ "github.com/cosmos/cosmos-proto" + types "github.com/cosmos/cosmos-sdk/codec/types" + types1 "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" +>>>>>>> main _ "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" +<<<<<<< HEAD ) // Reference imports to suppress errors if they are not otherwise used. @@ -29,6 +38,17 @@ var ( _ = fmt.Errorf _ = math.Inf ) +======= + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -41,8 +61,12 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MsgSubmitProposal struct { // messages are the arbitrary messages to be executed if proposal passes. Messages []*types.Any `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages,omitempty"` +<<<<<<< HEAD // initial_deposit is the deposit value that must be paid at proposal // submission. +======= + // initial_deposit is the deposit value that must be paid at proposal submission. +>>>>>>> main InitialDeposit []types1.Coin `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3" json:"initial_deposit"` // proposer is the account address of the proposer. Proposer string `protobuf:"bytes,3,opt,name=proposer,proto3" json:"proposer,omitempty"` @@ -64,11 +88,17 @@ func (*MsgSubmitProposal) ProtoMessage() {} func (*MsgSubmitProposal) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{0} } +<<<<<<< HEAD func (m *MsgSubmitProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgSubmitProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgSubmitProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSubmitProposal.Marshal(b, m, deterministic) @@ -81,6 +111,7 @@ func (m *MsgSubmitProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } +<<<<<<< HEAD func (m *MsgSubmitProposal) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSubmitProposal.Merge(m, src) @@ -90,6 +121,14 @@ func (m *MsgSubmitProposal) XXX_Size() int { return m.Size() } +======= +func (m *MsgSubmitProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSubmitProposal.Merge(m, src) +} +func (m *MsgSubmitProposal) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgSubmitProposal) XXX_DiscardUnknown() { xxx_messageInfo_MsgSubmitProposal.DiscardUnknown(m) } @@ -150,11 +189,17 @@ func (*MsgSubmitProposalResponse) ProtoMessage() {} func (*MsgSubmitProposalResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{1} } +<<<<<<< HEAD func (m *MsgSubmitProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgSubmitProposalResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgSubmitProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSubmitProposalResponse.Marshal(b, m, deterministic) @@ -167,6 +212,7 @@ func (m *MsgSubmitProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } +<<<<<<< HEAD func (m *MsgSubmitProposalResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSubmitProposalResponse.Merge(m, src) @@ -176,6 +222,14 @@ func (m *MsgSubmitProposalResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgSubmitProposalResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSubmitProposalResponse.Merge(m, src) +} +func (m *MsgSubmitProposalResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgSubmitProposalResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgSubmitProposalResponse.DiscardUnknown(m) } @@ -204,11 +258,17 @@ func (*MsgExecLegacyContent) ProtoMessage() {} func (*MsgExecLegacyContent) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{2} } +<<<<<<< HEAD func (m *MsgExecLegacyContent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgExecLegacyContent) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgExecLegacyContent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgExecLegacyContent.Marshal(b, m, deterministic) @@ -221,6 +281,7 @@ func (m *MsgExecLegacyContent) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } +<<<<<<< HEAD func (m *MsgExecLegacyContent) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgExecLegacyContent.Merge(m, src) @@ -230,6 +291,14 @@ func (m *MsgExecLegacyContent) XXX_Size() int { return m.Size() } +======= +func (m *MsgExecLegacyContent) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgExecLegacyContent.Merge(m, src) +} +func (m *MsgExecLegacyContent) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgExecLegacyContent) XXX_DiscardUnknown() { xxx_messageInfo_MsgExecLegacyContent.DiscardUnknown(m) } @@ -251,7 +320,12 @@ func (m *MsgExecLegacyContent) GetAuthority() string { } // MsgExecLegacyContentResponse defines the Msg/ExecLegacyContent response type. +<<<<<<< HEAD type MsgExecLegacyContentResponse struct{} +======= +type MsgExecLegacyContentResponse struct { +} +>>>>>>> main func (m *MsgExecLegacyContentResponse) Reset() { *m = MsgExecLegacyContentResponse{} } func (m *MsgExecLegacyContentResponse) String() string { return proto.CompactTextString(m) } @@ -259,11 +333,17 @@ func (*MsgExecLegacyContentResponse) ProtoMessage() {} func (*MsgExecLegacyContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{3} } +<<<<<<< HEAD func (m *MsgExecLegacyContentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgExecLegacyContentResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgExecLegacyContentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgExecLegacyContentResponse.Marshal(b, m, deterministic) @@ -276,6 +356,7 @@ func (m *MsgExecLegacyContentResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } +<<<<<<< HEAD func (m *MsgExecLegacyContentResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgExecLegacyContentResponse.Merge(m, src) @@ -285,6 +366,14 @@ func (m *MsgExecLegacyContentResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgExecLegacyContentResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgExecLegacyContentResponse.Merge(m, src) +} +func (m *MsgExecLegacyContentResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgExecLegacyContentResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgExecLegacyContentResponse.DiscardUnknown(m) } @@ -309,11 +398,17 @@ func (*MsgVote) ProtoMessage() {} func (*MsgVote) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{4} } +<<<<<<< HEAD func (m *MsgVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVote.Marshal(b, m, deterministic) @@ -326,6 +421,7 @@ func (m *MsgVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVote) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVote.Merge(m, src) @@ -335,6 +431,14 @@ func (m *MsgVote) XXX_Size() int { return m.Size() } +======= +func (m *MsgVote) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVote.Merge(m, src) +} +func (m *MsgVote) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVote) XXX_DiscardUnknown() { xxx_messageInfo_MsgVote.DiscardUnknown(m) } @@ -370,7 +474,12 @@ func (m *MsgVote) GetMetadata() string { } // MsgVoteResponse defines the Msg/Vote response type. +<<<<<<< HEAD type MsgVoteResponse struct{} +======= +type MsgVoteResponse struct { +} +>>>>>>> main func (m *MsgVoteResponse) Reset() { *m = MsgVoteResponse{} } func (m *MsgVoteResponse) String() string { return proto.CompactTextString(m) } @@ -378,11 +487,17 @@ func (*MsgVoteResponse) ProtoMessage() {} func (*MsgVoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{5} } +<<<<<<< HEAD func (m *MsgVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVoteResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVoteResponse.Marshal(b, m, deterministic) @@ -395,6 +510,7 @@ func (m *MsgVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVoteResponse.Merge(m, src) @@ -404,6 +520,14 @@ func (m *MsgVoteResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgVoteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVoteResponse.Merge(m, src) +} +func (m *MsgVoteResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgVoteResponse.DiscardUnknown(m) } @@ -428,11 +552,17 @@ func (*MsgVoteWeighted) ProtoMessage() {} func (*MsgVoteWeighted) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{6} } +<<<<<<< HEAD func (m *MsgVoteWeighted) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVoteWeighted) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVoteWeighted) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVoteWeighted.Marshal(b, m, deterministic) @@ -445,6 +575,7 @@ func (m *MsgVoteWeighted) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVoteWeighted) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVoteWeighted.Merge(m, src) @@ -454,6 +585,14 @@ func (m *MsgVoteWeighted) XXX_Size() int { return m.Size() } +======= +func (m *MsgVoteWeighted) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVoteWeighted.Merge(m, src) +} +func (m *MsgVoteWeighted) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVoteWeighted) XXX_DiscardUnknown() { xxx_messageInfo_MsgVoteWeighted.DiscardUnknown(m) } @@ -489,7 +628,12 @@ func (m *MsgVoteWeighted) GetMetadata() string { } // MsgVoteWeightedResponse defines the Msg/VoteWeighted response type. +<<<<<<< HEAD type MsgVoteWeightedResponse struct{} +======= +type MsgVoteWeightedResponse struct { +} +>>>>>>> main func (m *MsgVoteWeightedResponse) Reset() { *m = MsgVoteWeightedResponse{} } func (m *MsgVoteWeightedResponse) String() string { return proto.CompactTextString(m) } @@ -497,11 +641,17 @@ func (*MsgVoteWeightedResponse) ProtoMessage() {} func (*MsgVoteWeightedResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{7} } +<<<<<<< HEAD func (m *MsgVoteWeightedResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVoteWeightedResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVoteWeightedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVoteWeightedResponse.Marshal(b, m, deterministic) @@ -514,6 +664,7 @@ func (m *MsgVoteWeightedResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVoteWeightedResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVoteWeightedResponse.Merge(m, src) @@ -523,6 +674,14 @@ func (m *MsgVoteWeightedResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgVoteWeightedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVoteWeightedResponse.Merge(m, src) +} +func (m *MsgVoteWeightedResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVoteWeightedResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgVoteWeightedResponse.DiscardUnknown(m) } @@ -545,11 +704,17 @@ func (*MsgDeposit) ProtoMessage() {} func (*MsgDeposit) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{8} } +<<<<<<< HEAD func (m *MsgDeposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgDeposit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgDeposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgDeposit.Marshal(b, m, deterministic) @@ -562,6 +727,7 @@ func (m *MsgDeposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *MsgDeposit) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgDeposit.Merge(m, src) @@ -571,6 +737,14 @@ func (m *MsgDeposit) XXX_Size() int { return m.Size() } +======= +func (m *MsgDeposit) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeposit.Merge(m, src) +} +func (m *MsgDeposit) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgDeposit) XXX_DiscardUnknown() { xxx_messageInfo_MsgDeposit.DiscardUnknown(m) } @@ -599,7 +773,12 @@ func (m *MsgDeposit) GetAmount() []types1.Coin { } // MsgDepositResponse defines the Msg/Deposit response type. +<<<<<<< HEAD type MsgDepositResponse struct{} +======= +type MsgDepositResponse struct { +} +>>>>>>> main func (m *MsgDepositResponse) Reset() { *m = MsgDepositResponse{} } func (m *MsgDepositResponse) String() string { return proto.CompactTextString(m) } @@ -607,11 +786,17 @@ func (*MsgDepositResponse) ProtoMessage() {} func (*MsgDepositResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{9} } +<<<<<<< HEAD func (m *MsgDepositResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgDepositResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgDepositResponse.Marshal(b, m, deterministic) @@ -624,6 +809,7 @@ func (m *MsgDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *MsgDepositResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgDepositResponse.Merge(m, src) @@ -633,6 +819,14 @@ func (m *MsgDepositResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgDepositResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDepositResponse.Merge(m, src) +} +func (m *MsgDepositResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgDepositResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgDepositResponse.DiscardUnknown(m) } @@ -643,8 +837,12 @@ var xxx_messageInfo_MsgDepositResponse proto.InternalMessageInfo // // Since: cosmos-sdk 0.47 type MsgUpdateParams struct { +<<<<<<< HEAD // authority is the address that controls the module (defaults to x/gov unless // overwritten). +======= + // authority is the address that controls the module (defaults to x/gov unless overwritten). +>>>>>>> main Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` // params defines the x/gov parameters to update. // @@ -658,11 +856,17 @@ func (*MsgUpdateParams) ProtoMessage() {} func (*MsgUpdateParams) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{10} } +<<<<<<< HEAD func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgUpdateParams.Marshal(b, m, deterministic) @@ -675,6 +879,7 @@ func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } +<<<<<<< HEAD func (m *MsgUpdateParams) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgUpdateParams.Merge(m, src) @@ -684,6 +889,14 @@ func (m *MsgUpdateParams) XXX_Size() int { return m.Size() } +======= +func (m *MsgUpdateParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParams.Merge(m, src) +} +func (m *MsgUpdateParams) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgUpdateParams) XXX_DiscardUnknown() { xxx_messageInfo_MsgUpdateParams.DiscardUnknown(m) } @@ -708,7 +921,12 @@ func (m *MsgUpdateParams) GetParams() Params { // MsgUpdateParams message. // // Since: cosmos-sdk 0.47 +<<<<<<< HEAD type MsgUpdateParamsResponse struct{} +======= +type MsgUpdateParamsResponse struct { +} +>>>>>>> main func (m *MsgUpdateParamsResponse) Reset() { *m = MsgUpdateParamsResponse{} } func (m *MsgUpdateParamsResponse) String() string { return proto.CompactTextString(m) } @@ -716,11 +934,17 @@ func (*MsgUpdateParamsResponse) ProtoMessage() {} func (*MsgUpdateParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_f6c84786701fca8d, []int{11} } +<<<<<<< HEAD func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgUpdateParamsResponse.Marshal(b, m, deterministic) @@ -733,6 +957,7 @@ func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } +<<<<<<< HEAD func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src) @@ -742,6 +967,14 @@ func (m *MsgUpdateParamsResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src) +} +func (m *MsgUpdateParamsResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgUpdateParamsResponse.DiscardUnknown(m) } @@ -766,6 +999,7 @@ func init() { func init() { proto.RegisterFile("atomone/gov/v1/tx.proto", fileDescriptor_f6c84786701fca8d) } var fileDescriptor_f6c84786701fca8d = []byte{ +<<<<<<< HEAD // 914 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0xe3, 0x44, 0x14, 0xae, 0xfb, 0x23, 0xd9, 0xbe, 0xa2, 0xae, 0x3a, 0xca, 0x52, 0xd7, 0x54, 0x49, 0xd7, 0x42, @@ -832,6 +1066,71 @@ var ( _ context.Context _ grpc.ClientConn ) +======= + // 912 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4d, 0x6f, 0xe3, 0x44, + 0x18, 0xae, 0xfb, 0x91, 0x6c, 0xa7, 0xa8, 0xab, 0x8e, 0x02, 0x75, 0x4d, 0x95, 0x74, 0x2d, 0x24, + 0xba, 0x15, 0xb5, 0x49, 0x16, 0x90, 0x88, 0x7a, 0x60, 0xb3, 0x20, 0xb4, 0x12, 0xd1, 0xae, 0xbc, + 0xe2, 0x43, 0x1c, 0xa8, 0x26, 0xf1, 0x30, 0xb5, 0x54, 0x7b, 0x2c, 0xcf, 0x24, 0x6a, 0x6e, 0x88, + 0x23, 0x27, 0x4e, 0xfc, 0x06, 0x8e, 0x3d, 0xec, 0x65, 0xff, 0x00, 0x5a, 0x71, 0x5a, 0x71, 0xe2, + 0xb4, 0x42, 0xed, 0xa1, 0x12, 0xff, 0x01, 0x09, 0xcd, 0x97, 0x13, 0xc7, 0x6e, 0x53, 0x71, 0xe0, + 0x12, 0xcd, 0xbc, 0x1f, 0xcf, 0xbc, 0xcf, 0x33, 0xef, 0x3b, 0x0e, 0xd8, 0x46, 0x9c, 0xc6, 0x34, + 0xc1, 0x3e, 0xa1, 0x63, 0x7f, 0xdc, 0xf6, 0xf9, 0x99, 0x97, 0x66, 0x94, 0x53, 0xb8, 0xa9, 0x1d, + 0x1e, 0xa1, 0x63, 0x6f, 0xdc, 0x76, 0x9a, 0x43, 0xca, 0x62, 0xca, 0xfc, 0x01, 0x62, 0xd8, 0x1f, + 0xb7, 0x07, 0x98, 0xa3, 0xb6, 0x3f, 0xa4, 0x51, 0xa2, 0xe2, 0x1d, 0x7b, 0x0e, 0x48, 0xa4, 0x29, + 0x4f, 0x83, 0x50, 0x42, 0xe5, 0xd2, 0x17, 0x2b, 0x6d, 0xdd, 0x51, 0x78, 0xc7, 0xca, 0xa1, 0x36, + 0xc6, 0x45, 0x28, 0x25, 0xa7, 0xd8, 0x97, 0xbb, 0xc1, 0xe8, 0x7b, 0x1f, 0x25, 0x13, 0xed, 0xda, + 0xd6, 0x55, 0xc4, 0x8c, 0x88, 0x43, 0x62, 0x46, 0xb4, 0x63, 0x0b, 0xc5, 0x51, 0x42, 0x7d, 0xf9, + 0xab, 0x4c, 0xee, 0x6f, 0xcb, 0x60, 0xab, 0xcf, 0xc8, 0xb3, 0xd1, 0x20, 0x8e, 0xf8, 0xd3, 0x8c, + 0xa6, 0x94, 0xa1, 0x53, 0xf8, 0x3e, 0xb8, 0x13, 0x63, 0xc6, 0x10, 0xc1, 0xcc, 0xb6, 0xf6, 0x56, + 0xf6, 0x37, 0x3a, 0x0d, 0x4f, 0x9d, 0xe7, 0x99, 0xf3, 0xbc, 0x87, 0xc9, 0x24, 0xc8, 0xa3, 0x60, + 0x1f, 0xdc, 0x8d, 0x92, 0x88, 0x47, 0xe8, 0xf4, 0x38, 0xc4, 0x29, 0x65, 0x11, 0xb7, 0x97, 0x65, + 0xe2, 0x8e, 0xa7, 0xcb, 0x16, 0x9a, 0x78, 0x5a, 0x13, 0xef, 0x11, 0x8d, 0x92, 0xde, 0xfa, 0xcb, + 0xd7, 0xad, 0xa5, 0x5f, 0xaf, 0xce, 0x0f, 0xac, 0x60, 0x53, 0x27, 0x7f, 0xaa, 0x72, 0xe1, 0x07, + 0xe0, 0x4e, 0x2a, 0x8b, 0xc1, 0x99, 0xbd, 0xb2, 0x67, 0xed, 0xaf, 0xf7, 0xec, 0x3f, 0x9e, 0x1f, + 0x36, 0x34, 0xd4, 0xc3, 0x30, 0xcc, 0x30, 0x63, 0xcf, 0x78, 0x16, 0x25, 0x24, 0xc8, 0x23, 0xa1, + 0x23, 0xca, 0xe6, 0x28, 0x44, 0x1c, 0xd9, 0xab, 0x22, 0x2b, 0xc8, 0xf7, 0xb0, 0x01, 0xd6, 0x78, + 0xc4, 0x4f, 0xb1, 0xbd, 0x26, 0x1d, 0x6a, 0x03, 0x6d, 0x50, 0x67, 0xa3, 0x38, 0x46, 0xd9, 0xc4, + 0xae, 0x49, 0xbb, 0xd9, 0x76, 0xbd, 0x1f, 0xaf, 0xce, 0x0f, 0x72, 0xe8, 0x9f, 0xae, 0xce, 0x0f, + 0x76, 0xcd, 0xe5, 0x8d, 0xdb, 0x7e, 0x49, 0x32, 0xf7, 0x08, 0xec, 0x94, 0x8c, 0x01, 0x66, 0x29, + 0x4d, 0x18, 0x86, 0x2d, 0xb0, 0x91, 0x6a, 0xdb, 0x71, 0x14, 0xda, 0xd6, 0x9e, 0xb5, 0xbf, 0x1a, + 0x00, 0x63, 0x7a, 0x1c, 0xba, 0x2f, 0x2c, 0xd0, 0xe8, 0x33, 0xf2, 0xd9, 0x19, 0x1e, 0x7e, 0x81, + 0x09, 0x1a, 0x4e, 0x1e, 0xd1, 0x84, 0xe3, 0x84, 0xc3, 0x27, 0xa0, 0x3e, 0x54, 0x4b, 0x99, 0x75, + 0xcd, 0x45, 0xf4, 0x5a, 0xbf, 0x3f, 0x3f, 0x7c, 0xbb, 0xd8, 0x8c, 0x46, 0x68, 0x99, 0x1c, 0x18, + 0x14, 0xb8, 0x0b, 0xd6, 0xd1, 0x88, 0x9f, 0xd0, 0x2c, 0xe2, 0x13, 0x7b, 0x59, 0x72, 0x9e, 0x1a, + 0xba, 0x1d, 0xc1, 0x7a, 0xba, 0x17, 0xb4, 0x5b, 0x45, 0xda, 0xa5, 0x12, 0xdd, 0x26, 0xd8, 0xad, + 0xb2, 0x1b, 0xf2, 0xee, 0xa5, 0x05, 0xea, 0x7d, 0x46, 0xbe, 0xa2, 0x1c, 0xc3, 0x0f, 0x2b, 0x84, + 0xe8, 0x35, 0xfe, 0x7e, 0xdd, 0x9a, 0x35, 0xab, 0x96, 0x98, 0x91, 0x07, 0x7a, 0x60, 0x6d, 0x4c, + 0x39, 0xce, 0x54, 0xc1, 0x37, 0xf4, 0x82, 0x0a, 0x83, 0x1d, 0x50, 0xa3, 0x29, 0x8f, 0x68, 0x22, + 0x9b, 0x67, 0xb3, 0xe3, 0x78, 0x45, 0x6d, 0x3c, 0x51, 0xcc, 0x13, 0x19, 0x11, 0xe8, 0xc8, 0x9b, + 0x9a, 0xa7, 0x7b, 0x4f, 0xc8, 0xa2, 0xb0, 0x85, 0x24, 0xb0, 0x28, 0x89, 0x00, 0x73, 0xb7, 0xc0, + 0x5d, 0xbd, 0xcc, 0x89, 0xff, 0x63, 0xe5, 0xb6, 0xaf, 0x71, 0x44, 0x4e, 0x38, 0x0e, 0xff, 0x2f, + 0x01, 0x8e, 0x40, 0x5d, 0xd1, 0x62, 0xf6, 0x8a, 0x1c, 0x43, 0x77, 0x5e, 0x01, 0x53, 0xd1, 0x8c, + 0x12, 0x26, 0xe5, 0x46, 0x29, 0xee, 0x17, 0xa5, 0x70, 0xca, 0x52, 0x18, 0x64, 0x77, 0x07, 0x6c, + 0xcf, 0x99, 0x66, 0x7b, 0x02, 0xf4, 0x19, 0x31, 0xe3, 0xfe, 0x1f, 0x55, 0xf9, 0x08, 0xac, 0xeb, + 0xc7, 0x86, 0x2e, 0x56, 0x66, 0x1a, 0x0a, 0x8f, 0x40, 0x0d, 0xc5, 0x74, 0x94, 0x70, 0x2d, 0xce, + 0xed, 0xde, 0x28, 0x9d, 0xd3, 0xdd, 0x97, 0x33, 0x92, 0xa3, 0x09, 0x15, 0xde, 0x2c, 0xaa, 0xa0, + 0x69, 0xb9, 0x0d, 0x00, 0xa7, 0xbb, 0x9c, 0xfb, 0x0b, 0xd5, 0x16, 0x5f, 0xa6, 0x21, 0xe2, 0xf8, + 0x29, 0xca, 0x50, 0xcc, 0x04, 0x93, 0xe9, 0x54, 0x5a, 0x8b, 0x98, 0xe4, 0xa1, 0xf0, 0x63, 0x50, + 0x4b, 0x25, 0x82, 0xa4, 0xbf, 0xd1, 0x79, 0x6b, 0xfe, 0x9a, 0x15, 0x7e, 0x81, 0x86, 0x4a, 0xe8, + 0x3e, 0x28, 0x8f, 0xfa, 0x9e, 0xa1, 0x71, 0x66, 0x3e, 0x50, 0x73, 0x75, 0xea, 0x2b, 0x9d, 0x35, + 0x19, 0x5a, 0x9d, 0x5f, 0x56, 0xc1, 0x4a, 0x9f, 0x11, 0xf8, 0x1d, 0xd8, 0x9c, 0xfb, 0x9a, 0xdc, + 0x9b, 0x2f, 0xaa, 0xf4, 0x50, 0x3a, 0xf7, 0x17, 0x86, 0xe4, 0x6f, 0x29, 0x01, 0x5b, 0xe5, 0x67, + 0xf2, 0x9d, 0x8a, 0xfc, 0x52, 0x94, 0xf3, 0xde, 0x6d, 0xa2, 0xf2, 0x83, 0x3e, 0x01, 0xab, 0xf2, + 0xcd, 0xda, 0xae, 0xc8, 0x12, 0x0e, 0xa7, 0x75, 0x8d, 0x23, 0x47, 0xf8, 0x06, 0xbc, 0x51, 0x18, + 0xfe, 0xeb, 0x12, 0x4c, 0x80, 0xf3, 0xee, 0x82, 0x80, 0x1c, 0xf9, 0x31, 0xa8, 0x9b, 0xd9, 0x71, + 0x2a, 0x72, 0xb4, 0xcf, 0x71, 0xaf, 0xf7, 0xcd, 0x16, 0x59, 0x68, 0xc5, 0xaa, 0x22, 0x67, 0x03, + 0x2a, 0x8b, 0xac, 0xea, 0x08, 0x67, 0xed, 0x07, 0xd1, 0x70, 0xbd, 0xcf, 0x5f, 0x5e, 0x34, 0xad, + 0x57, 0x17, 0x4d, 0xeb, 0xaf, 0x8b, 0xa6, 0xf5, 0xf3, 0x65, 0x73, 0xe9, 0xd5, 0x65, 0x73, 0xe9, + 0xcf, 0xcb, 0xe6, 0xd2, 0xb7, 0x87, 0x24, 0xe2, 0x27, 0xa3, 0x81, 0x37, 0xa4, 0xb1, 0xaf, 0x31, + 0x0f, 0x4f, 0x46, 0x03, 0xbf, 0xd8, 0x86, 0x7c, 0x92, 0x62, 0x26, 0xfe, 0x4d, 0xd5, 0xe4, 0x27, + 0xef, 0xc1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x70, 0x13, 0x4d, 0x50, 0x8f, 0x09, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -848,8 +1147,12 @@ type MsgClient interface { ExecLegacyContent(ctx context.Context, in *MsgExecLegacyContent, opts ...grpc.CallOption) (*MsgExecLegacyContentResponse, error) // Vote defines a method to add a vote on a specific proposal. Vote(ctx context.Context, in *MsgVote, opts ...grpc.CallOption) (*MsgVoteResponse, error) +<<<<<<< HEAD // VoteWeighted defines a method to add a weighted vote on a specific // proposal. +======= + // VoteWeighted defines a method to add a weighted vote on a specific proposal. +>>>>>>> main VoteWeighted(ctx context.Context, in *MsgVoteWeighted, opts ...grpc.CallOption) (*MsgVoteWeightedResponse, error) // Deposit defines a method to add deposit on a specific proposal. Deposit(ctx context.Context, in *MsgDeposit, opts ...grpc.CallOption) (*MsgDepositResponse, error) @@ -931,8 +1234,12 @@ type MsgServer interface { ExecLegacyContent(context.Context, *MsgExecLegacyContent) (*MsgExecLegacyContentResponse, error) // Vote defines a method to add a vote on a specific proposal. Vote(context.Context, *MsgVote) (*MsgVoteResponse, error) +<<<<<<< HEAD // VoteWeighted defines a method to add a weighted vote on a specific // proposal. +======= + // VoteWeighted defines a method to add a weighted vote on a specific proposal. +>>>>>>> main VoteWeighted(context.Context, *MsgVoteWeighted) (*MsgVoteWeightedResponse, error) // Deposit defines a method to add deposit on a specific proposal. Deposit(context.Context, *MsgDeposit) (*MsgDepositResponse, error) @@ -944,11 +1251,17 @@ type MsgServer interface { } // UnimplementedMsgServer can be embedded to have forward compatible implementations. +<<<<<<< HEAD type UnimplementedMsgServer struct{} +======= +type UnimplementedMsgServer struct { +} +>>>>>>> main func (*UnimplementedMsgServer) SubmitProposal(ctx context.Context, req *MsgSubmitProposal) (*MsgSubmitProposalResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitProposal not implemented") } +<<<<<<< HEAD func (*UnimplementedMsgServer) ExecLegacyContent(ctx context.Context, req *MsgExecLegacyContent) (*MsgExecLegacyContentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ExecLegacyContent not implemented") @@ -966,6 +1279,20 @@ func (*UnimplementedMsgServer) Deposit(ctx context.Context, req *MsgDeposit) (*M return nil, status.Errorf(codes.Unimplemented, "method Deposit not implemented") } +======= +func (*UnimplementedMsgServer) ExecLegacyContent(ctx context.Context, req *MsgExecLegacyContent) (*MsgExecLegacyContentResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecLegacyContent not implemented") +} +func (*UnimplementedMsgServer) Vote(ctx context.Context, req *MsgVote) (*MsgVoteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Vote not implemented") +} +func (*UnimplementedMsgServer) VoteWeighted(ctx context.Context, req *MsgVoteWeighted) (*MsgVoteWeightedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method VoteWeighted not implemented") +} +func (*UnimplementedMsgServer) Deposit(ctx context.Context, req *MsgDeposit) (*MsgDepositResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deposit not implemented") +} +>>>>>>> main func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") } @@ -1582,7 +1909,10 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgSubmitProposal) Size() (n int) { if m == nil { return 0 @@ -1783,11 +2113,17 @@ func (m *MsgUpdateParamsResponse) Size() (n int) { func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozTx(x uint64) (n int) { + return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2034,7 +2370,10 @@ func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgSubmitProposalResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2104,7 +2443,10 @@ func (m *MsgSubmitProposalResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgExecLegacyContent) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2223,7 +2565,10 @@ func (m *MsgExecLegacyContent) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgExecLegacyContentResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2274,7 +2619,10 @@ func (m *MsgExecLegacyContentResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2427,7 +2775,10 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2478,7 +2829,10 @@ func (m *MsgVoteResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVoteWeighted) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2646,7 +3000,10 @@ func (m *MsgVoteWeighted) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVoteWeightedResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2697,7 +3054,10 @@ func (m *MsgVoteWeightedResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgDeposit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2833,7 +3193,10 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgDepositResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2884,7 +3247,10 @@ func (m *MsgDepositResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3000,7 +3366,10 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgUpdateParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3051,7 +3420,10 @@ func (m *MsgUpdateParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1/vote.go b/x/gov/types/v1/vote.go index 65c30e09..06d3916c 100644 --- a/x/gov/types/v1/vote.go +++ b/x/gov/types/v1/vote.go @@ -6,7 +6,11 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) const ( diff --git a/x/gov/types/v1beta1/codec.go b/x/gov/types/v1beta1/codec.go index 72868691..c071726f 100644 --- a/x/gov/types/v1beta1/codec.go +++ b/x/gov/types/v1beta1/codec.go @@ -1,6 +1,7 @@ package v1beta1 import ( +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec" "github.com/atomone-hub/atomone/codec/legacy" codectypes "github.com/atomone-hub/atomone/codec/types" @@ -9,6 +10,19 @@ import ( authzcodec "github.com/atomone-hub/atomone/x/authz/codec" govcodec "github.com/atomone-hub/atomone/x/gov/codec" groupcodec "github.com/atomone-hub/atomone/x/group/codec" +======= + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/codec/legacy" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/msgservice" + authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" + groupcodec "github.com/cosmos/cosmos-sdk/x/group/codec" + paramsproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + govcodec "github.com/atomone-hub/atomone/x/gov/codec" +>>>>>>> main ) // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the @@ -36,6 +50,24 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { &TextProposal{}, ) +<<<<<<< HEAD +======= + // Register proposal types (this is actually done in related modules, but + // since we are using an other gov module, we need to do it manually). + registry.RegisterImplementations( + (*Content)(nil), + ¶msproposal.ParameterChangeProposal{}, + ) + registry.RegisterImplementations( + (*Content)(nil), + &upgradetypes.SoftwareUpgradeProposal{}, //nolint:staticcheck + ) + registry.RegisterImplementations( + (*Content)(nil), + &upgradetypes.CancelSoftwareUpgradeProposal{}, //nolint:staticcheck + ) + +>>>>>>> main msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/x/gov/types/v1beta1/content.go b/x/gov/types/v1beta1/content.go index 939cf235..4718859c 100644 --- a/x/gov/types/v1beta1/content.go +++ b/x/gov/types/v1beta1/content.go @@ -1,6 +1,13 @@ package v1beta1 +<<<<<<< HEAD import sdk "github.com/atomone-hub/atomone/types" +======= +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkgovtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" +) +>>>>>>> main // Content defines an interface that a proposal must implement. It contains // information such as the title and description along with the type and routing @@ -19,6 +26,16 @@ type Content interface { // governance process. type Handler func(ctx sdk.Context, content Content) error +<<<<<<< HEAD +======= +// WrapHandler converts a Cosmos SDK gov Handler to GovGen gov Handler +func WrapSDKHandler(sdkHandler sdkgovtypes.Handler) Handler { + return func(ctx sdk.Context, content Content) error { + return sdkHandler(ctx, content) + } +} + +>>>>>>> main type HandlerRoute struct { Handler Handler RouteKey string diff --git a/x/gov/types/v1beta1/deposit.go b/x/gov/types/v1beta1/deposit.go index 0492b9e6..995bb0e1 100644 --- a/x/gov/types/v1beta1/deposit.go +++ b/x/gov/types/v1beta1/deposit.go @@ -5,7 +5,11 @@ import ( "sigs.k8s.io/yaml" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // NewDeposit creates a new Deposit instance diff --git a/x/gov/types/v1beta1/genesis.go b/x/gov/types/v1beta1/genesis.go index 81310e3d..1b147c3f 100644 --- a/x/gov/types/v1beta1/genesis.go +++ b/x/gov/types/v1beta1/genesis.go @@ -5,7 +5,11 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD "github.com/atomone-hub/atomone/codec/types" +======= + "github.com/cosmos/cosmos-sdk/codec/types" +>>>>>>> main ) // NewGenesisState creates a new genesis state for the governance module diff --git a/x/gov/types/v1beta1/genesis.pb.go b/x/gov/types/v1beta1/genesis.pb.go index e5a87df2..566ef6af 100644 --- a/x/gov/types/v1beta1/genesis.pb.go +++ b/x/gov/types/v1beta1/genesis.pb.go @@ -5,6 +5,7 @@ package v1beta1 import ( fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" @@ -20,6 +21,20 @@ var ( _ = fmt.Errorf _ = math.Inf ) +======= + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -51,11 +66,17 @@ func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { return fileDescriptor_78ac7f1c6937d88e, []int{0} } +<<<<<<< HEAD func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *GenesisState) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) @@ -68,6 +89,7 @@ func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *GenesisState) XXX_Merge(src proto.Message) { xxx_messageInfo_GenesisState.Merge(m, src) @@ -77,6 +99,14 @@ func (m *GenesisState) XXX_Size() int { return m.Size() } +======= +func (m *GenesisState) XXX_Merge(src proto.Message) { + xxx_messageInfo_GenesisState.Merge(m, src) +} +func (m *GenesisState) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *GenesisState) XXX_DiscardUnknown() { xxx_messageInfo_GenesisState.DiscardUnknown(m) } @@ -279,7 +309,10 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -319,11 +352,17 @@ func (m *GenesisState) Size() (n int) { func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozGenesis(x uint64) (n int) { + return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -594,7 +633,10 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1beta1/gov.pb.go b/x/gov/types/v1beta1/gov.pb.go index 1f784751..82762deb 100644 --- a/x/gov/types/v1beta1/gov.pb.go +++ b/x/gov/types/v1beta1/gov.pb.go @@ -5,6 +5,7 @@ package v1beta1 import ( fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" @@ -15,11 +16,19 @@ import ( types "github.com/atomone-hub/atomone/types" _ "github.com/atomone-hub/atomone/types/tx/amino" _ "github.com/cosmos/cosmos-proto" +======= + _ "github.com/cosmos/cosmos-proto" + types1 "github.com/cosmos/cosmos-sdk/codec/types" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" +>>>>>>> main _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" +<<<<<<< HEAD ) // Reference imports to suppress errors if they are not otherwise used. @@ -29,6 +38,19 @@ var ( _ = math.Inf _ = time.Kitchen ) +======= + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -129,11 +151,18 @@ func (ProposalStatus) EnumDescriptor() ([]byte, []int) { // // Since: cosmos-sdk 0.43 type WeightedVoteOption struct { +<<<<<<< HEAD // option defines the valid vote options, it must not contain duplicate vote // options. Option VoteOption `protobuf:"varint,1,opt,name=option,proto3,enum=atomone.gov.v1beta1.VoteOption" json:"option,omitempty"` // weight is the vote weight associated with the vote option. Weight github_com_atomone_hub_atomone_types.Dec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/atomone-hub/atomone/types.Dec" json:"weight"` +======= + // option defines the valid vote options, it must not contain duplicate vote options. + Option VoteOption `protobuf:"varint,1,opt,name=option,proto3,enum=atomone.gov.v1beta1.VoteOption" json:"option,omitempty"` + // weight is the vote weight associated with the vote option. + Weight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"weight"` +>>>>>>> main } func (m *WeightedVoteOption) Reset() { *m = WeightedVoteOption{} } @@ -141,11 +170,17 @@ func (*WeightedVoteOption) ProtoMessage() {} func (*WeightedVoteOption) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{0} } +<<<<<<< HEAD func (m *WeightedVoteOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *WeightedVoteOption) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *WeightedVoteOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_WeightedVoteOption.Marshal(b, m, deterministic) @@ -158,6 +193,7 @@ func (m *WeightedVoteOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *WeightedVoteOption) XXX_Merge(src proto.Message) { xxx_messageInfo_WeightedVoteOption.Merge(m, src) @@ -167,6 +203,14 @@ func (m *WeightedVoteOption) XXX_Size() int { return m.Size() } +======= +func (m *WeightedVoteOption) XXX_Merge(src proto.Message) { + xxx_messageInfo_WeightedVoteOption.Merge(m, src) +} +func (m *WeightedVoteOption) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *WeightedVoteOption) XXX_DiscardUnknown() { xxx_messageInfo_WeightedVoteOption.DiscardUnknown(m) } @@ -187,11 +231,17 @@ func (*TextProposal) ProtoMessage() {} func (*TextProposal) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{1} } +<<<<<<< HEAD func (m *TextProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *TextProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *TextProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_TextProposal.Marshal(b, m, deterministic) @@ -204,6 +254,7 @@ func (m *TextProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *TextProposal) XXX_Merge(src proto.Message) { xxx_messageInfo_TextProposal.Merge(m, src) @@ -213,6 +264,14 @@ func (m *TextProposal) XXX_Size() int { return m.Size() } +======= +func (m *TextProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_TextProposal.Merge(m, src) +} +func (m *TextProposal) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *TextProposal) XXX_DiscardUnknown() { xxx_messageInfo_TextProposal.DiscardUnknown(m) } @@ -227,7 +286,11 @@ type Deposit struct { // depositor defines the deposit addresses from the proposals. Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` // amount to be deposited by depositor. +<<<<<<< HEAD Amount github_com_atomone_hub_atomone_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/atomone-hub/atomone/types.Coins" json:"amount"` +======= + Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` +>>>>>>> main } func (m *Deposit) Reset() { *m = Deposit{} } @@ -235,11 +298,17 @@ func (*Deposit) ProtoMessage() {} func (*Deposit) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{2} } +<<<<<<< HEAD func (m *Deposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *Deposit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *Deposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Deposit.Marshal(b, m, deterministic) @@ -252,6 +321,7 @@ func (m *Deposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *Deposit) XXX_Merge(src proto.Message) { xxx_messageInfo_Deposit.Merge(m, src) @@ -261,6 +331,14 @@ func (m *Deposit) XXX_Size() int { return m.Size() } +======= +func (m *Deposit) XXX_Merge(src proto.Message) { + xxx_messageInfo_Deposit.Merge(m, src) +} +func (m *Deposit) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *Deposit) XXX_DiscardUnknown() { xxx_messageInfo_Deposit.DiscardUnknown(m) } @@ -284,7 +362,11 @@ type Proposal struct { // deposit_end_time is the end time for deposition. DepositEndTime time.Time `protobuf:"bytes,6,opt,name=deposit_end_time,json=depositEndTime,proto3,stdtime" json:"deposit_end_time"` // total_deposit is the total deposit on the proposal. +<<<<<<< HEAD TotalDeposit github_com_atomone_hub_atomone_types.Coins `protobuf:"bytes,7,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/atomone-hub/atomone/types.Coins" json:"total_deposit"` +======= + TotalDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,7,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"total_deposit"` +>>>>>>> main // voting_start_time is the starting time to vote on a proposal. VotingStartTime time.Time `protobuf:"bytes,8,opt,name=voting_start_time,json=votingStartTime,proto3,stdtime" json:"voting_start_time"` // voting_end_time is the end time of voting on a proposal. @@ -296,11 +378,17 @@ func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{3} } +<<<<<<< HEAD func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *Proposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *Proposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Proposal.Marshal(b, m, deterministic) @@ -313,6 +401,7 @@ func (m *Proposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *Proposal) XXX_Merge(src proto.Message) { xxx_messageInfo_Proposal.Merge(m, src) @@ -322,6 +411,14 @@ func (m *Proposal) XXX_Size() int { return m.Size() } +======= +func (m *Proposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_Proposal.Merge(m, src) +} +func (m *Proposal) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *Proposal) XXX_DiscardUnknown() { xxx_messageInfo_Proposal.DiscardUnknown(m) } @@ -331,6 +428,7 @@ var xxx_messageInfo_Proposal proto.InternalMessageInfo // TallyResult defines a standard tally for a governance proposal. type TallyResult struct { // yes is the number of yes votes on a proposal. +<<<<<<< HEAD Yes github_com_atomone_hub_atomone_types.Int `protobuf:"bytes,1,opt,name=yes,proto3,customtype=github.com/atomone-hub/atomone/types.Int" json:"yes"` // abstain is the number of abstain votes on a proposal. Abstain github_com_atomone_hub_atomone_types.Int `protobuf:"bytes,2,opt,name=abstain,proto3,customtype=github.com/atomone-hub/atomone/types.Int" json:"abstain"` @@ -338,6 +436,15 @@ type TallyResult struct { No github_com_atomone_hub_atomone_types.Int `protobuf:"bytes,3,opt,name=no,proto3,customtype=github.com/atomone-hub/atomone/types.Int" json:"no"` // no_with_veto is the number of no with veto votes on a proposal. NoWithVeto github_com_atomone_hub_atomone_types.Int `protobuf:"bytes,4,opt,name=no_with_veto,json=noWithVeto,proto3,customtype=github.com/atomone-hub/atomone/types.Int" json:"no_with_veto"` +======= + Yes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=yes,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"yes"` + // abstain is the number of abstain votes on a proposal. + Abstain github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=abstain,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"abstain"` + // no is the number of no votes on a proposal. + No github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=no,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"no"` + // no_with_veto is the number of no with veto votes on a proposal. + NoWithVeto github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=no_with_veto,json=noWithVeto,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"no_with_veto"` +>>>>>>> main } func (m *TallyResult) Reset() { *m = TallyResult{} } @@ -345,11 +452,17 @@ func (*TallyResult) ProtoMessage() {} func (*TallyResult) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{4} } +<<<<<<< HEAD func (m *TallyResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *TallyResult) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *TallyResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_TallyResult.Marshal(b, m, deterministic) @@ -362,6 +475,7 @@ func (m *TallyResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *TallyResult) XXX_Merge(src proto.Message) { xxx_messageInfo_TallyResult.Merge(m, src) @@ -371,6 +485,14 @@ func (m *TallyResult) XXX_Size() int { return m.Size() } +======= +func (m *TallyResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_TallyResult.Merge(m, src) +} +func (m *TallyResult) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *TallyResult) XXX_DiscardUnknown() { xxx_messageInfo_TallyResult.DiscardUnknown(m) } @@ -399,11 +521,17 @@ func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{5} } +<<<<<<< HEAD func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *Vote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *Vote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Vote.Marshal(b, m, deterministic) @@ -416,6 +544,7 @@ func (m *Vote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *Vote) XXX_Merge(src proto.Message) { xxx_messageInfo_Vote.Merge(m, src) @@ -425,6 +554,14 @@ func (m *Vote) XXX_Size() int { return m.Size() } +======= +func (m *Vote) XXX_Merge(src proto.Message) { + xxx_messageInfo_Vote.Merge(m, src) +} +func (m *Vote) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *Vote) XXX_DiscardUnknown() { xxx_messageInfo_Vote.DiscardUnknown(m) } @@ -434,7 +571,11 @@ var xxx_messageInfo_Vote proto.InternalMessageInfo // DepositParams defines the params for deposits on governance proposals. type DepositParams struct { // Minimum deposit for a proposal to enter voting period. +<<<<<<< HEAD MinDeposit github_com_atomone_hub_atomone_types.Coins `protobuf:"bytes,1,rep,name=min_deposit,json=minDeposit,proto3,castrepeated=github.com/atomone-hub/atomone/types.Coins" json:"min_deposit,omitempty"` +======= + MinDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=min_deposit,json=minDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"min_deposit,omitempty"` +>>>>>>> main // Maximum period for Atom holders to deposit on a proposal. Initial value: 2 // months. MaxDepositPeriod time.Duration `protobuf:"bytes,2,opt,name=max_deposit_period,json=maxDepositPeriod,proto3,stdduration" json:"max_deposit_period,omitempty"` @@ -445,11 +586,17 @@ func (*DepositParams) ProtoMessage() {} func (*DepositParams) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{6} } +<<<<<<< HEAD func (m *DepositParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *DepositParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *DepositParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_DepositParams.Marshal(b, m, deterministic) @@ -462,6 +609,7 @@ func (m *DepositParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } +<<<<<<< HEAD func (m *DepositParams) XXX_Merge(src proto.Message) { xxx_messageInfo_DepositParams.Merge(m, src) @@ -471,6 +619,14 @@ func (m *DepositParams) XXX_Size() int { return m.Size() } +======= +func (m *DepositParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_DepositParams.Merge(m, src) +} +func (m *DepositParams) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *DepositParams) XXX_DiscardUnknown() { xxx_messageInfo_DepositParams.DiscardUnknown(m) } @@ -488,11 +644,17 @@ func (*VotingParams) ProtoMessage() {} func (*VotingParams) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{7} } +<<<<<<< HEAD func (m *VotingParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *VotingParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *VotingParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_VotingParams.Marshal(b, m, deterministic) @@ -505,6 +667,7 @@ func (m *VotingParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *VotingParams) XXX_Merge(src proto.Message) { xxx_messageInfo_VotingParams.Merge(m, src) @@ -514,6 +677,14 @@ func (m *VotingParams) XXX_Size() int { return m.Size() } +======= +func (m *VotingParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_VotingParams.Merge(m, src) +} +func (m *VotingParams) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *VotingParams) XXX_DiscardUnknown() { xxx_messageInfo_VotingParams.DiscardUnknown(m) } @@ -524,12 +695,21 @@ var xxx_messageInfo_VotingParams proto.InternalMessageInfo type TallyParams struct { // Minimum percentage of total stake needed to vote for a result to be // considered valid. +<<<<<<< HEAD Quorum github_com_atomone_hub_atomone_types.Dec `protobuf:"bytes,1,opt,name=quorum,proto3,customtype=github.com/atomone-hub/atomone/types.Dec" json:"quorum,omitempty"` // Minimum proportion of Yes votes for proposal to pass. Default value: 0.5. Threshold github_com_atomone_hub_atomone_types.Dec `protobuf:"bytes,2,opt,name=threshold,proto3,customtype=github.com/atomone-hub/atomone/types.Dec" json:"threshold,omitempty"` // Minimum value of Veto votes to Total votes ratio for proposal to be // vetoed. Default value: 1/3. VetoThreshold github_com_atomone_hub_atomone_types.Dec `protobuf:"bytes,3,opt,name=veto_threshold,json=vetoThreshold,proto3,customtype=github.com/atomone-hub/atomone/types.Dec" json:"veto_threshold,omitempty"` +======= + Quorum github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=quorum,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"quorum,omitempty"` + // Minimum proportion of Yes votes for proposal to pass. Default value: 0.5. + Threshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=threshold,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"threshold,omitempty"` + // Minimum value of Veto votes to Total votes ratio for proposal to be + // vetoed. Default value: 1/3. + VetoThreshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=veto_threshold,json=vetoThreshold,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"veto_threshold,omitempty"` +>>>>>>> main } func (m *TallyParams) Reset() { *m = TallyParams{} } @@ -537,11 +717,17 @@ func (*TallyParams) ProtoMessage() {} func (*TallyParams) Descriptor() ([]byte, []int) { return fileDescriptor_a7f955cabd147a1f, []int{8} } +<<<<<<< HEAD func (m *TallyParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *TallyParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *TallyParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_TallyParams.Marshal(b, m, deterministic) @@ -554,6 +740,7 @@ func (m *TallyParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } +<<<<<<< HEAD func (m *TallyParams) XXX_Merge(src proto.Message) { xxx_messageInfo_TallyParams.Merge(m, src) @@ -563,6 +750,14 @@ func (m *TallyParams) XXX_Size() int { return m.Size() } +======= +func (m *TallyParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_TallyParams.Merge(m, src) +} +func (m *TallyParams) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *TallyParams) XXX_DiscardUnknown() { xxx_messageInfo_TallyParams.DiscardUnknown(m) } @@ -586,6 +781,7 @@ func init() { func init() { proto.RegisterFile("atomone/gov/v1beta1/gov.proto", fileDescriptor_a7f955cabd147a1f) } var fileDescriptor_a7f955cabd147a1f = []byte{ +<<<<<<< HEAD // 1407 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x13, 0x47, 0x14, 0xf6, 0xda, 0xce, 0xaf, 0xb1, 0x13, 0x96, 0x49, 0x00, 0x67, 0x29, 0xde, 0x55, 0x38, 0x34, @@ -675,6 +871,98 @@ var fileDescriptor_a7f955cabd147a1f = []byte{ 0x2d, 0xdc, 0x7f, 0x95, 0x8e, 0x3c, 0x7d, 0x95, 0x8e, 0x3c, 0x7f, 0x95, 0x8e, 0x7c, 0xbd, 0x74, 0xc4, 0x91, 0xdd, 0xa2, 0xbf, 0xd2, 0xe8, 0xc1, 0x0d, 0x7e, 0x76, 0x55, 0x47, 0xe9, 0x84, 0xb8, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0x37, 0x2d, 0x82, 0xc9, 0x0d, 0x00, 0x00, +======= + // 1414 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x13, 0xc7, + 0x17, 0xf7, 0xda, 0xce, 0xaf, 0xb1, 0x13, 0x96, 0x49, 0xbe, 0xe0, 0x98, 0x2f, 0xde, 0x95, 0x91, + 0xda, 0x28, 0x22, 0x76, 0x09, 0x6a, 0xab, 0x06, 0x2e, 0x36, 0x5e, 0x5a, 0xa3, 0xc8, 0x76, 0xd7, + 0x8b, 0x29, 0x1c, 0xba, 0x5a, 0x7b, 0x07, 0x7b, 0x5b, 0xef, 0x8e, 0xf1, 0x8e, 0x43, 0x72, 0xe3, + 0xd0, 0x4a, 0xc8, 0x27, 0x8e, 0x5c, 0x2c, 0xa1, 0x72, 0xa9, 0x7a, 0xe2, 0xc0, 0x3f, 0xd0, 0x1b, + 0xaa, 0x7a, 0x40, 0x1c, 0x2a, 0x54, 0x55, 0xa1, 0x04, 0xa9, 0x50, 0xfe, 0x8a, 0x6a, 0x67, 0x66, + 0xe3, 0x8d, 0x63, 0x29, 0xb8, 0xa8, 0x17, 0x7b, 0x76, 0xde, 0xe7, 0x7d, 0xde, 0x8f, 0x7d, 0xef, + 0xcd, 0x2c, 0x38, 0x6d, 0x10, 0x6c, 0x63, 0x07, 0x65, 0x9b, 0x78, 0x2b, 0xbb, 0x75, 0xae, 0x8e, + 0x88, 0x71, 0xce, 0x5b, 0x67, 0x3a, 0x5d, 0x4c, 0x30, 0x5c, 0xe4, 0xe2, 0x8c, 0xb7, 0xc5, 0xc5, + 0xc9, 0x54, 0x03, 0xbb, 0x36, 0x76, 0xb3, 0x75, 0xc3, 0x45, 0xfb, 0x3a, 0x0d, 0x6c, 0x39, 0x4c, + 0x29, 0xb9, 0xd4, 0xc4, 0x4d, 0x4c, 0x97, 0x59, 0x6f, 0xc5, 0x77, 0xa5, 0x26, 0xc6, 0xcd, 0x36, + 0xca, 0xd2, 0xa7, 0x7a, 0xef, 0x66, 0x96, 0x58, 0x36, 0x72, 0x89, 0x61, 0x77, 0x38, 0x60, 0x79, + 0x14, 0x60, 0x38, 0x3b, 0x5c, 0x94, 0x1a, 0x15, 0x99, 0xbd, 0xae, 0x41, 0x2c, 0xec, 0x5b, 0x5c, + 0x66, 0x1e, 0xe9, 0xcc, 0x28, 0x7b, 0xe0, 0xa2, 0xe3, 0x86, 0x6d, 0x39, 0x38, 0x4b, 0x7f, 0xd9, + 0x56, 0xfa, 0xa1, 0x00, 0xe0, 0x35, 0x64, 0x35, 0x5b, 0x04, 0x99, 0x35, 0x4c, 0x50, 0xb9, 0xe3, + 0x51, 0xc1, 0x4f, 0xc1, 0x34, 0xa6, 0xab, 0x84, 0x20, 0x0b, 0x2b, 0x0b, 0xeb, 0x52, 0x66, 0x4c, + 0xf0, 0x99, 0xa1, 0x82, 0xca, 0xe1, 0x50, 0x03, 0xd3, 0xb7, 0x29, 0x5d, 0x22, 0x2c, 0x0b, 0x2b, + 0x73, 0xf9, 0x8b, 0x4f, 0x76, 0xa5, 0xd0, 0xef, 0xbb, 0xd2, 0x07, 0x4d, 0x8b, 0xb4, 0x7a, 0xf5, + 0x4c, 0x03, 0xdb, 0xdc, 0x27, 0xfe, 0xb7, 0xe6, 0x9a, 0xdf, 0x66, 0xc9, 0x4e, 0x07, 0xb9, 0x99, + 0x02, 0x6a, 0x3c, 0x7b, 0xbc, 0x06, 0xb8, 0xcb, 0x05, 0xd4, 0x50, 0x39, 0x57, 0xfa, 0x3b, 0x01, + 0xc4, 0x35, 0xb4, 0x4d, 0x2a, 0x5d, 0xdc, 0xc1, 0xae, 0xd1, 0x86, 0x4b, 0x60, 0x8a, 0x58, 0xa4, + 0x8d, 0xa8, 0x7b, 0x73, 0x2a, 0x7b, 0x80, 0x32, 0x88, 0x99, 0xc8, 0x6d, 0x74, 0x2d, 0xe6, 0x3a, + 0xf5, 0x40, 0x0d, 0x6e, 0x6d, 0x5c, 0x7c, 0xf3, 0x40, 0x12, 0x7e, 0x79, 0xbc, 0x76, 0x6a, 0x5c, + 0x38, 0x97, 0xb0, 0x43, 0x90, 0x43, 0xfa, 0xaf, 0x1f, 0xad, 0x2e, 0xf9, 0xa5, 0x10, 0xb4, 0x9a, + 0xfe, 0x4d, 0x00, 0x33, 0x05, 0xd4, 0xc1, 0xae, 0x45, 0xa0, 0x04, 0x62, 0x1d, 0xbe, 0xaf, 0x5b, + 0x26, 0xf5, 0x23, 0xaa, 0x02, 0x7f, 0xab, 0x68, 0xc2, 0x4f, 0xc0, 0x9c, 0xc9, 0xb0, 0xb8, 0xcb, + 0x93, 0x91, 0x78, 0xf6, 0x78, 0x6d, 0x89, 0x87, 0x97, 0x33, 0xcd, 0x2e, 0x72, 0xdd, 0x2a, 0xe9, + 0x5a, 0x4e, 0x53, 0x1d, 0x42, 0x61, 0x0b, 0x4c, 0x1b, 0x36, 0xee, 0x39, 0x24, 0x11, 0x91, 0x23, + 0x2b, 0xb1, 0xf5, 0xe5, 0x0c, 0xd7, 0xf0, 0x4a, 0x2c, 0xe0, 0xab, 0xe5, 0xe4, 0x3f, 0xf6, 0x92, + 0xfb, 0xd3, 0x0b, 0x69, 0xe5, 0x1d, 0x92, 0xeb, 0x29, 0xb8, 0x3f, 0xbe, 0x7e, 0xb4, 0x2a, 0xa8, + 0x9c, 0x7f, 0x63, 0xf6, 0xee, 0x03, 0x29, 0xf4, 0xe6, 0x81, 0x14, 0x4a, 0xff, 0x31, 0x05, 0x66, + 0xf7, 0x73, 0x7b, 0x64, 0x64, 0x65, 0x30, 0xd3, 0x60, 0xa9, 0xa2, 0x71, 0xc5, 0xd6, 0x97, 0x32, + 0xac, 0x26, 0x33, 0x7e, 0x4d, 0x66, 0x72, 0xce, 0x4e, 0x5e, 0x3a, 0x22, 0xcf, 0xaa, 0xcf, 0x02, + 0x2f, 0x80, 0x69, 0x97, 0x18, 0xa4, 0xe7, 0x26, 0x22, 0xb4, 0xda, 0xce, 0x8c, 0xad, 0x36, 0xdf, + 0xc1, 0x2a, 0x85, 0xaa, 0x5c, 0x05, 0x5e, 0x07, 0xf0, 0xa6, 0xe5, 0x18, 0x6d, 0x9d, 0x18, 0xed, + 0xf6, 0x8e, 0xde, 0x45, 0x6e, 0xaf, 0x4d, 0x12, 0x51, 0xea, 0x98, 0x3c, 0x96, 0x48, 0xf3, 0x80, + 0x2a, 0xc5, 0xe5, 0xe7, 0xbc, 0x14, 0xb2, 0xb4, 0x88, 0x94, 0x26, 0x20, 0x84, 0x57, 0x40, 0xcc, + 0xed, 0xd5, 0x6d, 0x8b, 0xe8, 0x5e, 0x7f, 0x26, 0xa6, 0x28, 0x67, 0xf2, 0x50, 0xb0, 0x9a, 0xdf, + 0xbc, 0xf9, 0x79, 0x8f, 0xed, 0xde, 0x0b, 0x49, 0x60, 0x8c, 0x80, 0x69, 0x7b, 0x72, 0x58, 0x05, + 0x22, 0x7f, 0xc7, 0x3a, 0x72, 0x4c, 0x46, 0x38, 0x3d, 0x29, 0xe1, 0x02, 0xa7, 0x50, 0x1c, 0x93, + 0x92, 0xf6, 0xc0, 0x3c, 0xc1, 0xc4, 0x68, 0xeb, 0x7c, 0x3f, 0x31, 0xf3, 0x1f, 0x95, 0x4c, 0x9c, + 0x9a, 0xf1, 0x6b, 0xff, 0x2a, 0x38, 0xbe, 0x85, 0x89, 0xe5, 0x34, 0x75, 0x97, 0x18, 0x5d, 0x9e, + 0x9d, 0xd9, 0x49, 0x83, 0x39, 0xc6, 0x38, 0xaa, 0x1e, 0x05, 0x8d, 0xe6, 0x4b, 0xc0, 0xb7, 0x86, + 0x19, 0x9a, 0x9b, 0x94, 0x74, 0x9e, 0x31, 0xf0, 0x04, 0x6d, 0x44, 0xbd, 0x7e, 0x4f, 0xff, 0x1d, + 0x06, 0xb1, 0xe0, 0x7b, 0x2d, 0x81, 0xc8, 0x0e, 0x72, 0xd9, 0xec, 0x98, 0x68, 0x42, 0x15, 0x1d, + 0x12, 0x98, 0x50, 0x45, 0x87, 0xa8, 0x1e, 0x11, 0xac, 0x81, 0x19, 0xa3, 0xee, 0x12, 0xc3, 0x72, + 0xfe, 0xc5, 0xd4, 0x3b, 0xcc, 0xe9, 0x93, 0xc1, 0x4d, 0x10, 0x76, 0x30, 0xed, 0x89, 0xf7, 0xa5, + 0x0c, 0x3b, 0x18, 0x7e, 0x0d, 0xe2, 0x0e, 0xd6, 0x6f, 0x5b, 0xa4, 0xa5, 0x6f, 0x21, 0x82, 0x69, + 0x8b, 0xbc, 0x2f, 0x2f, 0x70, 0xf0, 0x35, 0x8b, 0xb4, 0x6a, 0x88, 0x60, 0x9e, 0xeb, 0x3b, 0x61, + 0x10, 0xf5, 0xce, 0x05, 0x78, 0x7e, 0xcc, 0x18, 0xc9, 0xc3, 0xb7, 0xbb, 0x52, 0xd8, 0x32, 0x7f, + 0x78, 0xfd, 0x68, 0x35, 0x6c, 0x99, 0xbc, 0x4b, 0x02, 0xa3, 0x25, 0x03, 0xa6, 0xb6, 0x30, 0x41, + 0x47, 0x0f, 0x4c, 0x06, 0xf3, 0x26, 0x07, 0x3f, 0xa7, 0x22, 0xef, 0x74, 0x4e, 0xe5, 0xc3, 0x09, + 0x61, 0xff, 0xac, 0xda, 0x04, 0x33, 0x6c, 0xe5, 0x26, 0xa2, 0xb4, 0x6f, 0x3e, 0x1c, 0xab, 0x7d, + 0xf8, 0x78, 0x0c, 0x4e, 0x0d, 0x9f, 0x62, 0x63, 0xf6, 0xbe, 0x3f, 0x4d, 0xfb, 0x61, 0x30, 0xcf, + 0x5b, 0xa5, 0x62, 0x74, 0x0d, 0xdb, 0x85, 0xdf, 0x0b, 0x20, 0x66, 0x5b, 0xce, 0x7e, 0x9b, 0x0a, + 0x47, 0xb5, 0x69, 0xd1, 0x33, 0xf0, 0x76, 0x57, 0xfa, 0x5f, 0x40, 0xeb, 0x2c, 0xb6, 0x2d, 0x82, + 0xec, 0x0e, 0xd9, 0x99, 0xa4, 0x7f, 0x55, 0x60, 0x5b, 0x8e, 0xdf, 0xb8, 0xb7, 0x00, 0xb4, 0x8d, + 0x6d, 0x9f, 0x50, 0xef, 0xa0, 0xae, 0x85, 0x4d, 0x3e, 0xc4, 0x97, 0x0f, 0x35, 0x59, 0x81, 0x5f, + 0x2c, 0xf2, 0x2b, 0xdc, 0x9b, 0xff, 0x1f, 0x56, 0x1e, 0x3a, 0x75, 0xff, 0x85, 0x24, 0xa8, 0xa2, + 0x6d, 0x6c, 0xfb, 0xa1, 0x53, 0x79, 0xda, 0x05, 0xf1, 0x1a, 0x6d, 0x49, 0x9e, 0x8a, 0x06, 0xe0, + 0x2d, 0xea, 0x5b, 0x17, 0x8e, 0xb2, 0x7e, 0x86, 0x5b, 0x3f, 0x79, 0x40, 0x6f, 0xc4, 0x70, 0x9c, + 0x09, 0xb9, 0xd1, 0x9f, 0xfd, 0x86, 0xe7, 0x46, 0x6f, 0x80, 0xe9, 0x5b, 0x3d, 0xdc, 0xed, 0xd9, + 0xd4, 0x5a, 0x3c, 0x9f, 0x9f, 0xec, 0x56, 0xf2, 0x76, 0x57, 0x12, 0x99, 0xfe, 0xd0, 0xaa, 0xca, + 0x19, 0x61, 0x03, 0xcc, 0x91, 0x56, 0x17, 0xb9, 0x2d, 0xdc, 0x66, 0xa9, 0x8c, 0xe7, 0x95, 0x89, + 0xe9, 0x17, 0xf7, 0x29, 0x02, 0x16, 0x86, 0xbc, 0xf0, 0x16, 0x58, 0xf0, 0x7a, 0x56, 0x1f, 0x5a, + 0x8a, 0x50, 0x4b, 0x57, 0x26, 0xb6, 0x94, 0x38, 0xc8, 0x13, 0x30, 0x37, 0xef, 0x49, 0x34, 0x5f, + 0xb0, 0xfa, 0x97, 0x00, 0x40, 0xe0, 0x46, 0x78, 0x16, 0x9c, 0xac, 0x95, 0x35, 0x45, 0x2f, 0x57, + 0xb4, 0x62, 0xb9, 0xa4, 0x5f, 0x2d, 0x55, 0x2b, 0xca, 0xa5, 0xe2, 0xe5, 0xa2, 0x52, 0x10, 0x43, + 0xc9, 0x63, 0xfd, 0x81, 0x1c, 0x63, 0x40, 0xc5, 0xe3, 0x82, 0x69, 0x70, 0x2c, 0x88, 0xbe, 0xae, + 0x54, 0x45, 0x21, 0x39, 0xdf, 0x1f, 0xc8, 0x73, 0x0c, 0x75, 0x1d, 0xb9, 0x70, 0x15, 0x2c, 0x06, + 0x31, 0xb9, 0x7c, 0x55, 0xcb, 0x15, 0x4b, 0x62, 0x38, 0x79, 0xbc, 0x3f, 0x90, 0xe7, 0x19, 0x2e, + 0xc7, 0x27, 0xa1, 0x0c, 0x16, 0x82, 0xd8, 0x52, 0x59, 0x8c, 0x24, 0xe3, 0xfd, 0x81, 0x3c, 0xcb, + 0x60, 0x25, 0x0c, 0xd7, 0x41, 0xe2, 0x20, 0x42, 0xbf, 0x56, 0xd4, 0xbe, 0xd0, 0x6b, 0x8a, 0x56, + 0x16, 0xa3, 0xc9, 0xa5, 0xfe, 0x40, 0x16, 0x7d, 0xac, 0x3f, 0xb1, 0x92, 0xd1, 0xbb, 0x0f, 0x53, + 0xa1, 0xd5, 0x5f, 0xc3, 0x60, 0xe1, 0xe0, 0xdd, 0x02, 0x66, 0xc0, 0xa9, 0x8a, 0x5a, 0xae, 0x94, + 0xab, 0xb9, 0x4d, 0xbd, 0xaa, 0xe5, 0xb4, 0xab, 0xd5, 0x91, 0x80, 0x69, 0x28, 0x0c, 0x5c, 0xb2, + 0xda, 0xf0, 0x02, 0x48, 0x8d, 0xe2, 0x0b, 0x4a, 0xa5, 0x5c, 0x2d, 0x6a, 0x7a, 0x45, 0x51, 0x8b, + 0xe5, 0x82, 0x28, 0x24, 0x4f, 0xf6, 0x07, 0xf2, 0x22, 0x53, 0x39, 0xd0, 0x21, 0xf0, 0x33, 0x70, + 0x7a, 0x54, 0xb9, 0x56, 0xd6, 0x8a, 0xa5, 0xcf, 0x7d, 0xdd, 0x70, 0xf2, 0x44, 0x7f, 0x20, 0x43, + 0xa6, 0x5b, 0x0b, 0xd4, 0x39, 0x3c, 0x0b, 0x4e, 0x8c, 0xaa, 0x56, 0x72, 0xd5, 0xaa, 0x52, 0x10, + 0x23, 0x49, 0xb1, 0x3f, 0x90, 0xe3, 0x4c, 0xa7, 0x62, 0xb8, 0x2e, 0x32, 0xe1, 0x47, 0x20, 0x31, + 0x8a, 0x56, 0x95, 0x2b, 0xca, 0x25, 0x4d, 0x29, 0x88, 0xd1, 0x24, 0xec, 0x0f, 0xe4, 0x05, 0x7e, + 0xb7, 0x42, 0xdf, 0xa0, 0x06, 0x41, 0x63, 0xf9, 0x2f, 0xe7, 0x8a, 0x9b, 0x4a, 0x41, 0x9c, 0x0a, + 0xf2, 0x5f, 0x36, 0xac, 0x36, 0x32, 0x59, 0x3a, 0xf3, 0x5f, 0x3d, 0x79, 0x99, 0x0a, 0x3d, 0x7f, + 0x99, 0x0a, 0xdd, 0xd9, 0x4b, 0x85, 0x9e, 0xec, 0xa5, 0x84, 0xa7, 0x7b, 0x29, 0xe1, 0xcf, 0xbd, + 0x94, 0x70, 0xef, 0x55, 0x2a, 0xf4, 0xf4, 0x55, 0x2a, 0xf4, 0xfc, 0x55, 0x2a, 0x74, 0x63, 0x3d, + 0x50, 0xb0, 0x7c, 0xe8, 0xae, 0xb5, 0x7a, 0x75, 0x7f, 0x9d, 0xdd, 0xa6, 0x1f, 0x61, 0xb4, 0x70, + 0xfd, 0xcf, 0xaa, 0xfa, 0x34, 0x9d, 0x0d, 0xe7, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x4d, + 0xd5, 0x1f, 0xa8, 0x0d, 0x00, 0x00, +>>>>>>> main } func (this *TextProposal) Equal(that interface{}) bool { @@ -704,7 +992,10 @@ func (this *TextProposal) Equal(that interface{}) bool { } return true } +<<<<<<< HEAD +======= +>>>>>>> main func (this *Proposal) Equal(that interface{}) bool { if that == nil { return this == nil @@ -758,7 +1049,10 @@ func (this *Proposal) Equal(that interface{}) bool { } return true } +<<<<<<< HEAD +======= +>>>>>>> main func (this *TallyResult) Equal(that interface{}) bool { if that == nil { return this == nil @@ -792,7 +1086,10 @@ func (this *TallyResult) Equal(that interface{}) bool { } return true } +<<<<<<< HEAD +======= +>>>>>>> main func (m *WeightedVoteOption) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1275,7 +1572,10 @@ func encodeVarintGov(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *WeightedVoteOption) Size() (n int) { if m == nil { return 0 @@ -1452,11 +1752,17 @@ func (m *TallyParams) Size() (n int) { func sovGov(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozGov(x uint64) (n int) { return sovGov(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozGov(x uint64) (n int) { + return sovGov(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *WeightedVoteOption) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1560,7 +1866,10 @@ func (m *WeightedVoteOption) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *TextProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1675,7 +1984,10 @@ func (m *TextProposal) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *Deposit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1811,7 +2123,10 @@ func (m *Deposit) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *Proposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2135,7 +2450,10 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *TallyResult) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2322,7 +2640,10 @@ func (m *TallyResult) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *Vote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2477,7 +2798,10 @@ func (m *Vote) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *DepositParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2595,7 +2919,10 @@ func (m *DepositParams) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *VotingParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2679,7 +3006,10 @@ func (m *VotingParams) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *TallyParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2829,7 +3159,10 @@ func (m *TallyParams) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipGov(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1beta1/msgs.go b/x/gov/types/v1beta1/msgs.go index 8b855123..277bb592 100644 --- a/x/gov/types/v1beta1/msgs.go +++ b/x/gov/types/v1beta1/msgs.go @@ -9,10 +9,17 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" codectypes "github.com/atomone-hub/atomone/codec/types" sdk "github.com/atomone-hub/atomone/types" +======= + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/codec" "github.com/atomone-hub/atomone/x/gov/types" ) @@ -99,18 +106,32 @@ func (m MsgSubmitProposal) ValidateBasic() error { return sdkerrors.ErrInvalidAddress.Wrapf("invalid proposer address: %s", err) } if !m.InitialDeposit.IsValid() { +<<<<<<< HEAD return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, m.InitialDeposit.String()) //nolint: staticcheck } if m.InitialDeposit.IsAnyNegative() { return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, m.InitialDeposit.String()) //nolint: staticcheck +======= + return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, m.InitialDeposit.String()) //nolint:staticcheck + } + if m.InitialDeposit.IsAnyNegative() { + return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, m.InitialDeposit.String()) //nolint:staticcheck +>>>>>>> main } content := m.GetContent() if content == nil { +<<<<<<< HEAD return sdkerrors.Wrap(types.ErrInvalidProposalContent, "missing content") //nolint: staticcheck } if !IsValidProposalType(content.ProposalType()) { return sdkerrors.Wrap(types.ErrInvalidProposalType, content.ProposalType()) //nolint: staticcheck +======= + return sdkerrors.Wrap(types.ErrInvalidProposalContent, "missing content") //nolint:staticcheck + } + if !IsValidProposalType(content.ProposalType()) { + return sdkerrors.Wrap(types.ErrInvalidProposalType, content.ProposalType()) //nolint:staticcheck +>>>>>>> main } if err := content.ValidateBasic(); err != nil { return err @@ -162,10 +183,17 @@ func (msg MsgDeposit) ValidateBasic() error { return sdkerrors.ErrInvalidAddress.Wrapf("invalid depositor address: %s", err) } if !msg.Amount.IsValid() { +<<<<<<< HEAD return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String()) //nolint: staticcheck } if msg.Amount.IsAnyNegative() { return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String()) //nolint: staticcheck +======= + return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String()) //nolint:staticcheck + } + if msg.Amount.IsAnyNegative() { + return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String()) //nolint:staticcheck +>>>>>>> main } return nil @@ -208,7 +236,11 @@ func (msg MsgVote) ValidateBasic() error { return sdkerrors.ErrInvalidAddress.Wrapf("invalid voter address: %s", err) } if !ValidVoteOption(msg.Option) { +<<<<<<< HEAD return sdkerrors.Wrap(types.ErrInvalidVote, msg.Option.String()) //nolint: staticcheck +======= + return sdkerrors.Wrap(types.ErrInvalidVote, msg.Option.String()) //nolint:staticcheck +>>>>>>> main } return nil @@ -251,28 +283,48 @@ func (msg MsgVoteWeighted) ValidateBasic() error { return sdkerrors.ErrInvalidAddress.Wrapf("invalid voter address: %s", err) } if len(msg.Options) == 0 { +<<<<<<< HEAD return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, WeightedVoteOptions(msg.Options).String()) //nolint: staticcheck +======= + return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, WeightedVoteOptions(msg.Options).String()) //nolint:staticcheck +>>>>>>> main } totalWeight := math.LegacyNewDec(0) usedOptions := make(map[VoteOption]bool) for _, option := range msg.Options { if !ValidWeightedVoteOption(option) { +<<<<<<< HEAD return sdkerrors.Wrap(types.ErrInvalidVote, option.String()) //nolint: staticcheck } totalWeight = totalWeight.Add(option.Weight) if usedOptions[option.Option] { return sdkerrors.Wrap(types.ErrInvalidVote, "Duplicated vote option") //nolint: staticcheck +======= + return sdkerrors.Wrap(types.ErrInvalidVote, option.String()) //nolint:staticcheck + } + totalWeight = totalWeight.Add(option.Weight) + if usedOptions[option.Option] { + return sdkerrors.Wrap(types.ErrInvalidVote, "Duplicated vote option") //nolint:staticcheck +>>>>>>> main } usedOptions[option.Option] = true } if totalWeight.GT(math.LegacyNewDec(1)) { +<<<<<<< HEAD return sdkerrors.Wrap(types.ErrInvalidVote, "Total weight overflow 1.00") //nolint: staticcheck } if totalWeight.LT(math.LegacyNewDec(1)) { return sdkerrors.Wrap(types.ErrInvalidVote, "Total weight lower than 1.00") //nolint: staticcheck +======= + return sdkerrors.Wrap(types.ErrInvalidVote, "Total weight overflow 1.00") //nolint:staticcheck + } + + if totalWeight.LT(math.LegacyNewDec(1)) { + return sdkerrors.Wrap(types.ErrInvalidVote, "Total weight lower than 1.00") //nolint:staticcheck +>>>>>>> main } return nil diff --git a/x/gov/types/v1beta1/msgs_test.go b/x/gov/types/v1beta1/msgs_test.go index 7f0f72be..6be21eb2 100644 --- a/x/gov/types/v1beta1/msgs_test.go +++ b/x/gov/types/v1beta1/msgs_test.go @@ -4,10 +4,18 @@ import ( "strings" "testing" +<<<<<<< HEAD "cosmossdk.io/math" "github.com/stretchr/testify/require" sdk "github.com/atomone-hub/atomone/types" +======= + "github.com/stretchr/testify/require" + + "cosmossdk.io/math" + + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) var ( diff --git a/x/gov/types/v1beta1/params.go b/x/gov/types/v1beta1/params.go index baada54a..37cd6b5f 100644 --- a/x/gov/types/v1beta1/params.go +++ b/x/gov/types/v1beta1/params.go @@ -5,7 +5,11 @@ import ( "sigs.k8s.io/yaml" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // Default period for deposits & voting diff --git a/x/gov/types/v1beta1/proposal.go b/x/gov/types/v1beta1/proposal.go index ea5bc2f1..30966c96 100644 --- a/x/gov/types/v1beta1/proposal.go +++ b/x/gov/types/v1beta1/proposal.go @@ -9,10 +9,17 @@ import ( "github.com/cosmos/gogoproto/proto" +<<<<<<< HEAD sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" codectypes "github.com/atomone-hub/atomone/codec/types" sdk "github.com/atomone-hub/atomone/types" +======= + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + +>>>>>>> main "github.com/atomone-hub/atomone/x/gov/types" ) @@ -209,18 +216,32 @@ func ValidProposalStatus(status ProposalStatus) bool { func ValidateAbstract(c Content) error { title := c.GetTitle() if len(strings.TrimSpace(title)) == 0 { +<<<<<<< HEAD return sdkerrors.Wrap(types.ErrInvalidProposalContent, "proposal title cannot be blank") //nolint: staticcheck } if len(title) > MaxTitleLength { return sdkerrors.Wrapf(types.ErrInvalidProposalContent, "proposal title is longer than max length of %d", MaxTitleLength) //nolint: staticcheck +======= + return sdkerrors.Wrap(types.ErrInvalidProposalContent, "proposal title cannot be blank") //nolint:staticcheck + } + if len(title) > MaxTitleLength { + return sdkerrors.Wrapf(types.ErrInvalidProposalContent, "proposal title is longer than max length of %d", MaxTitleLength) //nolint:staticcheck +>>>>>>> main } description := c.GetDescription() if len(description) == 0 { +<<<<<<< HEAD return sdkerrors.Wrap(types.ErrInvalidProposalContent, "proposal description cannot be blank") //nolint: staticcheck } if len(description) > MaxDescriptionLength { return sdkerrors.Wrapf(types.ErrInvalidProposalContent, "proposal description is longer than max length of %d", MaxDescriptionLength) //nolint: staticcheck +======= + return sdkerrors.Wrap(types.ErrInvalidProposalContent, "proposal description cannot be blank") //nolint:staticcheck + } + if len(description) > MaxDescriptionLength { + return sdkerrors.Wrapf(types.ErrInvalidProposalContent, "proposal description is longer than max length of %d", MaxDescriptionLength) //nolint:staticcheck +>>>>>>> main } return nil @@ -269,6 +290,10 @@ func ProposalHandler(_ sdk.Context, c Content) error { return nil default: +<<<<<<< HEAD return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized gov proposal type: %s", c.ProposalType()) //nolint:staticcheck // SA1019 +======= + return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized gov proposal type: %s", c.ProposalType()) //nolint:staticcheck +>>>>>>> main } } diff --git a/x/gov/types/v1beta1/proposals_test.go b/x/gov/types/v1beta1/proposals_test.go index ac0ec79a..cfbcc0f6 100644 --- a/x/gov/types/v1beta1/proposals_test.go +++ b/x/gov/types/v1beta1/proposals_test.go @@ -4,8 +4,14 @@ import ( "fmt" "testing" +<<<<<<< HEAD "github.com/atomone-hub/atomone/x/gov/types/v1beta1" "github.com/stretchr/testify/require" +======= + "github.com/stretchr/testify/require" + + "github.com/atomone-hub/atomone/x/gov/types/v1beta1" +>>>>>>> main ) func TestProposalStatus_Format(t *testing.T) { diff --git a/x/gov/types/v1beta1/querier.go b/x/gov/types/v1beta1/querier.go index c2d60c49..a690f892 100644 --- a/x/gov/types/v1beta1/querier.go +++ b/x/gov/types/v1beta1/querier.go @@ -1,7 +1,11 @@ package v1beta1 import ( +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // DONTCOVER diff --git a/x/gov/types/v1beta1/query.pb.go b/x/gov/types/v1beta1/query.pb.go index 5b7555d0..5fb41af5 100644 --- a/x/gov/types/v1beta1/query.pb.go +++ b/x/gov/types/v1beta1/query.pb.go @@ -6,6 +6,7 @@ package v1beta1 import ( context "context" fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" @@ -13,6 +14,11 @@ import ( query "github.com/atomone-hub/atomone/types/query" _ "github.com/atomone-hub/atomone/types/tx/amino" _ "github.com/cosmos/cosmos-proto" +======= + _ "github.com/cosmos/cosmos-proto" + query "github.com/cosmos/cosmos-sdk/types/query" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" +>>>>>>> main _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -20,6 +26,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" +<<<<<<< HEAD ) // Reference imports to suppress errors if they are not otherwise used. @@ -28,6 +35,17 @@ var ( _ = fmt.Errorf _ = math.Inf ) +======= + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -47,11 +65,17 @@ func (*QueryProposalRequest) ProtoMessage() {} func (*QueryProposalRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{0} } +<<<<<<< HEAD func (m *QueryProposalRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalRequest.Marshal(b, m, deterministic) @@ -64,6 +88,7 @@ func (m *QueryProposalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalRequest.Merge(m, src) @@ -73,6 +98,14 @@ func (m *QueryProposalRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalRequest.Merge(m, src) +} +func (m *QueryProposalRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalRequest.DiscardUnknown(m) } @@ -97,11 +130,17 @@ func (*QueryProposalResponse) ProtoMessage() {} func (*QueryProposalResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{1} } +<<<<<<< HEAD func (m *QueryProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalResponse.Marshal(b, m, deterministic) @@ -114,6 +153,7 @@ func (m *QueryProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalResponse.Merge(m, src) @@ -123,6 +163,14 @@ func (m *QueryProposalResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalResponse.Merge(m, src) +} +func (m *QueryProposalResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalResponse.DiscardUnknown(m) } @@ -154,11 +202,17 @@ func (*QueryProposalsRequest) ProtoMessage() {} func (*QueryProposalsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{2} } +<<<<<<< HEAD func (m *QueryProposalsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalsRequest.Marshal(b, m, deterministic) @@ -171,6 +225,7 @@ func (m *QueryProposalsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalsRequest.Merge(m, src) @@ -180,6 +235,14 @@ func (m *QueryProposalsRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalsRequest.Merge(m, src) +} +func (m *QueryProposalsRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalsRequest.DiscardUnknown(m) } @@ -201,11 +264,17 @@ func (*QueryProposalsResponse) ProtoMessage() {} func (*QueryProposalsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{3} } +<<<<<<< HEAD func (m *QueryProposalsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryProposalsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryProposalsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryProposalsResponse.Marshal(b, m, deterministic) @@ -218,6 +287,7 @@ func (m *QueryProposalsResponse) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } +<<<<<<< HEAD func (m *QueryProposalsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryProposalsResponse.Merge(m, src) @@ -227,6 +297,14 @@ func (m *QueryProposalsResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryProposalsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryProposalsResponse.Merge(m, src) +} +func (m *QueryProposalsResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryProposalsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryProposalsResponse.DiscardUnknown(m) } @@ -261,11 +339,17 @@ func (*QueryVoteRequest) ProtoMessage() {} func (*QueryVoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{4} } +<<<<<<< HEAD func (m *QueryVoteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVoteRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVoteRequest.Marshal(b, m, deterministic) @@ -278,6 +362,7 @@ func (m *QueryVoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVoteRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVoteRequest.Merge(m, src) @@ -287,6 +372,14 @@ func (m *QueryVoteRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryVoteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVoteRequest.Merge(m, src) +} +func (m *QueryVoteRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVoteRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryVoteRequest.DiscardUnknown(m) } @@ -305,11 +398,17 @@ func (*QueryVoteResponse) ProtoMessage() {} func (*QueryVoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{5} } +<<<<<<< HEAD func (m *QueryVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVoteResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVoteResponse.Marshal(b, m, deterministic) @@ -322,6 +421,7 @@ func (m *QueryVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVoteResponse.Merge(m, src) @@ -331,6 +431,14 @@ func (m *QueryVoteResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryVoteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVoteResponse.Merge(m, src) +} +func (m *QueryVoteResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryVoteResponse.DiscardUnknown(m) } @@ -358,11 +466,17 @@ func (*QueryVotesRequest) ProtoMessage() {} func (*QueryVotesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{6} } +<<<<<<< HEAD func (m *QueryVotesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVotesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVotesRequest.Marshal(b, m, deterministic) @@ -375,6 +489,7 @@ func (m *QueryVotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVotesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVotesRequest.Merge(m, src) @@ -384,6 +499,14 @@ func (m *QueryVotesRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryVotesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVotesRequest.Merge(m, src) +} +func (m *QueryVotesRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVotesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryVotesRequest.DiscardUnknown(m) } @@ -418,11 +541,17 @@ func (*QueryVotesResponse) ProtoMessage() {} func (*QueryVotesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{7} } +<<<<<<< HEAD func (m *QueryVotesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryVotesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryVotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVotesResponse.Marshal(b, m, deterministic) @@ -435,6 +564,7 @@ func (m *QueryVotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryVotesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVotesResponse.Merge(m, src) @@ -444,6 +574,14 @@ func (m *QueryVotesResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryVotesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryVotesResponse.Merge(m, src) +} +func (m *QueryVotesResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryVotesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryVotesResponse.DiscardUnknown(m) } @@ -477,11 +615,17 @@ func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{8} } +<<<<<<< HEAD func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) @@ -494,6 +638,7 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsRequest.Merge(m, src) @@ -503,6 +648,14 @@ func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsRequest.Merge(m, src) +} +func (m *QueryParamsRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryParamsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } @@ -532,11 +685,17 @@ func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{9} } +<<<<<<< HEAD func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) @@ -549,6 +708,7 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsResponse.Merge(m, src) @@ -558,6 +718,14 @@ func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsResponse.Merge(m, src) +} +func (m *QueryParamsResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } @@ -599,11 +767,17 @@ func (*QueryDepositRequest) ProtoMessage() {} func (*QueryDepositRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{10} } +<<<<<<< HEAD func (m *QueryDepositRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositRequest.Marshal(b, m, deterministic) @@ -616,6 +790,7 @@ func (m *QueryDepositRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositRequest.Merge(m, src) @@ -625,6 +800,14 @@ func (m *QueryDepositRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositRequest.Merge(m, src) +} +func (m *QueryDepositRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositRequest.DiscardUnknown(m) } @@ -643,11 +826,17 @@ func (*QueryDepositResponse) ProtoMessage() {} func (*QueryDepositResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{11} } +<<<<<<< HEAD func (m *QueryDepositResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositResponse.Marshal(b, m, deterministic) @@ -660,6 +849,7 @@ func (m *QueryDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositResponse.Merge(m, src) @@ -669,6 +859,14 @@ func (m *QueryDepositResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositResponse.Merge(m, src) +} +func (m *QueryDepositResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositResponse.DiscardUnknown(m) } @@ -696,11 +894,17 @@ func (*QueryDepositsRequest) ProtoMessage() {} func (*QueryDepositsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{12} } +<<<<<<< HEAD func (m *QueryDepositsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositsRequest.Marshal(b, m, deterministic) @@ -713,6 +917,7 @@ func (m *QueryDepositsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositsRequest.Merge(m, src) @@ -722,6 +927,14 @@ func (m *QueryDepositsRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositsRequest.Merge(m, src) +} +func (m *QueryDepositsRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositsRequest.DiscardUnknown(m) } @@ -756,11 +969,17 @@ func (*QueryDepositsResponse) ProtoMessage() {} func (*QueryDepositsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{13} } +<<<<<<< HEAD func (m *QueryDepositsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryDepositsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryDepositsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryDepositsResponse.Marshal(b, m, deterministic) @@ -773,6 +992,7 @@ func (m *QueryDepositsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } +<<<<<<< HEAD func (m *QueryDepositsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryDepositsResponse.Merge(m, src) @@ -782,6 +1002,14 @@ func (m *QueryDepositsResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryDepositsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDepositsResponse.Merge(m, src) +} +func (m *QueryDepositsResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryDepositsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryDepositsResponse.DiscardUnknown(m) } @@ -814,11 +1042,17 @@ func (*QueryTallyResultRequest) ProtoMessage() {} func (*QueryTallyResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{14} } +<<<<<<< HEAD func (m *QueryTallyResultRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryTallyResultRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryTallyResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTallyResultRequest.Marshal(b, m, deterministic) @@ -831,6 +1065,7 @@ func (m *QueryTallyResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } +<<<<<<< HEAD func (m *QueryTallyResultRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTallyResultRequest.Merge(m, src) @@ -840,6 +1075,14 @@ func (m *QueryTallyResultRequest) XXX_Size() int { return m.Size() } +======= +func (m *QueryTallyResultRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryTallyResultRequest.Merge(m, src) +} +func (m *QueryTallyResultRequest) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryTallyResultRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTallyResultRequest.DiscardUnknown(m) } @@ -865,11 +1108,17 @@ func (*QueryTallyResultResponse) ProtoMessage() {} func (*QueryTallyResultResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8cba678bb4489dfd, []int{15} } +<<<<<<< HEAD func (m *QueryTallyResultResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *QueryTallyResultResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *QueryTallyResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTallyResultResponse.Marshal(b, m, deterministic) @@ -882,6 +1131,7 @@ func (m *QueryTallyResultResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } +<<<<<<< HEAD func (m *QueryTallyResultResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTallyResultResponse.Merge(m, src) @@ -891,6 +1141,14 @@ func (m *QueryTallyResultResponse) XXX_Size() int { return m.Size() } +======= +func (m *QueryTallyResultResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryTallyResultResponse.Merge(m, src) +} +func (m *QueryTallyResultResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *QueryTallyResultResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTallyResultResponse.DiscardUnknown(m) } @@ -927,6 +1185,7 @@ func init() { proto.RegisterFile("atomone/gov/v1beta1/query.proto", fileDescript var fileDescriptor_8cba678bb4489dfd = []byte{ // 1021 bytes of a gzipped FileDescriptorProto +<<<<<<< HEAD 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x6f, 0x1b, 0x45, 0x14, 0xf6, 0x38, 0x49, 0x6b, 0xbf, 0xb4, 0x81, 0x4e, 0x5b, 0x70, 0xac, 0xd6, 0x0e, 0x8b, 0x68, 0x93, 0xa6, 0xf1, 0x2a, 0xa6, 0x55, 0x90, 0x05, 0x87, 0xa4, 0x15, 0xa5, 0x52, 0x41, 0xad, 0x1b, @@ -998,6 +1257,77 @@ var ( _ context.Context _ grpc.ClientConn ) +======= + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xf6, 0x38, 0x49, 0x6b, 0xbf, 0xb4, 0x81, 0x4e, 0x03, 0xb8, 0x56, 0x6b, 0x87, 0x45, 0xa4, + 0x49, 0xda, 0xec, 0x2a, 0xa6, 0xa5, 0xc8, 0x82, 0x43, 0xd2, 0x2a, 0xa8, 0x52, 0x41, 0xad, 0x1b, + 0x21, 0x81, 0x84, 0xa2, 0x75, 0xbd, 0xda, 0xae, 0x64, 0xef, 0x6c, 0x3d, 0x63, 0xab, 0x51, 0x88, + 0x90, 0x38, 0x71, 0x40, 0x15, 0x12, 0x48, 0xa8, 0x27, 0x72, 0x01, 0xd1, 0x1b, 0x07, 0xfe, 0x88, + 0x1e, 0x2b, 0xb8, 0x70, 0x42, 0x28, 0x41, 0x82, 0x03, 0x7f, 0x04, 0xda, 0x99, 0xb7, 0xeb, 0xd9, + 0x64, 0x63, 0xaf, 0x4b, 0xd4, 0x4b, 0x64, 0xcf, 0x7c, 0xdf, 0x7b, 0xdf, 0xfb, 0x31, 0xef, 0x39, + 0x50, 0xb5, 0x05, 0xeb, 0x30, 0xdf, 0xb1, 0x5c, 0xd6, 0xb7, 0xfa, 0x2b, 0x4d, 0x47, 0xd8, 0x2b, + 0xd6, 0x83, 0x9e, 0xd3, 0xdd, 0x32, 0x83, 0x2e, 0x13, 0x8c, 0x9e, 0x45, 0x80, 0xe9, 0xb2, 0xbe, + 0x89, 0x80, 0xf2, 0xd2, 0x3d, 0xc6, 0x3b, 0x8c, 0x5b, 0x4d, 0x9b, 0x3b, 0x0a, 0x1d, 0x73, 0x03, + 0xdb, 0xf5, 0x7c, 0x5b, 0x78, 0xcc, 0x57, 0x06, 0xca, 0xb3, 0x2e, 0x73, 0x99, 0xfc, 0x68, 0x85, + 0x9f, 0xf0, 0xf4, 0xbc, 0xcb, 0x98, 0xdb, 0x76, 0x2c, 0x3b, 0xf0, 0x2c, 0xdb, 0xf7, 0x99, 0x90, + 0x14, 0x8e, 0xb7, 0x17, 0xd2, 0x54, 0x85, 0x02, 0xd4, 0xf5, 0x39, 0xe5, 0x7e, 0x53, 0x59, 0x55, + 0x5f, 0xf0, 0xea, 0x8c, 0xdd, 0xf1, 0x7c, 0x66, 0xc9, 0xbf, 0xea, 0xc8, 0xb8, 0x06, 0xb3, 0x77, + 0x42, 0x89, 0xb7, 0xbb, 0x2c, 0x60, 0xdc, 0x6e, 0x37, 0x9c, 0x07, 0x3d, 0x87, 0x0b, 0x5a, 0x85, + 0xe9, 0x00, 0x8f, 0x36, 0xbd, 0x56, 0x89, 0xcc, 0x91, 0x85, 0xc9, 0x06, 0x44, 0x47, 0x37, 0x5b, + 0xc6, 0xa7, 0xf0, 0xca, 0x01, 0x22, 0x0f, 0x98, 0xcf, 0x1d, 0x7a, 0x03, 0x0a, 0x11, 0x4c, 0xd2, + 0xa6, 0x6b, 0x17, 0xcc, 0x94, 0x34, 0x99, 0x11, 0x71, 0xad, 0xf8, 0xf4, 0x8f, 0x6a, 0xee, 0xa7, + 0xbf, 0x7f, 0x5e, 0x22, 0x8d, 0x98, 0x69, 0x7c, 0x9f, 0x3f, 0x60, 0x9f, 0x47, 0xca, 0x6e, 0xc1, + 0x4b, 0xb1, 0x32, 0x2e, 0x6c, 0xd1, 0xe3, 0xd2, 0xcd, 0x4c, 0xed, 0x8d, 0xa1, 0x6e, 0xee, 0x4a, + 0x68, 0x63, 0x26, 0x48, 0x7c, 0xa7, 0x26, 0x4c, 0xf5, 0x99, 0x70, 0xba, 0xa5, 0xfc, 0x1c, 0x59, + 0x28, 0xae, 0x95, 0x7e, 0xfd, 0x65, 0x79, 0x16, 0x73, 0xb6, 0xda, 0x6a, 0x75, 0x1d, 0xce, 0xef, + 0x8a, 0xae, 0xe7, 0xbb, 0x0d, 0x05, 0xa3, 0x6f, 0x43, 0xb1, 0xe5, 0x04, 0x8c, 0x7b, 0x82, 0x75, + 0x4b, 0x13, 0x23, 0x38, 0x03, 0x28, 0x5d, 0x07, 0x18, 0x14, 0xbf, 0x34, 0x29, 0xf3, 0x32, 0x6f, + 0x22, 0x2b, 0xec, 0x14, 0x53, 0xf5, 0x55, 0x2c, 0xdb, 0x76, 0x1d, 0x8c, 0xb8, 0xa1, 0x31, 0xeb, + 0x85, 0x2f, 0x77, 0xab, 0xb9, 0x7f, 0x76, 0xab, 0x39, 0xe3, 0x09, 0x81, 0x57, 0x0f, 0x66, 0x08, + 0x4b, 0xb0, 0x0e, 0xc5, 0x28, 0xcc, 0x30, 0x39, 0x13, 0x63, 0xd5, 0x60, 0x40, 0xa5, 0xef, 0x27, + 0x44, 0xe7, 0xa5, 0xe8, 0x8b, 0x23, 0x45, 0x2b, 0x11, 0xba, 0x6a, 0xa3, 0x03, 0x2f, 0x4b, 0xa9, + 0x1f, 0x31, 0xe1, 0x64, 0xed, 0xb0, 0x71, 0x4b, 0xa3, 0xa5, 0xe6, 0x03, 0x38, 0xa3, 0xb9, 0xc3, + 0xa4, 0xbc, 0x03, 0x93, 0x21, 0x0e, 0x7b, 0xf2, 0x5c, 0x6a, 0x3e, 0x42, 0x82, 0x9e, 0x0b, 0xc9, + 0x30, 0x3e, 0xd3, 0xcc, 0xf1, 0xcc, 0xf2, 0xd7, 0x53, 0x92, 0xf7, 0x1c, 0x15, 0x37, 0x1e, 0x13, + 0xa0, 0xba, 0x7b, 0x0c, 0xa7, 0xae, 0xb2, 0x13, 0xd5, 0x37, 0x5b, 0x3c, 0x8a, 0x72, 0x7c, 0x75, + 0xbd, 0x8a, 0xd2, 0x6e, 0xdb, 0x5d, 0xbb, 0x93, 0x48, 0x8d, 0x3c, 0xd8, 0x14, 0x5b, 0x81, 0x4a, + 0x78, 0x31, 0xa4, 0x85, 0x47, 0x1b, 0x5b, 0x81, 0x63, 0x3c, 0xca, 0xc3, 0xd9, 0x04, 0x0f, 0x63, + 0xba, 0x03, 0xa7, 0xfb, 0x4c, 0x78, 0xbe, 0xbb, 0xa9, 0xc0, 0x58, 0xab, 0xd7, 0x8f, 0x8a, 0xcd, + 0xf3, 0x5d, 0x65, 0x41, 0x8f, 0xf1, 0x54, 0x5f, 0xbb, 0xa0, 0x1b, 0x30, 0x83, 0x8f, 0x30, 0xb2, + 0xa9, 0xc2, 0x35, 0x52, 0x6d, 0xde, 0x50, 0xd0, 0xc3, 0x46, 0x4f, 0xb7, 0xf4, 0x1b, 0xfa, 0x21, + 0x9c, 0x12, 0x76, 0xbb, 0xbd, 0x15, 0xd9, 0x9c, 0x90, 0x36, 0xe7, 0x52, 0x6d, 0x6e, 0x84, 0xc0, + 0xc3, 0x16, 0xa7, 0xc5, 0xe0, 0xdc, 0x78, 0x88, 0xf9, 0x40, 0xff, 0x99, 0x7b, 0x2c, 0x31, 0x8d, + 0xf2, 0x99, 0xa7, 0x91, 0xf6, 0x54, 0x3e, 0xc6, 0xf9, 0x1f, 0x7b, 0xc6, 0x52, 0xac, 0xc2, 0x49, + 0x84, 0x63, 0x11, 0xce, 0x0f, 0x4b, 0x98, 0x1e, 0x58, 0xc4, 0x33, 0x3e, 0x4f, 0x9a, 0x7e, 0xf1, + 0x2f, 0xe7, 0x07, 0x82, 0x3b, 0x64, 0xa0, 0x00, 0xa3, 0xbb, 0x0e, 0x05, 0x54, 0x19, 0xbd, 0x9f, + 0xcc, 0xe1, 0xc5, 0xc4, 0xe3, 0x7b, 0x45, 0x75, 0x78, 0x4d, 0xca, 0x94, 0x9d, 0xd2, 0x70, 0x78, + 0xaf, 0x2d, 0xc6, 0x58, 0xc3, 0xa5, 0xc3, 0xdc, 0xb8, 0x86, 0x53, 0xb2, 0xc9, 0xb0, 0x82, 0x43, + 0xda, 0x53, 0x11, 0x13, 0x93, 0x42, 0x32, 0x6b, 0xff, 0x16, 0x61, 0x4a, 0xda, 0xa7, 0xdf, 0x11, + 0x28, 0x44, 0xeb, 0x82, 0x2e, 0xa6, 0x9a, 0x4a, 0xfb, 0x21, 0x51, 0x5e, 0xca, 0x02, 0x55, 0x82, + 0x8d, 0x2b, 0x5f, 0xfc, 0xf6, 0xd7, 0x37, 0x79, 0x93, 0x5e, 0xb6, 0xd2, 0x7e, 0xe2, 0xc4, 0x7b, + 0xc9, 0xda, 0xd6, 0x72, 0xb2, 0x43, 0xbf, 0x22, 0x50, 0x8c, 0x77, 0x20, 0xcd, 0xe0, 0x2f, 0xea, + 0xc4, 0xf2, 0xa5, 0x4c, 0x58, 0x14, 0x37, 0x2f, 0xc5, 0xcd, 0xd1, 0xca, 0x70, 0x71, 0xf4, 0x31, + 0x81, 0xc9, 0x70, 0xee, 0xd2, 0x37, 0x8f, 0xb6, 0xae, 0xed, 0xc1, 0xf2, 0xfc, 0x28, 0x18, 0xfa, + 0x5f, 0x93, 0xfe, 0xdf, 0xa5, 0xf5, 0x71, 0x92, 0x63, 0xc9, 0x81, 0x6f, 0x6d, 0xcb, 0x0d, 0xb9, + 0x43, 0xbf, 0x25, 0x30, 0x25, 0xd7, 0x08, 0x1d, 0xe1, 0x35, 0x4e, 0xd1, 0xc5, 0x91, 0x38, 0x94, + 0x57, 0x97, 0xf2, 0xae, 0xd0, 0xda, 0xf8, 0xf2, 0xe8, 0x23, 0x02, 0x27, 0x70, 0xb2, 0x0e, 0xf1, + 0x97, 0x58, 0x32, 0xe5, 0x85, 0xd1, 0x40, 0x54, 0xb6, 0x22, 0x95, 0x5d, 0xa2, 0x8b, 0xe9, 0xca, + 0x24, 0xd8, 0xda, 0xd6, 0x36, 0xd6, 0x0e, 0x7d, 0x42, 0xe0, 0x24, 0xbe, 0x7d, 0x3a, 0xc4, 0x51, + 0x72, 0x5c, 0x97, 0x17, 0x33, 0x20, 0x51, 0xd3, 0x4d, 0xa9, 0xe9, 0x3a, 0x5d, 0x1d, 0x2b, 0x5b, + 0xd1, 0xe8, 0xb1, 0xb6, 0xe3, 0x51, 0xbe, 0x43, 0x77, 0x09, 0x14, 0xa2, 0x01, 0x47, 0x47, 0x4b, + 0xe0, 0x19, 0x1e, 0xe6, 0xc1, 0x79, 0x69, 0xbc, 0x27, 0xe5, 0x5e, 0xa3, 0x57, 0x9f, 0x4b, 0x2e, + 0xfd, 0x91, 0xc0, 0xb4, 0x36, 0x67, 0xe8, 0xe5, 0xa3, 0x5d, 0x1f, 0x9e, 0x81, 0xe5, 0xe5, 0x8c, + 0xe8, 0xff, 0xd5, 0x88, 0x72, 0xdc, 0xad, 0xdd, 0x7a, 0xba, 0x57, 0x21, 0xcf, 0xf6, 0x2a, 0xe4, + 0xcf, 0xbd, 0x0a, 0xf9, 0x7a, 0xbf, 0x92, 0x7b, 0xb6, 0x5f, 0xc9, 0xfd, 0xbe, 0x5f, 0xc9, 0x7d, + 0x52, 0x73, 0x3d, 0x71, 0xbf, 0xd7, 0x34, 0xef, 0xb1, 0x4e, 0x64, 0x77, 0xf9, 0x7e, 0xaf, 0x19, + 0xfb, 0x78, 0x28, 0xbd, 0x84, 0xdd, 0xc3, 0x23, 0x5f, 0xcd, 0x13, 0xf2, 0x5f, 0xac, 0xb7, 0xfe, + 0x0b, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x39, 0xbb, 0x80, 0x47, 0x0e, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -1126,11 +1456,17 @@ type QueryServer interface { } // UnimplementedQueryServer can be embedded to have forward compatible implementations. +<<<<<<< HEAD type UnimplementedQueryServer struct{} +======= +type UnimplementedQueryServer struct { +} +>>>>>>> main func (*UnimplementedQueryServer) Proposal(ctx context.Context, req *QueryProposalRequest) (*QueryProposalResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Proposal not implemented") } +<<<<<<< HEAD func (*UnimplementedQueryServer) Proposals(ctx context.Context, req *QueryProposalsRequest) (*QueryProposalsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Proposals not implemented") @@ -1156,6 +1492,26 @@ func (*UnimplementedQueryServer) Deposits(ctx context.Context, req *QueryDeposit return nil, status.Errorf(codes.Unimplemented, "method Deposits not implemented") } +======= +func (*UnimplementedQueryServer) Proposals(ctx context.Context, req *QueryProposalsRequest) (*QueryProposalsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Proposals not implemented") +} +func (*UnimplementedQueryServer) Vote(ctx context.Context, req *QueryVoteRequest) (*QueryVoteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Vote not implemented") +} +func (*UnimplementedQueryServer) Votes(ctx context.Context, req *QueryVotesRequest) (*QueryVotesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Votes not implemented") +} +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") +} +func (*UnimplementedQueryServer) Deposit(ctx context.Context, req *QueryDepositRequest) (*QueryDepositResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deposit not implemented") +} +func (*UnimplementedQueryServer) Deposits(ctx context.Context, req *QueryDepositsRequest) (*QueryDepositsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Deposits not implemented") +} +>>>>>>> main func (*UnimplementedQueryServer) TallyResult(ctx context.Context, req *QueryTallyResultRequest) (*QueryTallyResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TallyResult not implemented") } @@ -1982,7 +2338,10 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalRequest) Size() (n int) { if m == nil { return 0 @@ -2227,11 +2586,17 @@ func (m *QueryTallyResultResponse) Size() (n int) { func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozQuery(x uint64) (n int) { + return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *QueryProposalRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2301,7 +2666,10 @@ func (m *QueryProposalRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2385,7 +2753,10 @@ func (m *QueryProposalResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2555,7 +2926,10 @@ func (m *QueryProposalsRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryProposalsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2676,7 +3050,10 @@ func (m *QueryProposalsResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVoteRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2778,7 +3155,10 @@ func (m *QueryVoteRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2862,7 +3242,10 @@ func (m *QueryVoteResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVotesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2968,7 +3351,10 @@ func (m *QueryVotesRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryVotesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3089,7 +3475,10 @@ func (m *QueryVotesResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3172,7 +3561,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3322,7 +3714,10 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3424,7 +3819,10 @@ func (m *QueryDepositRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3508,7 +3906,10 @@ func (m *QueryDepositResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3614,7 +4015,10 @@ func (m *QueryDepositsRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryDepositsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3735,7 +4139,10 @@ func (m *QueryDepositsResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryTallyResultRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3805,7 +4212,10 @@ func (m *QueryTallyResultRequest) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *QueryTallyResultResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3889,7 +4299,10 @@ func (m *QueryTallyResultResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1beta1/query.pb.gw.go b/x/gov/types/v1beta1/query.pb.gw.go index 9cb7451d..6fa46860 100644 --- a/x/gov/types/v1beta1/query.pb.gw.go +++ b/x/gov/types/v1beta1/query.pb.gw.go @@ -25,6 +25,7 @@ import ( ) // Suppress "imported and not used" errors +<<<<<<< HEAD var ( _ codes.Code _ io.Reader @@ -34,6 +35,15 @@ var ( _ = descriptor.ForMessage _ = metadata.Join ) +======= +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join +>>>>>>> main func request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProposalRequest @@ -52,12 +62,20 @@ func request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marshaler, } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := client.Proposal(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -77,15 +95,28 @@ func local_request_Query_Proposal_0(ctx context.Context, marshaler runtime.Marsh } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := server.Proposal(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD } var filter_Query_Proposals_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +======= + +} + +var ( + filter_Query_Proposals_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) +>>>>>>> main func request_Query_Proposals_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryProposalsRequest @@ -100,6 +131,10 @@ func request_Query_Proposals_0(ctx context.Context, marshaler runtime.Marshaler, msg, err := client.Proposals(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Proposals_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -115,6 +150,10 @@ func local_request_Query_Proposals_0(ctx context.Context, marshaler runtime.Mars msg, err := server.Proposals(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -134,6 +173,10 @@ func request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, clie } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -144,12 +187,20 @@ func request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, clie } protoReq.Voter, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "voter", err) } msg, err := client.Vote(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -169,6 +220,10 @@ func local_request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -179,15 +234,28 @@ func local_request_Query_Vote_0(ctx context.Context, marshaler runtime.Marshaler } protoReq.Voter, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "voter", err) } msg, err := server.Vote(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD } var filter_Query_Votes_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +======= + +} + +var ( + filter_Query_Votes_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) +>>>>>>> main func request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryVotesRequest @@ -206,6 +274,10 @@ func request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, cli } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -219,6 +291,10 @@ func request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, cli msg, err := client.Votes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -238,6 +314,10 @@ func local_request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshale } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -251,6 +331,10 @@ func local_request_Query_Votes_0(ctx context.Context, marshaler runtime.Marshale msg, err := server.Votes(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } 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) { @@ -270,12 +354,20 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl } protoReq.ParamsType, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "params_type", err) } msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -295,12 +387,20 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } protoReq.ParamsType, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "params_type", err) } msg, err := server.Params(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -320,6 +420,10 @@ func request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, c } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -330,12 +434,20 @@ func request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, c } protoReq.Depositor, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "depositor", err) } msg, err := client.Deposit(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -355,6 +467,10 @@ func local_request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marsha } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -365,15 +481,28 @@ func local_request_Query_Deposit_0(ctx context.Context, marshaler runtime.Marsha } protoReq.Depositor, err = runtime.String(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "depositor", err) } msg, err := server.Deposit(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD } var filter_Query_Deposits_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +======= + +} + +var ( + filter_Query_Deposits_0 = &utilities.DoubleArray{Encoding: map[string]int{"proposal_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) +>>>>>>> main func request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryDepositsRequest @@ -392,6 +521,10 @@ func request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -405,6 +538,10 @@ func request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, msg, err := client.Deposits(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -424,6 +561,10 @@ func local_request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marsh } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } @@ -437,6 +578,10 @@ func local_request_Query_Deposits_0(ctx context.Context, marshaler runtime.Marsh msg, err := server.Deposits(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -456,12 +601,20 @@ func request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Marshale } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := client.TallyResult(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } func local_request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -481,12 +634,20 @@ func local_request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Ma } protoReq.ProposalId, err = runtime.Uint64(val) +<<<<<<< HEAD +======= + +>>>>>>> main if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "proposal_id", err) } msg, err := server.TallyResult(ctx, &protoReq) return msg, metadata, err +<<<<<<< HEAD +======= + +>>>>>>> main } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -494,6 +655,10 @@ func local_request_Query_TallyResult_0(ctx context.Context, marshaler runtime.Ma // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // 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 { +<<<<<<< HEAD +======= + +>>>>>>> main mux.Handle("GET", pattern_Query_Proposal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -514,6 +679,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Proposal_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Proposals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -536,6 +705,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Proposals_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Vote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -558,6 +731,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Vote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Votes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -580,6 +757,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Votes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -602,6 +783,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -624,6 +809,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Deposit_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposits_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -646,6 +835,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Deposits_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_TallyResult_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -668,6 +861,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TallyResult_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) return nil @@ -710,6 +907,10 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { +<<<<<<< HEAD +======= + +>>>>>>> main mux.Handle("GET", pattern_Query_Proposal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -727,6 +928,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Proposal_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Proposals_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -746,6 +951,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Proposals_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Vote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -765,6 +974,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Vote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Votes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -784,6 +997,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Votes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -803,6 +1020,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -822,6 +1043,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Deposit_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_Deposits_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -841,6 +1066,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Deposits_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) mux.Handle("GET", pattern_Query_TallyResult_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -860,6 +1089,10 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TallyResult_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) +<<<<<<< HEAD +======= + +>>>>>>> main }) return nil diff --git a/x/gov/types/v1beta1/router.go b/x/gov/types/v1beta1/router.go index ce13a94b..72d6208e 100644 --- a/x/gov/types/v1beta1/router.go +++ b/x/gov/types/v1beta1/router.go @@ -3,7 +3,11 @@ package v1beta1 import ( "fmt" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) var _ Router = (*router)(nil) diff --git a/x/gov/types/v1beta1/tally.go b/x/gov/types/v1beta1/tally.go index 62ae28cb..73f360ed 100644 --- a/x/gov/types/v1beta1/tally.go +++ b/x/gov/types/v1beta1/tally.go @@ -5,7 +5,11 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // ValidatorGovInfo used for tallying diff --git a/x/gov/types/v1beta1/tx.pb.go b/x/gov/types/v1beta1/tx.pb.go index 389a284c..cb338579 100644 --- a/x/gov/types/v1beta1/tx.pb.go +++ b/x/gov/types/v1beta1/tx.pb.go @@ -6,6 +6,7 @@ package v1beta1 import ( context "context" fmt "fmt" +<<<<<<< HEAD io "io" math "math" math_bits "math/bits" @@ -16,12 +17,21 @@ import ( _ "github.com/atomone-hub/atomone/types/msgservice" _ "github.com/atomone-hub/atomone/types/tx/amino" _ "github.com/cosmos/cosmos-proto" +======= + _ "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" + types1 "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" +>>>>>>> main _ "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" +<<<<<<< HEAD ) // Reference imports to suppress errors if they are not otherwise used. @@ -30,6 +40,17 @@ var ( _ = fmt.Errorf _ = math.Inf ) +======= + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -42,9 +63,14 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MsgSubmitProposal struct { // content is the proposal's content. Content *types.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` +<<<<<<< HEAD // initial_deposit is the deposit value that must be paid at proposal // submission. InitialDeposit github_com_atomone_hub_atomone_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/atomone-hub/atomone/types.Coins" json:"initial_deposit"` +======= + // initial_deposit is the deposit value that must be paid at proposal submission. + InitialDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"initial_deposit"` +>>>>>>> main // proposer is the account address of the proposer. Proposer string `protobuf:"bytes,3,opt,name=proposer,proto3" json:"proposer,omitempty"` } @@ -54,11 +80,17 @@ func (*MsgSubmitProposal) ProtoMessage() {} func (*MsgSubmitProposal) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{0} } +<<<<<<< HEAD func (m *MsgSubmitProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgSubmitProposal) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgSubmitProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSubmitProposal.Marshal(b, m, deterministic) @@ -71,6 +103,7 @@ func (m *MsgSubmitProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } +<<<<<<< HEAD func (m *MsgSubmitProposal) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSubmitProposal.Merge(m, src) @@ -80,6 +113,14 @@ func (m *MsgSubmitProposal) XXX_Size() int { return m.Size() } +======= +func (m *MsgSubmitProposal) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSubmitProposal.Merge(m, src) +} +func (m *MsgSubmitProposal) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgSubmitProposal) XXX_DiscardUnknown() { xxx_messageInfo_MsgSubmitProposal.DiscardUnknown(m) } @@ -98,11 +139,17 @@ func (*MsgSubmitProposalResponse) ProtoMessage() {} func (*MsgSubmitProposalResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{1} } +<<<<<<< HEAD func (m *MsgSubmitProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgSubmitProposalResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgSubmitProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSubmitProposalResponse.Marshal(b, m, deterministic) @@ -115,6 +162,7 @@ func (m *MsgSubmitProposalResponse) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } +<<<<<<< HEAD func (m *MsgSubmitProposalResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSubmitProposalResponse.Merge(m, src) @@ -124,6 +172,14 @@ func (m *MsgSubmitProposalResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgSubmitProposalResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSubmitProposalResponse.Merge(m, src) +} +func (m *MsgSubmitProposalResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgSubmitProposalResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgSubmitProposalResponse.DiscardUnknown(m) } @@ -152,11 +208,17 @@ func (*MsgVote) ProtoMessage() {} func (*MsgVote) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{2} } +<<<<<<< HEAD func (m *MsgVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVote.Marshal(b, m, deterministic) @@ -169,6 +231,7 @@ func (m *MsgVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVote) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVote.Merge(m, src) @@ -178,6 +241,14 @@ func (m *MsgVote) XXX_Size() int { return m.Size() } +======= +func (m *MsgVote) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVote.Merge(m, src) +} +func (m *MsgVote) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVote) XXX_DiscardUnknown() { xxx_messageInfo_MsgVote.DiscardUnknown(m) } @@ -185,7 +256,12 @@ func (m *MsgVote) XXX_DiscardUnknown() { var xxx_messageInfo_MsgVote proto.InternalMessageInfo // MsgVoteResponse defines the Msg/Vote response type. +<<<<<<< HEAD type MsgVoteResponse struct{} +======= +type MsgVoteResponse struct { +} +>>>>>>> main func (m *MsgVoteResponse) Reset() { *m = MsgVoteResponse{} } func (m *MsgVoteResponse) String() string { return proto.CompactTextString(m) } @@ -193,11 +269,17 @@ func (*MsgVoteResponse) ProtoMessage() {} func (*MsgVoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{3} } +<<<<<<< HEAD func (m *MsgVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVoteResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVoteResponse.Marshal(b, m, deterministic) @@ -210,6 +292,7 @@ func (m *MsgVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVoteResponse.Merge(m, src) @@ -219,6 +302,14 @@ func (m *MsgVoteResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgVoteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVoteResponse.Merge(m, src) +} +func (m *MsgVoteResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgVoteResponse.DiscardUnknown(m) } @@ -242,11 +333,17 @@ func (*MsgVoteWeighted) ProtoMessage() {} func (*MsgVoteWeighted) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{4} } +<<<<<<< HEAD func (m *MsgVoteWeighted) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVoteWeighted) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVoteWeighted) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVoteWeighted.Marshal(b, m, deterministic) @@ -259,6 +356,7 @@ func (m *MsgVoteWeighted) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVoteWeighted) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVoteWeighted.Merge(m, src) @@ -268,6 +366,14 @@ func (m *MsgVoteWeighted) XXX_Size() int { return m.Size() } +======= +func (m *MsgVoteWeighted) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVoteWeighted.Merge(m, src) +} +func (m *MsgVoteWeighted) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVoteWeighted) XXX_DiscardUnknown() { xxx_messageInfo_MsgVoteWeighted.DiscardUnknown(m) } @@ -277,7 +383,12 @@ var xxx_messageInfo_MsgVoteWeighted proto.InternalMessageInfo // MsgVoteWeightedResponse defines the Msg/VoteWeighted response type. // // Since: cosmos-sdk 0.43 +<<<<<<< HEAD type MsgVoteWeightedResponse struct{} +======= +type MsgVoteWeightedResponse struct { +} +>>>>>>> main func (m *MsgVoteWeightedResponse) Reset() { *m = MsgVoteWeightedResponse{} } func (m *MsgVoteWeightedResponse) String() string { return proto.CompactTextString(m) } @@ -285,11 +396,17 @@ func (*MsgVoteWeightedResponse) ProtoMessage() {} func (*MsgVoteWeightedResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{5} } +<<<<<<< HEAD func (m *MsgVoteWeightedResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgVoteWeightedResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgVoteWeightedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgVoteWeightedResponse.Marshal(b, m, deterministic) @@ -302,6 +419,7 @@ func (m *MsgVoteWeightedResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } +<<<<<<< HEAD func (m *MsgVoteWeightedResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgVoteWeightedResponse.Merge(m, src) @@ -311,6 +429,14 @@ func (m *MsgVoteWeightedResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgVoteWeightedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgVoteWeightedResponse.Merge(m, src) +} +func (m *MsgVoteWeightedResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgVoteWeightedResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgVoteWeightedResponse.DiscardUnknown(m) } @@ -324,7 +450,11 @@ type MsgDeposit struct { // depositor defines the deposit addresses from the proposals. Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` // amount to be deposited by depositor. +<<<<<<< HEAD Amount github_com_atomone_hub_atomone_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/atomone-hub/atomone/types.Coins" json:"amount"` +======= + Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` +>>>>>>> main } func (m *MsgDeposit) Reset() { *m = MsgDeposit{} } @@ -332,11 +462,17 @@ func (*MsgDeposit) ProtoMessage() {} func (*MsgDeposit) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{6} } +<<<<<<< HEAD func (m *MsgDeposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgDeposit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgDeposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgDeposit.Marshal(b, m, deterministic) @@ -349,6 +485,7 @@ func (m *MsgDeposit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } +<<<<<<< HEAD func (m *MsgDeposit) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgDeposit.Merge(m, src) @@ -358,6 +495,14 @@ func (m *MsgDeposit) XXX_Size() int { return m.Size() } +======= +func (m *MsgDeposit) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeposit.Merge(m, src) +} +func (m *MsgDeposit) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgDeposit) XXX_DiscardUnknown() { xxx_messageInfo_MsgDeposit.DiscardUnknown(m) } @@ -365,7 +510,12 @@ func (m *MsgDeposit) XXX_DiscardUnknown() { var xxx_messageInfo_MsgDeposit proto.InternalMessageInfo // MsgDepositResponse defines the Msg/Deposit response type. +<<<<<<< HEAD type MsgDepositResponse struct{} +======= +type MsgDepositResponse struct { +} +>>>>>>> main func (m *MsgDepositResponse) Reset() { *m = MsgDepositResponse{} } func (m *MsgDepositResponse) String() string { return proto.CompactTextString(m) } @@ -373,11 +523,17 @@ func (*MsgDepositResponse) ProtoMessage() {} func (*MsgDepositResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c121a56b868812b2, []int{7} } +<<<<<<< HEAD func (m *MsgDepositResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } +======= +func (m *MsgDepositResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +>>>>>>> main func (m *MsgDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgDepositResponse.Marshal(b, m, deterministic) @@ -390,6 +546,7 @@ func (m *MsgDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } +<<<<<<< HEAD func (m *MsgDepositResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgDepositResponse.Merge(m, src) @@ -399,6 +556,14 @@ func (m *MsgDepositResponse) XXX_Size() int { return m.Size() } +======= +func (m *MsgDepositResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDepositResponse.Merge(m, src) +} +func (m *MsgDepositResponse) XXX_Size() int { + return m.Size() +} +>>>>>>> main func (m *MsgDepositResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgDepositResponse.DiscardUnknown(m) } @@ -419,6 +584,7 @@ func init() { func init() { proto.RegisterFile("atomone/gov/v1beta1/tx.proto", fileDescriptor_c121a56b868812b2) } var fileDescriptor_c121a56b868812b2 = []byte{ +<<<<<<< HEAD // 746 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcf, 0x6f, 0xd3, 0x4a, 0x10, 0xb6, 0x93, 0xb6, 0x79, 0xdd, 0x3e, 0xb5, 0xaa, 0x5f, 0x9e, 0x9a, 0x98, 0x12, 0x47, 0x16, @@ -474,6 +640,61 @@ var ( _ context.Context _ grpc.ClientConn ) +======= + // 749 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x3f, 0x6f, 0xd3, 0x40, + 0x14, 0xc0, 0xed, 0xa4, 0x6d, 0xe8, 0x15, 0xb5, 0xaa, 0x89, 0xd4, 0x24, 0x14, 0x3b, 0xb2, 0x10, + 0x8d, 0x2a, 0x62, 0xab, 0x81, 0x16, 0x29, 0x4c, 0x0d, 0x2c, 0xa0, 0x46, 0x45, 0xa9, 0x04, 0x12, + 0x4b, 0x65, 0xc7, 0xc7, 0xc5, 0xa2, 0xf6, 0x59, 0xb9, 0x4b, 0xd4, 0x6c, 0x15, 0x13, 0x62, 0x62, + 0x64, 0x60, 0xe8, 0x88, 0x98, 0x3a, 0xf4, 0x1b, 0xb0, 0x54, 0x4c, 0x55, 0x27, 0x06, 0x54, 0x50, + 0x3b, 0x14, 0xf1, 0x15, 0x90, 0x10, 0xb2, 0xef, 0xce, 0x09, 0xad, 0xfb, 0x87, 0x8a, 0x25, 0xbe, + 0x7b, 0x7f, 0xef, 0xfd, 0xee, 0xbd, 0x1c, 0x98, 0xb6, 0x28, 0xf6, 0xb0, 0x0f, 0x4d, 0x84, 0xbb, + 0x66, 0x77, 0xce, 0x86, 0xd4, 0x9a, 0x33, 0xe9, 0xba, 0x11, 0xb4, 0x31, 0xc5, 0xca, 0x35, 0xae, + 0x35, 0x10, 0xee, 0x1a, 0x5c, 0x5b, 0x50, 0x9b, 0x98, 0x78, 0x98, 0x98, 0xb6, 0x45, 0x60, 0xec, + 0xd2, 0xc4, 0xae, 0xcf, 0x9c, 0x0a, 0x37, 0x92, 0x42, 0x86, 0x01, 0x98, 0x3a, 0xcf, 0xdc, 0x57, + 0xa3, 0x9d, 0xc9, 0x36, 0x5c, 0x95, 0x45, 0x18, 0x61, 0x26, 0x0f, 0x57, 0xc2, 0x01, 0x61, 0x8c, + 0xd6, 0xa0, 0x19, 0xed, 0xec, 0xce, 0x0b, 0xd3, 0xf2, 0x7b, 0x5c, 0x35, 0xc5, 0x8f, 0xe2, 0x11, + 0x64, 0x76, 0xe7, 0xc2, 0x0f, 0x57, 0x4c, 0x5a, 0x9e, 0xeb, 0x63, 0x33, 0xfa, 0x65, 0x22, 0x7d, + 0x2f, 0x05, 0x26, 0xeb, 0x04, 0xad, 0x74, 0x6c, 0xcf, 0xa5, 0x4f, 0xda, 0x38, 0xc0, 0xc4, 0x5a, + 0x53, 0x96, 0x41, 0xa6, 0x89, 0x7d, 0x0a, 0x7d, 0x9a, 0x93, 0x8b, 0x72, 0x69, 0xac, 0x92, 0x35, + 0x58, 0x3a, 0x43, 0xa4, 0x33, 0x16, 0xfd, 0x5e, 0x4d, 0xfb, 0xbc, 0x5d, 0xbe, 0x9e, 0x00, 0xc3, + 0x78, 0xc0, 0x9c, 0x1b, 0x22, 0x8a, 0xd2, 0x03, 0x13, 0xae, 0xef, 0x52, 0xd7, 0x5a, 0x5b, 0x75, + 0x60, 0x80, 0x89, 0x4b, 0x73, 0xa9, 0x62, 0xba, 0x34, 0x56, 0xc9, 0x1b, 0xbc, 0xd6, 0x90, 0xdb, + 0x80, 0xbf, 0xeb, 0xd7, 0xe6, 0x77, 0xf6, 0x35, 0xe9, 0xe3, 0x37, 0xad, 0x84, 0x5c, 0xda, 0xea, + 0xd8, 0x46, 0x13, 0x7b, 0x1c, 0x0c, 0xff, 0x94, 0x89, 0xf3, 0xd2, 0xa4, 0xbd, 0x00, 0x92, 0xc8, + 0x81, 0x7c, 0x38, 0xda, 0x9a, 0x95, 0x1b, 0xe3, 0x3c, 0xd1, 0x43, 0x96, 0x47, 0xb9, 0x0b, 0xae, + 0x04, 0x51, 0x5d, 0xb0, 0x9d, 0x4b, 0x17, 0xe5, 0xd2, 0x68, 0x2d, 0xb7, 0xb7, 0x5d, 0xce, 0xf2, + 0xb4, 0x8b, 0x8e, 0xd3, 0x86, 0x84, 0xac, 0xd0, 0xb6, 0xeb, 0xa3, 0x46, 0x6c, 0x59, 0xbd, 0xff, + 0x7a, 0x53, 0x93, 0xde, 0x6d, 0x6a, 0xd2, 0x8f, 0x4d, 0x4d, 0xda, 0xf8, 0x5a, 0x94, 0x5e, 0x1d, + 0x6d, 0xcd, 0xc6, 0xea, 0x37, 0x47, 0x5b, 0xb3, 0x79, 0x71, 0xa1, 0x27, 0xf0, 0xe9, 0x0d, 0x90, + 0x3f, 0x21, 0x6c, 0x40, 0x12, 0x60, 0x9f, 0x40, 0x65, 0x1e, 0x8c, 0x05, 0x5c, 0xb6, 0xea, 0x3a, + 0x11, 0xdf, 0xa1, 0x5a, 0xf6, 0xe7, 0xbe, 0x36, 0x28, 0x66, 0xa5, 0x00, 0x21, 0x79, 0xe4, 0xe8, + 0x9f, 0x64, 0x90, 0xa9, 0x13, 0xf4, 0x14, 0x53, 0xa8, 0x68, 0x09, 0x21, 0x06, 0x8d, 0x15, 0x03, + 0x0c, 0x77, 0x31, 0x85, 0xed, 0x5c, 0xea, 0x9c, 0x82, 0x99, 0x99, 0x72, 0x0f, 0x8c, 0xe0, 0x80, + 0xba, 0xd8, 0x8f, 0x08, 0x8d, 0x57, 0x34, 0x23, 0xe9, 0x56, 0xc3, 0xdc, 0xcb, 0x91, 0x59, 0x83, + 0x9b, 0x57, 0x8d, 0x24, 0x4c, 0x2c, 0x68, 0xc8, 0x68, 0x62, 0x80, 0x51, 0xe8, 0xad, 0x4f, 0x82, + 0x09, 0xbe, 0x14, 0x3c, 0xf4, 0xdf, 0x72, 0x2c, 0x7b, 0x06, 0x5d, 0xd4, 0xa2, 0xd0, 0xb9, 0x24, + 0xa3, 0x7f, 0x2e, 0x7b, 0x09, 0x64, 0x58, 0x1d, 0x24, 0x97, 0x8e, 0xba, 0x71, 0x26, 0xb1, 0x6e, + 0x71, 0xac, 0x7e, 0xfd, 0xb5, 0xd1, 0xb0, 0x37, 0xd9, 0x01, 0x44, 0x88, 0xea, 0xc2, 0xd9, 0x2c, + 0xa6, 0x8e, 0xb1, 0x10, 0x51, 0xf5, 0x3c, 0x98, 0x3a, 0x26, 0x8a, 0xd9, 0xbc, 0x4f, 0x01, 0x50, + 0x27, 0x48, 0xb4, 0xf2, 0x25, 0xb1, 0x2c, 0x80, 0x51, 0x3e, 0x74, 0xf8, 0x7c, 0x34, 0x7d, 0x53, + 0xa5, 0x05, 0x46, 0x2c, 0x0f, 0x77, 0x7c, 0xca, 0xe9, 0xfc, 0xff, 0x59, 0xe5, 0xf1, 0xab, 0xf3, + 0x49, 0xe8, 0xfa, 0x27, 0x09, 0xf1, 0x29, 0x03, 0xf8, 0x38, 0x0f, 0x3d, 0x0b, 0x94, 0xfe, 0x4e, + 0x40, 0xab, 0xfc, 0x4a, 0x81, 0x74, 0x9d, 0x20, 0xa5, 0x05, 0xc6, 0x8f, 0xfd, 0xad, 0xdd, 0x4a, + 0xbc, 0xde, 0x13, 0xa3, 0x5a, 0x30, 0x2e, 0x66, 0x17, 0x8f, 0xf4, 0x63, 0x30, 0x14, 0xcd, 0xe5, + 0xf4, 0x69, 0x7e, 0xa1, 0xb6, 0x70, 0xf3, 0x2c, 0x6d, 0x1c, 0xcb, 0x06, 0x57, 0xff, 0x1a, 0x85, + 0x33, 0xbd, 0x84, 0x55, 0xe1, 0xf6, 0x45, 0xac, 0xe2, 0x1c, 0x2b, 0x20, 0x23, 0x5a, 0x4a, 0x3b, + 0xcd, 0x91, 0x1b, 0x14, 0x66, 0xce, 0x31, 0x10, 0x41, 0x0b, 0xc3, 0x1b, 0xe1, 0x95, 0xd6, 0x96, + 0x76, 0x0e, 0x54, 0x79, 0xf7, 0x40, 0x95, 0xbf, 0x1f, 0xa8, 0xf2, 0xdb, 0x43, 0x55, 0xda, 0x3d, + 0x54, 0xa5, 0x2f, 0x87, 0xaa, 0xf4, 0xbc, 0x32, 0xd0, 0x1b, 0x3c, 0x66, 0xb9, 0xd5, 0xb1, 0xc5, + 0xda, 0x5c, 0x8f, 0x9e, 0xc6, 0xa8, 0x47, 0xc4, 0x03, 0x69, 0x8f, 0x44, 0xef, 0xcd, 0x9d, 0x3f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x89, 0x72, 0x05, 0xad, 0x91, 0x07, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn +>>>>>>> main // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -487,8 +708,12 @@ type MsgClient interface { SubmitProposal(ctx context.Context, in *MsgSubmitProposal, opts ...grpc.CallOption) (*MsgSubmitProposalResponse, error) // Vote defines a method to add a vote on a specific proposal. Vote(ctx context.Context, in *MsgVote, opts ...grpc.CallOption) (*MsgVoteResponse, error) +<<<<<<< HEAD // VoteWeighted defines a method to add a weighted vote on a specific // proposal. +======= + // VoteWeighted defines a method to add a weighted vote on a specific proposal. +>>>>>>> main // // Since: cosmos-sdk 0.43 VoteWeighted(ctx context.Context, in *MsgVoteWeighted, opts ...grpc.CallOption) (*MsgVoteWeightedResponse, error) @@ -546,8 +771,12 @@ type MsgServer interface { SubmitProposal(context.Context, *MsgSubmitProposal) (*MsgSubmitProposalResponse, error) // Vote defines a method to add a vote on a specific proposal. Vote(context.Context, *MsgVote) (*MsgVoteResponse, error) +<<<<<<< HEAD // VoteWeighted defines a method to add a weighted vote on a specific // proposal. +======= + // VoteWeighted defines a method to add a weighted vote on a specific proposal. +>>>>>>> main // // Since: cosmos-sdk 0.43 VoteWeighted(context.Context, *MsgVoteWeighted) (*MsgVoteWeightedResponse, error) @@ -556,11 +785,17 @@ type MsgServer interface { } // UnimplementedMsgServer can be embedded to have forward compatible implementations. +<<<<<<< HEAD type UnimplementedMsgServer struct{} +======= +type UnimplementedMsgServer struct { +} +>>>>>>> main func (*UnimplementedMsgServer) SubmitProposal(ctx context.Context, req *MsgSubmitProposal) (*MsgSubmitProposalResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitProposal not implemented") } +<<<<<<< HEAD func (*UnimplementedMsgServer) Vote(ctx context.Context, req *MsgVote) (*MsgVoteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Vote not implemented") @@ -570,6 +805,14 @@ func (*UnimplementedMsgServer) VoteWeighted(ctx context.Context, req *MsgVoteWei return nil, status.Errorf(codes.Unimplemented, "method VoteWeighted not implemented") } +======= +func (*UnimplementedMsgServer) Vote(ctx context.Context, req *MsgVote) (*MsgVoteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Vote not implemented") +} +func (*UnimplementedMsgServer) VoteWeighted(ctx context.Context, req *MsgVoteWeighted) (*MsgVoteWeightedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method VoteWeighted not implemented") +} +>>>>>>> main func (*UnimplementedMsgServer) Deposit(ctx context.Context, req *MsgDeposit) (*MsgDepositResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Deposit not implemented") } @@ -977,7 +1220,10 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgSubmitProposal) Size() (n int) { if m == nil { return 0 @@ -1106,11 +1352,17 @@ func (m *MsgDepositResponse) Size() (n int) { func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } +<<<<<<< HEAD func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +======= +func sozTx(x uint64) (n int) { + return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +>>>>>>> main func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1263,7 +1515,10 @@ func (m *MsgSubmitProposal) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgSubmitProposalResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1333,7 +1588,10 @@ func (m *MsgSubmitProposalResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1454,7 +1712,10 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1505,7 +1766,10 @@ func (m *MsgVoteResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVoteWeighted) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1641,7 +1905,10 @@ func (m *MsgVoteWeighted) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgVoteWeightedResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1692,7 +1959,10 @@ func (m *MsgVoteWeightedResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgDeposit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1828,7 +2098,10 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func (m *MsgDepositResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1879,7 +2152,10 @@ func (m *MsgDepositResponse) Unmarshal(dAtA []byte) error { } return nil } +<<<<<<< HEAD +======= +>>>>>>> main func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/gov/types/v1beta1/vote.go b/x/gov/types/v1beta1/vote.go index 3de31dfc..5e0bc148 100644 --- a/x/gov/types/v1beta1/vote.go +++ b/x/gov/types/v1beta1/vote.go @@ -8,7 +8,11 @@ import ( "cosmossdk.io/math" +<<<<<<< HEAD sdk "github.com/atomone-hub/atomone/types" +======= + sdk "github.com/cosmos/cosmos-sdk/types" +>>>>>>> main ) // NewVote creates a new Vote instance