chore: upgrade sdk with snapshot manager fix (#1700)

* chore: upgrade sdk with snapshot manager fix * changelog * Update branch version * Try fix e2e test Co-authored-by: Dev Ojha <[email protected]> Co-authored-by: Dev Ojha <[email protected]> (cherry picked from commit 9165ac2) # Conflicts: # CHANGELOG.md
osmosis-labs · Jun 7, 2022 · 73c842c · 73c842c
1 parent 7327a04
commit 73c842c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,7 +49,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#1312] Stableswap: Createpool logic 
 * [#1230] Stableswap CFMM equations
 * [#1429] solver for multi-asset CFMM
+<<<<<<< HEAD
 * [#1630](https://github.com/osmosis-labs/osmosis/pull/1630) Delete the v043_temp module, now that we're on an updated SDK version.
+=======
+
+### Bug Fixes
+* [1700](https://github.com/osmosis-labs/osmosis/pull/1700) Upgrade sdk fork with missing snapshot manager fix.
+>>>>>>> 9165ac2 (chore: upgrade sdk with snapshot manager fix (#1700))
 
 ## [v9.0.0 - Nitrogen](https://github.com/osmosis-labs/osmosis/releases/tag/v9.0.0)
 

diff --git a/go.mod b/go.mod
@@ -272,7 +272,7 @@ replace (
 	// branch: v0.27.0.rc3-osmo, current tag: v0.27.0.rc3-osmo
 	github.com/CosmWasm/wasmd => github.com/osmosis-labs/wasmd v0.27.0-rc2.0.20220517191021-59051aa18d58
 	// Our cosmos-sdk branch is:  https://github.com/osmosis-labs/cosmos-sdk v0.45.0x-osmo-v7
-	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20220524162204-830f277f8259
+	github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20220607221533-51108b6dcab2
 	// Use Osmosis fast iavl
 	github.com/cosmos/iavl => github.com/osmosis-labs/iavl v0.17.3-osmo-v7
 	// use cosmos-compatible protobufs

diff --git a/go.sum b/go.sum
@@ -1033,8 +1033,8 @@ github.com/ory/dockertest/v3 v3.9.1 h1:v4dkG+dlu76goxMiTT2j8zV7s4oPPEppKT8K8p2f1
 github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM=
 github.com/osmosis-labs/bech32-ibc v0.3.0-rc1 h1:frHKHEdPfzoK2iMF2GeWKudLLzUXz+6GJcdZ/TMcs2k=
 github.com/osmosis-labs/bech32-ibc v0.3.0-rc1/go.mod h1:X5/FZHMPL+B3ufuVyY2/koxVjd4hIwyTLjYP1DZwppQ=
-github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20220524162204-830f277f8259 h1:myaa05LG9MtkqvE9jErU0qWZPENOwc7kiqmFLeG3cTs=
-github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20220524162204-830f277f8259/go.mod h1:pMiEr6WR7drhXAXK1FOdAKPazWCi7b+WOyWOF4O0OXY=
+github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20220607221533-51108b6dcab2 h1:ixv07gC37fLPBZWLyVcQFcif+f+mqUtScI0jNY9zBpU=
+github.com/osmosis-labs/cosmos-sdk v0.45.1-0.20220607221533-51108b6dcab2/go.mod h1:pMiEr6WR7drhXAXK1FOdAKPazWCi7b+WOyWOF4O0OXY=
 github.com/osmosis-labs/iavl v0.17.3-osmo-v7 h1:6KcADC/WhL7yDmNQxUIJt2XmzNt4FfRmq9gRke45w74=
 github.com/osmosis-labs/iavl v0.17.3-osmo-v7/go.mod h1:lJEOIlsd3sVO0JDyXWIXa9/Ur5FBscP26zJx0KxHjto=
 github.com/osmosis-labs/wasmd v0.27.0-rc2.0.20220517191021-59051aa18d58 h1:15l3Iss2oCGCeJRi2g3CuCnqmEjpAr3Le7cDnoN/LS0=

diff --git a/tests/e2e/chain/config.go b/tests/e2e/chain/config.go
@@ -265,6 +265,9 @@ func updateBankGenesis(bankGenState *banktypes.GenesisState) {
 			},
 		},
 	})
+	if len(bankGenState.SupplyOffsets) == 0 {
+		bankGenState.SupplyOffsets = []banktypes.GenesisSupplyOffset{}
+	}
 }
 
 func updateStakeGenesis(stakeGenState *staketypes.GenesisState) {
-Original file line number
+Diff line change
@@ Expand Up @@
     			},
     		},
     	})
+    	if len(bankGenState.SupplyOffsets) == 0 {
+    		bankGenState.SupplyOffsets = []banktypes.GenesisSupplyOffset{}
+    	}
     }
     func updateStakeGenesis(stakeGenState *staketypes.GenesisState) {
@@ Expand Down @@