Fix the superfluid query (backport #5831) (#5832)

* Fix the superfluid query (#5831) * Fix the superfluid query * Changelog (cherry picked from commit 13c8874) * Update check-state-compatibility.yml --------- Co-authored-by: Dev Ojha <[email protected]> Co-authored-by: Niccolo Raspa <[email protected]>
osmosis-labs · Jul 13, 2023 · ca856c1 · ca856c1
1 parent b79fa16
commit ca856c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/check-state-compatibility.yml b/.github/workflows/check-state-compatibility.yml
@@ -110,7 +110,7 @@ jobs:
           cp /mnt/data/genesis/osmosis-1/genesis.json $HOME/.osmosisd/config/genesis.json
       - name: ⏬ Download last pre-epoch snapshot
         run: |
-          REPO_MAJOR_VERSION=v14
+          REPO_MAJOR_VERSION=v16
           SNAPSHOT_INFO_URL=${{ env.SNAPSHOT_BUCKET }}/$REPO_MAJOR_VERSION/snapshots.json
 
           # Get the latest pre-epoch snapshot information from bucket
@@ -133,7 +133,7 @@ jobs:
           CONFIG_FOLDER=$HOME/.osmosisd/config
 
           # Find last epoch block comparing repo version to current chain version
-          REPO_MAJOR_VERSION=14
+          REPO_MAJOR_VERSION=16
 
           if [ $REPO_MAJOR_VERSION == $MAINNET_MAJOR_VERSION ]; then
             # I'm in the latest major, fetch the epoch info from the lcd endpoint

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * [#5532](https://github.com/osmosis-labs/osmosis/pull/5532) fix: Fix x/tokenfactory genesis import denoms reset x/bank existing denom metadata
 
+### BugFix
+
+* [#5831](https://github.com/osmosis-labs/osmosis/pull/5831) Fix superfluid_delegations query
+
 ### Misc Improvements
 
 * [#5534](https://github.com/osmosis-labs/osmosis/pull/5534) fix: fix the account number of x/tokenfactory module account

diff --git a/x/lockup/keeper/synthetic_lock.go b/x/lockup/keeper/synthetic_lock.go
@@ -71,7 +71,9 @@ func (k Keeper) GetAllSyntheticLockupsByAddr(ctx sdk.Context, owner sdk.AccAddre
 		if err != nil {
 			panic(err)
 		}
-		synthLocks = append(synthLocks, synthLock)
+		if synthLock.UnderlyingLockId != 0 {
+			synthLocks = append(synthLocks, synthLock)
+		}
 	}
 	return synthLocks
 }