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

sdk 50 against main #3952

Closed
wants to merge 161 commits into from
Closed

Conversation

faddat
Copy link
Contributor

@faddat faddat commented Jun 23, 2023

This PR is a test run of making changes directly to main instead of a feature branch, as was originally done for this
PR.

@mergify
Copy link
Contributor

mergify bot commented Jun 23, 2023

⚠️ The sha of the head commit of this PR conflicts with #3883. Mergify cannot evaluate rules on this PR. ⚠️

@faddat
Copy link
Contributor Author

faddat commented Jun 23, 2023

@tac0turtle ; @crodriguezvega


Hey guys, I am currently doing the merge for this and I must say that I agree with Marko, it is much better to target main. Currently the merge is just a lot of playing catch-up.

I think that it'll definitely be easier for all parties to work on this if it targets main rather than a feature branch that lags main.

Doing things this way knocked many files out of the diff.

@faddat
Copy link
Contributor Author

faddat commented Jun 23, 2023

@crodriguezvega could you please let us know if you are OK with targeting main instead of a feature branch by closing either this PR or #3883 ?

thanks!

@@ -332,54 +351,71 @@

// SDK module keepers

app.AccountKeeper = authkeeper.NewAccountKeeper(appCodec, keys[authtypes.StoreKey], authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), authtypes.NewModuleAddress(govtypes.ModuleName).String())
// add keepers
app.AccountKeeper = authkeeper.NewAccountKeeper(appCodec, runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, maccPerms, sdk.Bech32MainPrefix, authtypes.NewModuleAddress(govtypes.ModuleName).String())

Check warning

Code scanning / CodeQL

Directly using the bech32 constants Warning test

Directly using the bech32 constants instead of the configuration values
@crodriguezvega
Copy link
Contributor

@crodriguezvega could you please let us know if you are OK with targeting main instead of a feature branch by closing either this PR or #3883 ?

thanks!

Thank you, @faddat. I replied in the other PR.

@faddat
Copy link
Contributor Author

faddat commented Jun 24, 2023

I'm going ot close this one and keep the branch for reference later.

@faddat faddat closed this Jun 24, 2023
@faddat faddat mentioned this pull request Jun 24, 2023
9 tasks
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.

6 participants