fix merge conflicts

.github/workflows/changelog.yml

@@ -63,6 +63,21 @@ jobs:
         if: ${{ steps.push.outcome == 'failure' }}
         run: |
           echo "Push failed. The token might be expired or have insufficient permissions. Please check your token."
+          echo "The token can be found in the 'dev-stride' account. To view the token, login to 'dev-stride' and go to:"
+          echo "  -> Profile"
+          echo "  -> Settings"
+          echo "  -> Developer Settings"
+          echo "  -> Personal Access Tokens"
+          echo "  -> Tokens (classic)"
+          echo "  -> 'GH Actions' Token"
+          echo ""
+          echo "If the token is expired, you can click on the token and then select 'Regenerate Token'"
+          echo "After regenerating a new token, you'll have to update the 'GH_ACTIONS_PAT' environment variable:"
+          echo "   -> Navigate to the stride repo"
+          echo "   -> Settings"
+          echo "   -> Secrets and variables"
+          echo "   -> Actions"
+          echo "   -> Then modify 'GH_ACTIONS_PAT'"
           exit 1
 
       - name: Fetch New Branch
@@ -80,6 +95,6 @@ jobs:
           "title":"${{ env.NEW_MAJOR_VERSION }} Changelog",
           "head":"${{ env.branch_name }}",
           "base":"main",
-          "body":"This is an automatically generated pull request.\n\nPlease review and merge the changes. **Remember to split the On-Chain vs Off-Chain commits!**\n\n## Context\n\nUpdated changelog for ${{ env.NEW_MAJOR_VERSION }} release\n\n## Brief Changelog\n\n* Updated main changelog with on-chain and off-chain changes\n* Updated upgrade-specific changelog with on-chain changes only\n",
+          "body":"This is an automatically generated pull request.\n\nPlease review and merge the changes.\n\n## Context\n\nUpdated changelog for ${{ env.NEW_MAJOR_VERSION }} release\n\n## Brief Changelog\n\n* Updated main changelog with on-chain and off-chain changes\n",
           "maintainer_can_modify": true
           }'

.github/workflows/version.yml

@@ -53,6 +53,21 @@ jobs:
         if: ${{ steps.push.outcome == 'failure' }}
         run: |
           echo "Push failed. The token might be expired or have insufficient permissions. Please check your token."
+          echo "The token can be found in the 'dev-stride' account. To view the token, login to 'dev-stride' and go to:"
+          echo "  -> Profile"
+          echo "  -> Settings"
+          echo "  -> Developer Settings"
+          echo "  -> Personal Access Tokens"
+          echo "  -> Tokens (classic)"
+          echo "  -> 'GH Actions' Token"
+          echo ""
+          echo "If the token is expired, you can click on the token and then select 'Regenerate Token'"
+          echo "After regenerating a new token, you'll have to update the 'GH_ACTIONS_PAT' environment variable:"
+          echo "   -> Navigate to the stride repo"
+          echo "   -> Settings"
+          echo "   -> Secrets and variables"
+          echo "   -> Actions"
+          echo "   -> Then modify 'GH_ACTIONS_PAT'"
           exit 1
 
       - name: Fetch New Branch

.gitmodules

@@ -2,12 +2,15 @@
 	# Commit: v1.5.1
 	path = deps/hermes
 	url = https://github.com/informalsystems/ibc-rs.git
+# TODO [LSM]: Revert to cosmos relayer once they've merged 
+# the fix for the unbonding time query
 [submodule "deps/relayer"]
-	# Commit: e95dd80608536c31d37354bdd7f7ec46a2172009
+	# Branch: sam/lsm-poc
+	# Commit: 0136134766142f133f263f3bba72d7077e7bc2c1
 	path = deps/relayer
-	url = https://github.com/cosmos/relayer.git
+	url = https://github.com/Stride-Labs/relayer.git
 [submodule "deps/gaia"]
-	# Commit: v9.1.0
+	# Commit: v12.0.0-rc0
 	path = deps/gaia
 	url = https://github.com/cosmos/gaia.git
 [submodule "deps/juno"]
@@ -26,6 +29,15 @@
 	# Commit: ec337e0357ae6b6727ad9092ac0ce3667df91319
 	path = deps/evmos
 	url = https://github.com/evmos/evmos
+[submodule "deps/dydx"]
+	# TODO [DYDX]: Switch to official dydxprotocol release after ICA PR is merged
+	# Commit: fafd3a9e2083180d7f7809f5080897e714e52bec
+	path = deps/dydx
+	url = https://github.com/Stride-Labs/v4-chain.git
+[submodule "deps/noble"]
+	# Commit: v3.1.0
+	path = deps/noble
+	url = https://github.com/strangelove-ventures/noble.git
 # bats
 [submodule "dockernet/tests/bats/bats-core"]
 	path = dockernet/tests/bats/bats-core

CHANGELOG.md

@@ -41,7 +41,60 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 <!-- GH ACTIONS TEMPLATE - INSERT NEW VERSION HERE -->
-### Changelog
+
+## [v16.0.0](https://github.com/Stride-Labs/stride/releases/tag/v16.0.0) - 2023-10-14
+
+### On-Chain changes
+1. Inflation Fix ([#951](https://github.com/Stride-Labs/stride/pull/951))
+2. v16 Import Paths ([#952](https://github.com/Stride-Labs/stride/pull/952))
+
+## [v15.0.0](https://github.com/Stride-Labs/stride/releases/tag/v15.0.0) - 2023-09-18
+
+### On-Chain changes
+1. Added ICAOracle route implementations for legacy Msg type ([#923](https://github.com/Stride-Labs/stride/pull/923))
+2. increased precision error buffer on delegator shares callback ([#933](https://github.com/Stride-Labs/stride/pull/933))
+3. Use detokenization amount from tx response ([#934](https://github.com/Stride-Labs/stride/pull/934))
+4. add inner bounds ([#938](https://github.com/Stride-Labs/stride/pull/938))
+5. added cap on undelegate messages ([#940](https://github.com/Stride-Labs/stride/pull/940))
+6. add rounding calibration function ([#936](https://github.com/Stride-Labs/stride/pull/936))
+7. Undel host function ([#935](https://github.com/Stride-Labs/stride/pull/935))
+8. v15 upgrade handler ([#941](https://github.com/Stride-Labs/stride/pull/941))
+9. v15 Import Paths ([#944](https://github.com/Stride-Labs/stride/pull/944))
+
+### Off-Chain changes
+1. Fixed bug in import path CI ([#919](https://github.com/Stride-Labs/stride/pull/919))
+2. Finished auto changelog script ([#928](https://github.com/Stride-Labs/stride/pull/928))
+3. updated osmo submodule ([#931](https://github.com/Stride-Labs/stride/pull/931))
+
+
+## [v14.0.0](https://github.com/Stride-Labs/stride/releases/tag/v14.0.0) - 2023-08-27
+
+### On-Chain changes
+1. Add LSM support ([#708](https://github.com/Stride-Labs/stride/pull/708))
+2. Added oracle transfer channel to icaoracle MsgInstantiateOracle and register aminos ([#899](https://github.com/Stride-Labs/stride/pull/899))
+3. Init airdrops for Umee, Somm, Comdex, Injective ([#903](https://github.com/Stride-Labs/stride/pull/903))
+4. Migrate vesting accounts ([#903](https://github.com/Stride-Labs/stride/pull/903))
+5. Add Evmos' x/vesting module ([#903](https://github.com/Stride-Labs/stride/pull/903))
+
+### Off-Chain changes
+1. Add ICA Oracle License ([#901](https://github.com/Stride-Labs/stride/pull/901))
+
+
+## [v13.0.0](https://github.com/Stride-Labs/stride/releases/tag/v13.0.0) - 2023-08-08
+
+### On-Chain changes
+1. Adds ICA-Based Oracle for Cosmwasm-based Chains ([#884](https://github.com/Stride-Labs/stride/pull/884))
+2. Switch to SDK Fork to address SDKv0.47 Distribution Bug ([#885](https://github.com/Stride-Labs/stride/pull/885))
+3. Add Redundant IBC Relay Decorator ([#882](https://github.com/Stride-Labs/stride/pull/882))
+4. Whitelist missing param keys and register stTokens as consumer fees ([#881](https://github.com/Stride-Labs/stride/pull/881)) 
+5. Add v13 Upgrade Handler ([#886](https://github.com/Stride-Labs/stride/pull/886)) 
+6. Change paths to point towards v13 ([#891](https://github.com/Stride-Labs/stride/pull/888))
+7. Removed consumer param store updates ([#892](https://github.com/Stride-Labs/stride/pull/892))
+
+### Off-Chain changes
+1. Add `build-linux` command ([#859](https://github.com/Stride-Labs/stride/pull/859))
+2. Remove `provider` dependency for Dockernet ([#860](https://github.com/Stride-Labs/stride/pull/860))
+3. Update Dockernet host zone versions ([#883](https://github.com/Stride-Labs/stride/pull/883))
 
 ## [v12.0.0](https://github.com/Stride-Labs/stride/releases/tag/v12.0.0) - 2023-07-15
 

Makefile

@@ -138,7 +138,7 @@ submit-upgrade-immediately:
 	UPGRADE_HEIGHT=150 bash $(DOCKERNET_HOME)/upgrades/submit_upgrade.sh
 
 submit-upgrade-after-tests:
-	UPGRADE_HEIGHT=400 bash $(DOCKERNET_HOME)/upgrades/submit_upgrade.sh
+	UPGRADE_HEIGHT=700 bash $(DOCKERNET_HOME)/upgrades/submit_upgrade.sh
 
 start-upgrade-integration-tests:
 	PART=1 bash $(DOCKERNET_HOME)/tests/run_tests_upgrade.sh
@@ -164,14 +164,14 @@ stop-local-to-main:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-containerProtoVer=0.13.0
+containerProtoVer=0.14.0
 containerProtoImage=ghcr.io/cosmos/proto-builder:$(containerProtoVer)
 
 proto-all: proto-format proto-lint proto-gen
 
 proto-gen:
 	@echo "Generating Protobuf files"
-	@$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
+	@$(DOCKER) run --user $(id -u):$(id -g) --rm -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
 		sh ./scripts/protocgen.sh; 
 
 proto-format:

README.md

@@ -40,7 +40,7 @@ You can optionally pass build arguments to specify which binary to rebuild
 3. `j` This will re-build the Juno binary
 4. `o` This will re-build the Osmo binary
 5. `t` This will re-build the Stargaze binary
-6. `t` This will re-build the Evmos binary
+6. `e` This will re-build the Evmos binary
 7. `r` This will re-build the Go Relayer binary
 8. `h` This will re-build the Hermes binary