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

Upgrade v0.50 #19

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Upgrade v0.50 #19

merged 1 commit into from
Sep 25, 2024

Conversation

mikluke
Copy link
Collaborator

@mikluke mikluke commented Jul 5, 2024

No description provided.

@mikluke mikluke self-assigned this Jul 5, 2024
@mikluke mikluke requested a review from kostassh July 5, 2024 14:28
Base automatically changed from upgrade-v0.47 to main July 17, 2024 08:59
@mikluke mikluke force-pushed the upgrade-v0.50 branch 3 times, most recently from c1dcb83 to b413054 Compare August 29, 2024 11:26
# Conflicts:
#	app/app.go
#	app/export.go
#	app/upgrade/v110/upgrade.go
#	cmd/scorumd/cmd/collectgentx.go
#	cmd/scorumd/cmd/root.go
#	go.mod
#	proto/network/scorum/v1/params.proto
#	proto/network/scorum/v1/tx.proto
#	proto/network/scorum/v1/types.proto
#	testutil/keeper/bank.go
#	x/aviatrix/keeper/keeper_test.go
#	x/aviatrix/keeper/msg_server_adjust_plane_experience_test.go
#	x/aviatrix/keeper/msg_server_set_plane_experience_test.go
#	x/scorum/client/cli/tx.go
#	x/scorum/keeper/gas.go
#	x/scorum/keeper/gas_test.go
#	x/scorum/keeper/keeper_test.go
#	x/scorum/keeper/msg_server_convert_scr2sp.go
#	x/scorum/keeper/msg_server_convert_scr2sp_test.go
#	x/scorum/keeper/msg_stop_sp_withdrawal_test.go
#	x/scorum/keeper/msg_withdraw_sp.go
#	x/scorum/keeper/msg_withdraw_sp_test.go
#	x/scorum/keeper/params_test.go
#	x/scorum/keeper/query_list_withdrawals_test.go
#	x/scorum/keeper/query_params_test.go
#	x/scorum/keeper/withdrawal.go
#	x/scorum/keeper/withdrawal_test.go
#	x/scorum/module.go
#	x/scorum/simulation/genesis.go
#	x/scorum/simulation/operations.go
#	x/scorum/types/codec.go
#	x/scorum/types/expected_keepers.go
#	x/scorum/types/genesis_test.go
#	x/scorum/types/msg_convert_scr2sp.go
#	x/scorum/types/msg_withdraw_sp.go
#	x/scorum/types/params.go
#	x/scorum/types/params.pb.go
#	x/scorum/types/tx.pb.go
#	x/scorum/types/types.go
#	x/scorum/types/types.pb.go
#	x/scorum/wrapper/account_keeper.go
@mikluke mikluke merged commit e6b77d8 into main Sep 25, 2024
1 check passed
@mikluke mikluke deleted the upgrade-v0.50 branch September 25, 2024 19:29
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