Fixes for non-default staking token

[zmanian]

Fixes two issues discovered when using an alternative bond token denomination other than stake

• Invariant checker uses default denom
• collect-gentx uses default denom when computing supply.

---

For Admin Use:

• Added appropriate labels to PR (ex. wip, ready-for-review, docs)
• Reviewers Assigned
• Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

[jackzampolin]

LGTM 👍

[njmurarka]

Sorry to bring this up, but is this resolved?

I noticed that when I ran the gentx command, the denom value in the generated file referred to "stake" instead of the non-default staking token foo that I was using when I manually edited config/genesis.json earlier and replaced bond_denom (right after I ran init).

So it appears that I could run the gentx command and end up with a "broken" setup, due to different names for staking tokens.

[alexanderbez]

Yes, this is resolved.

When you execute gentx, it doesn't infer any bond denomination for you. The only case when it infers the default denomination is when you completely omit the self-delegation amount -- which you should not do.

	defaultAmount = defaultTokens.String() + sdk.DefaultBondDenom

Now if you specified an amount AND it still used sdk.DefaultBondDenom, that's a different problem then.

[njmurarka]

Got it. Thanks. I think this related to something I asked in another thread, so much appreciated for this. I was able to resolve the matter with this information.