Chore/fixup release with upstream

[0xFable]

Description and Motivation

Merged up what I could via the normal merge viewer with a preference for incoming changes (new master stuff)
Then manually went through and tried to fixup the areas which had an unrecoverable diff.
Checked most contracts and tests are passing.
Have review most of the incoming stuff has come in and most of the work on v2 branch is still there the main area I have concern about is tokenfactory.rs in white-whale-std package

Related Issues

---

Checklist:

• I have read Migaloo's contribution guidelines.
• My pull request has a sound title and description (not something vague like Update index.md)
• All existing and new tests are passing.
• I updated/added relevant documentation.
• The code is formatted properly cargo fmt --all --.
• Clippy doesn't report any issues cargo clippy -- -D warnings.
• I have regenerated the schemas if needed cargo schema.

[codecov]

Codecov Report

Attention: 471 lines in your changes are missing coverage. Please review.

Comparison is base (dea7605) 94.68% compared to head (a6119a2) 93.20%.
Report is 64 commits behind head on release/v2_contracts.

Files	Patch %	Lines
...quidity_hub/pool-manager/src/tests/mock_querier.rs	0.00%	118 Missing ⚠️
...ontracts/liquidity_hub/pool-manager/src/helpers.rs	60.19%	80 Missing ⚠️
...acts/liquidity_hub/pool-manager/src/tests/suite.rs	77.67%	50 Missing ⚠️
...ntracts/liquidity_hub/pool-manager/src/contract.rs	66.39%	41 Missing ⚠️
...uidity_hub/pool-manager/src/tests/temp_mock_api.rs	0.00%	34 Missing ⚠️
...quidity_hub/pool-manager/src/liquidity/commands.rs	73.21%	30 Missing ⚠️
...ontracts/liquidity_hub/pool-manager/src/queries.rs	70.83%	28 Missing ⚠️
contracts/liquidity_hub/pool-manager/src/state.rs	31.42%	24 Missing ⚠️
...liquidity_hub/pool-manager/src/manager/commands.rs	82.45%	20 Missing ⚠️
...ity_hub/pool-network/terraswap_pair/src/helpers.rs	73.68%	10 Missing ⚠️
... and 11 more

Additional details and impacted files

@@                   Coverage Diff                    @@
##           release/v2_contracts     #262      +/-   ##
========================================================
- Coverage                 94.68%   93.20%   -1.49%     
========================================================
  Files                       240      258      +18     
  Lines                     26854    28713    +1859     
========================================================
+ Hits                      25427    26761    +1334     
- Misses                     1427     1952     +525     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[kerber0x]

Oh i thought i had renamed this to "vanilla" but seems like not :D

[kerber0x]

This EpochV2 thing we need to address soon.