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: Upgrade tia branch to cosmos sdk v0.50.1 (backport #382) #391

Merged
merged 4 commits into from
Feb 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 29, 2024

This is an automatic backport of pull request #382 done by Mergify.
Cherry-pick of 8649e17 has failed:

On branch mergify/bp/main/pr-382
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 8649e17.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/build.yml
	modified:   .github/workflows/code-ql.yml
	modified:   .github/workflows/debug.yml
	modified:   .github/workflows/lint.yml
	modified:   .github/workflows/release.yml
	modified:   .github/workflows/simulations.yml
	modified:   .github/workflows/tests.yml
	modified:   .golangci.yml
	modified:   Dockerfile
	modified:   ante/ante.go
	modified:   ante/ante_test.go
	modified:   ante/fee.go
	modified:   ante/fee_test.go
	modified:   ante/fee_unit_test.go
	modified:   ante/spam_prevention_test.go
	modified:   app/app.go
	modified:   app/encoding.go
	modified:   app/export.go
	modified:   app/genesis.go
	modified:   app/gmpmiddleware/gmp_middleware.go
	modified:   app/gmpmiddleware/types.go
	modified:   app/gmpmiddleware/types_test.go
	modified:   app/ibctransfer/expected_keepers.go
	modified:   app/ibctransfer/ibc_module.go
	modified:   app/ibctransfer/ibctransfer.go
	modified:   app/ibctransfer/module.go
	modified:   app/modules.go
	modified:   app/params/app_settings.go
	modified:   app/test_helpers.go
	modified:   app/upgrades.go
	modified:   client/chain_height.go
	modified:   client/tx/client.go
	modified:   client/tx/gov.go
	modified:   client/tx/sign.go
	modified:   client/tx/staking.go
	deleted:    cmd/ojod/cmd/app_creator.go
	new file:   cmd/ojod/cmd/commands.go
	modified:   cmd/ojod/cmd/genaccounts.go
	modified:   cmd/ojod/cmd/root.go
	modified:   cmd/ojod/main.go
	modified:   docs/design/000-historacle.md
	modified:   docs/design/001-interchain-queries.md
	modified:   proto/ojo/airdrop/v1/airdrop.proto
	modified:   proto/ojo/oracle/v1/events.proto
	modified:   proto/ojo/oracle/v1/oracle.proto
	modified:   proto/ojo/oracle/v1/tx.proto
	new file:   scripts/init-local.sh
	new file:   scripts/restart-local.sh
	modified:   tests/e2e/e2e_setup_test.go
	modified:   tests/e2e/e2e_test.go
	modified:   tests/e2e/orchestrator/chain.go
	modified:   tests/e2e/orchestrator/genesis.go
	modified:   tests/e2e/orchestrator/oracle_gen_state.go
	modified:   tests/e2e/orchestrator/orchestrator.go
	modified:   tests/e2e/orchestrator/validator.go
	modified:   tests/grpc/gov.go
	modified:   tests/grpc/price_store.go
	modified:   tests/integration/test_helpers.go
	modified:   tests/simulation/sim_test.go
	modified:   tests/simulation/state.go
	modified:   util/coin/math.go
	modified:   util/decmath/decmath.go
	modified:   util/decmath/decmath_test.go
	modified:   util/metrics/metrics.go
	modified:   util/sim/deliver.go
	modified:   x/airdrop/abci.go
	modified:   x/airdrop/abci_test.go
	modified:   x/airdrop/genesis_test.go
	modified:   x/airdrop/keeper/airdrop_account.go
	modified:   x/airdrop/keeper/airdrop_account_test.go
	modified:   x/airdrop/keeper/grpc_query.go
	modified:   x/airdrop/keeper/keeper.go
	modified:   x/airdrop/keeper/msg_server_test.go
	modified:   x/airdrop/keeper/params_test.go
	modified:   x/airdrop/module.go
	modified:   x/airdrop/simulation/genesis.go
	modified:   x/airdrop/simulation/operations.go
	modified:   x/airdrop/types/airdrop.pb.go
	modified:   x/airdrop/types/airdrop_account.go
	modified:   x/airdrop/types/expected_keeper.go
	modified:   x/airdrop/types/msgs.go
	modified:   x/airdrop/types/params.go
	modified:   x/gmp/client/cli/tx.go
	modified:   x/gmp/keeper/keeper.go
	modified:   x/gmp/keeper/keeper_suite_test.go
	modified:   x/gmp/keeper/msg_server_test.go
	modified:   x/gmp/module.go
	modified:   x/gmp/types/abi_decode.go
	modified:   x/gmp/types/abi_encode.go
	modified:   x/gmp/types/expected_keeper.go
	modified:   x/gmp/types/msgs.go
	modified:   x/oracle/README.md
	modified:   x/oracle/abci.go
	modified:   x/oracle/abci_test.go
	modified:   x/oracle/client/tests/suite.go
	modified:   x/oracle/genesis.go
	modified:   x/oracle/genesis_test.go
	modified:   x/oracle/keeper/alias_functions.go
	modified:   x/oracle/keeper/ballot_test.go
	modified:   x/oracle/keeper/genesis.go
	modified:   x/oracle/keeper/genesis_test.go
	modified:   x/oracle/keeper/grpc_query.go
	modified:   x/oracle/keeper/grpc_query_test.go
	modified:   x/oracle/keeper/historic_price.go
	modified:   x/oracle/keeper/historic_price_test.go
	modified:   x/oracle/keeper/keeper.go
	modified:   x/oracle/keeper/keeper_test.go
	modified:   x/oracle/keeper/migrations.go
	modified:   x/oracle/keeper/miss_counter.go
	modified:   x/oracle/keeper/msg_server.go
	modified:   x/oracle/keeper/msg_server_test.go
	modified:   x/oracle/keeper/param_update_plan.go
	modified:   x/oracle/keeper/params.go
	modified:   x/oracle/keeper/params_test.go
	modified:   x/oracle/keeper/reward.go
	modified:   x/oracle/keeper/reward_test.go
	modified:   x/oracle/keeper/slash.go
	modified:   x/oracle/keeper/slash_test.go
	modified:   x/oracle/module.go
	modified:   x/oracle/simulations/genesis.go
	modified:   x/oracle/simulations/operations.go
	modified:   x/oracle/types/asset.go
	modified:   x/oracle/types/ballot.go
	modified:   x/oracle/types/ballot_test.go
	modified:   x/oracle/types/events.pb.go
	modified:   x/oracle/types/expected_keeper.go
	modified:   x/oracle/types/genesis_test.go
	modified:   x/oracle/types/msgs.go
	modified:   x/oracle/types/msgs_test.go
	modified:   x/oracle/types/oracle.pb.go
	modified:   x/oracle/types/params.go
	modified:   x/oracle/types/params_test.go
	modified:   x/oracle/types/price_stamp.go
	modified:   x/oracle/types/reward_band.go
	modified:   x/oracle/types/reward_band_test.go
	modified:   x/oracle/types/tx.pb.go
	modified:   x/oracle/types/utils_test.go
	modified:   x/oracle/types/vote.go
	modified:   x/oracle/types/vote_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   scripts/celestia_devnet.sh
	both modified:   tools/tools.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team as a code owner February 29, 2024 17:06
@mergify mergify bot added the conflicts label Feb 29, 2024
Copy link
Contributor Author

mergify bot commented Feb 29, 2024

Cherry-pick of 8649e17 has failed:

On branch mergify/bp/main/pr-382
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 8649e17.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/build.yml
	modified:   .github/workflows/code-ql.yml
	modified:   .github/workflows/debug.yml
	modified:   .github/workflows/lint.yml
	modified:   .github/workflows/release.yml
	modified:   .github/workflows/simulations.yml
	modified:   .github/workflows/tests.yml
	modified:   .golangci.yml
	modified:   Dockerfile
	modified:   ante/ante.go
	modified:   ante/ante_test.go
	modified:   ante/fee.go
	modified:   ante/fee_test.go
	modified:   ante/fee_unit_test.go
	modified:   ante/spam_prevention_test.go
	modified:   app/app.go
	modified:   app/encoding.go
	modified:   app/export.go
	modified:   app/genesis.go
	modified:   app/gmpmiddleware/gmp_middleware.go
	modified:   app/gmpmiddleware/types.go
	modified:   app/gmpmiddleware/types_test.go
	modified:   app/ibctransfer/expected_keepers.go
	modified:   app/ibctransfer/ibc_module.go
	modified:   app/ibctransfer/ibctransfer.go
	modified:   app/ibctransfer/module.go
	modified:   app/modules.go
	modified:   app/params/app_settings.go
	modified:   app/test_helpers.go
	modified:   app/upgrades.go
	modified:   client/chain_height.go
	modified:   client/tx/client.go
	modified:   client/tx/gov.go
	modified:   client/tx/sign.go
	modified:   client/tx/staking.go
	deleted:    cmd/ojod/cmd/app_creator.go
	new file:   cmd/ojod/cmd/commands.go
	modified:   cmd/ojod/cmd/genaccounts.go
	modified:   cmd/ojod/cmd/root.go
	modified:   cmd/ojod/main.go
	modified:   docs/design/000-historacle.md
	modified:   docs/design/001-interchain-queries.md
	modified:   proto/ojo/airdrop/v1/airdrop.proto
	modified:   proto/ojo/oracle/v1/events.proto
	modified:   proto/ojo/oracle/v1/oracle.proto
	modified:   proto/ojo/oracle/v1/tx.proto
	new file:   scripts/init-local.sh
	new file:   scripts/restart-local.sh
	modified:   tests/e2e/e2e_setup_test.go
	modified:   tests/e2e/e2e_test.go
	modified:   tests/e2e/orchestrator/chain.go
	modified:   tests/e2e/orchestrator/genesis.go
	modified:   tests/e2e/orchestrator/oracle_gen_state.go
	modified:   tests/e2e/orchestrator/orchestrator.go
	modified:   tests/e2e/orchestrator/validator.go
	modified:   tests/grpc/gov.go
	modified:   tests/grpc/price_store.go
	modified:   tests/integration/test_helpers.go
	modified:   tests/simulation/sim_test.go
	modified:   tests/simulation/state.go
	modified:   util/coin/math.go
	modified:   util/decmath/decmath.go
	modified:   util/decmath/decmath_test.go
	modified:   util/metrics/metrics.go
	modified:   util/sim/deliver.go
	modified:   x/airdrop/abci.go
	modified:   x/airdrop/abci_test.go
	modified:   x/airdrop/genesis_test.go
	modified:   x/airdrop/keeper/airdrop_account.go
	modified:   x/airdrop/keeper/airdrop_account_test.go
	modified:   x/airdrop/keeper/grpc_query.go
	modified:   x/airdrop/keeper/keeper.go
	modified:   x/airdrop/keeper/msg_server_test.go
	modified:   x/airdrop/keeper/params_test.go
	modified:   x/airdrop/module.go
	modified:   x/airdrop/simulation/genesis.go
	modified:   x/airdrop/simulation/operations.go
	modified:   x/airdrop/types/airdrop.pb.go
	modified:   x/airdrop/types/airdrop_account.go
	modified:   x/airdrop/types/expected_keeper.go
	modified:   x/airdrop/types/msgs.go
	modified:   x/airdrop/types/params.go
	modified:   x/gmp/client/cli/tx.go
	modified:   x/gmp/keeper/keeper.go
	modified:   x/gmp/keeper/keeper_suite_test.go
	modified:   x/gmp/keeper/msg_server_test.go
	modified:   x/gmp/module.go
	modified:   x/gmp/types/abi_decode.go
	modified:   x/gmp/types/abi_encode.go
	modified:   x/gmp/types/expected_keeper.go
	modified:   x/gmp/types/msgs.go
	modified:   x/oracle/README.md
	modified:   x/oracle/abci.go
	modified:   x/oracle/abci_test.go
	modified:   x/oracle/client/tests/suite.go
	modified:   x/oracle/genesis.go
	modified:   x/oracle/genesis_test.go
	modified:   x/oracle/keeper/alias_functions.go
	modified:   x/oracle/keeper/ballot_test.go
	modified:   x/oracle/keeper/genesis.go
	modified:   x/oracle/keeper/genesis_test.go
	modified:   x/oracle/keeper/grpc_query.go
	modified:   x/oracle/keeper/grpc_query_test.go
	modified:   x/oracle/keeper/historic_price.go
	modified:   x/oracle/keeper/historic_price_test.go
	modified:   x/oracle/keeper/keeper.go
	modified:   x/oracle/keeper/keeper_test.go
	modified:   x/oracle/keeper/migrations.go
	modified:   x/oracle/keeper/miss_counter.go
	modified:   x/oracle/keeper/msg_server.go
	modified:   x/oracle/keeper/msg_server_test.go
	modified:   x/oracle/keeper/param_update_plan.go
	modified:   x/oracle/keeper/params.go
	modified:   x/oracle/keeper/params_test.go
	modified:   x/oracle/keeper/reward.go
	modified:   x/oracle/keeper/reward_test.go
	modified:   x/oracle/keeper/slash.go
	modified:   x/oracle/keeper/slash_test.go
	modified:   x/oracle/module.go
	modified:   x/oracle/simulations/genesis.go
	modified:   x/oracle/simulations/operations.go
	modified:   x/oracle/types/asset.go
	modified:   x/oracle/types/ballot.go
	modified:   x/oracle/types/ballot_test.go
	modified:   x/oracle/types/events.pb.go
	modified:   x/oracle/types/expected_keeper.go
	modified:   x/oracle/types/genesis_test.go
	modified:   x/oracle/types/msgs.go
	modified:   x/oracle/types/msgs_test.go
	modified:   x/oracle/types/oracle.pb.go
	modified:   x/oracle/types/params.go
	modified:   x/oracle/types/params_test.go
	modified:   x/oracle/types/price_stamp.go
	modified:   x/oracle/types/reward_band.go
	modified:   x/oracle/types/reward_band_test.go
	modified:   x/oracle/types/tx.pb.go
	modified:   x/oracle/types/utils_test.go
	modified:   x/oracle/types/vote.go
	modified:   x/oracle/types/vote_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   scripts/celestia_devnet.sh
	both modified:   tools/tools.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Comment on lines +844 to +846
for _, key := range app.keys {
keys = append(keys, key)
}

Check warning

Code scanning / CodeQL

Iteration over map Warning

Iteration over map may be a possible source of non-determinism
Comment on lines +881 to +888
for _, m := range app.mm.Modules {
if moduleWithName, ok := m.(module.HasName); ok {
moduleName := moduleWithName.Name()
if appModule, ok := moduleWithName.(appmodule.AppModule); ok {
modules[moduleName] = appModule
}
}
}

Check warning

Code scanning / CodeQL

Iteration over map Warning

Iteration over map may be a possible source of non-determinism
if k.IsPeriodLastBlock(ctx, params.VotePeriod) {
if err := CalcPrices(ctx, params, k); err != nil {
if k.IsPeriodLastBlock(sdkCtx, params.VotePeriod) {
if err := CalcPrices(sdkCtx, params, k); err != nil {

Check warning

Code scanning / CodeQL

Panic in BeginBock or EndBlock consensus methods Warning

path flow from Begin/EndBlock to a panic call
rbajollari and others added 4 commits February 29, 2024 15:21
* project builds

* fix unit tests

* go version in workflows

* some lint issues

* fix sim non determinism

* go version in workflows

* single node fix

* fix rollkit init-local

* init-local works

* try liveness with init-local

* update init_local to work in CI

* script permisions

* remove it option from docker run

* make celestia devnet run in background

* rollup script too

* comment out e2e

* some lint fixes

* use version latest in golangci-lint action

* more lint fixes

* silence lint error on usage of deprecated func

* fix .golangci.yml formatting

* add extra sleep in liveness

* cometbft to v0.38.5

* Update cmd/ojod/cmd/commands.go

Co-authored-by: Adam Wozniak <[email protected]>

* move TODO to top of file

---------

Co-authored-by: Adam Wozniak <[email protected]>
(cherry picked from commit 8649e17)

# Conflicts:
#	go.mod
#	go.sum
#	scripts/celestia_devnet.sh
#	tools/tools.go
@rbajollari rbajollari force-pushed the mergify/bp/main/pr-382 branch from 10ad14b to 73656e5 Compare February 29, 2024 22:23
@rbajollari rbajollari merged commit a155f8d into main Feb 29, 2024
24 of 26 checks passed
@rbajollari rbajollari deleted the mergify/bp/main/pr-382 branch February 29, 2024 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant