Problem: v1.0.x changes are not merged into main

[yihuang]

👮🏻👮🏻👮🏻 !!!! REFERENCE THE PROBLEM YOUR ARE SOLVING IN THE PR TITLE AND DESCRIBE YOUR SOLUTION HERE !!!! DO NOT FORGET !!!! 👮🏻👮🏻👮🏻

PR Checklist:

• Have you read the CONTRIBUTING.md?
• Does your PR follow the C4 patch requirements?
• Have you rebased your work on top of the latest master?
• Have you checked your code compiles? (make)
• Have you included tests for any non-trivial functionality?
• Have you checked your code passes the unit tests? (make test)
• Have you checked your code formatting is correct? (go fmt)
• Have you checked your basic code style is fine? (golangci-lint run)
• If you added any dependencies, have you checked they do not contain any known vulnerabilities? (go list -json -m all | nancy sleuth)
• If your changes affect the client infrastructure, have you run the integration test?
• If your changes affect public APIs, does your PR follow the C4 evolution of public contracts?
• If your code changes public APIs, have you incremented the crate version numbers and documented your changes in the CHANGELOG.md?
• If you are contributing for the first time, please read the agreement in CONTRIBUTING.md now and add a comment to this pull request stating that your PR is in accordance with the Developer's Certificate of Origin.

Thank you for your code, it's appreciated! :)

[codecov]

Codecov Report

Merging #816 (26ed55d) into main (79ebec3) will decrease coverage by 0.37%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main     #816      +/-   ##
==========================================
- Coverage   34.26%   33.89%   -0.37%     
==========================================
  Files          30       30              
  Lines        1582     1599      +17     
==========================================
  Hits          542      542              
- Misses        983     1000      +17     
  Partials       57       57              

Impacted Files	Coverage Δ
app/upgrades.go	0.00% <0.00%> (ø)

[tomtau]

I guess for the next time, it'll be better to first patch on main and then backport to release branches: https://trunkbaseddevelopment.com/branch-for-release/ ?

[yihuang]

I guess for the next time, it'll be better to first patch on main and then backport to release branches: https://trunkbaseddevelopment.com/branch-for-release/ ?

For many changes, they need to be tested on testnet/mainnet first, but main branch is consensus breaking, thus current workflow.

[thomas-nguy]

I guess some changes such as dependencies upgrades and bugfix could be done & tested on main first and then cherrypicked to release branches

for patches specific to release branch, some may not even need to be rebased on main