Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Feat/Qb-2041: Add query: TotalRewardByEpoch for v0.12.0 #312

Merged

Conversation

Xiong-stratos
Copy link
Contributor

@Xiong-stratos Xiong-stratos commented Sep 18, 2023

Merge #311 first

@Xiong-stratos Xiong-stratos changed the base branch from v0.12.0 to v0.12.0-prepare October 2, 2023 15:43
@Xiong-stratos Xiong-stratos changed the base branch from v0.12.0-prepare to QB-2171_upgrade_cosmos_sdk October 31, 2023 17:26
…eward_v0.11.0

# Conflicts:
#	app/app.go
#	app/upgrades.go
#	proto/stratos/pot/v1/query.proto
#	proto/stratos/register/v1/tx.proto
#	x/pot/app_benchmark_test.go
#	x/pot/app_test.go
#	x/pot/keeper/keeper.go
#	x/pot/keeper/migrations.go
#	x/pot/keeper/querier.go
#	x/pot/types/genesis.go
#	x/pot/types/genesis.pb.go
#	x/pot/types/key.go
#	x/pot/types/query.pb.go
#	x/register/client/cli/tx.go
#	x/register/client/rest/tx.go
#	x/register/genesis.go
#	x/register/keeper/meta_node.go
#	x/register/keeper/migrations.go
#	x/register/module.go
#	x/register/types/errors.go
#	x/register/types/genesis.pb.go
#	x/register/types/meta_node.go
#	x/register/types/register.pb.go
#	x/register/types/tx.pb.go
…eward_v0.11.0

# Conflicts:
#	proto/stratos/register/v1/tx.proto
#	x/pot/app_benchmark_test.go
#	x/register/keeper/genesis.go
#	x/register/types/tx.pb.go
@alexstratos alexstratos merged commit 442c423 into QB-2171_upgrade_cosmos_sdk Nov 1, 2023
1 check passed
@alexstratos alexstratos deleted the qb-2041_query_volume_reward_v0.11.0 branch November 1, 2023 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants