fix(app): remove astaking module from keys

Signed-off-by: Artur Troian <[email protected]>

Author: troian

app/types/app.go

@@ -519,8 +519,8 @@ func kvStoreKeys() []string {
 		ibctransfertypes.StoreKey,
 	}
 
-	keys = append(keys, akashKVStoreKeys()...,
-	)
+	keys = append(keys, akashKVStoreKeys()...)
+
 	return keys
 }
 
@@ -533,7 +533,6 @@ func akashKVStoreKeys() []string {
 		ptypes.StoreKey,
 		atypes.StoreKey,
 		ctypes.StoreKey,
-		astakingtypes.StoreKey,
 	}
 }
 

upgrades/software/v1.0.0/escrow.go

@@ -49,7 +49,7 @@ func (m escrowMigrations) handler(ctx sdk.Context) error {
 		key := append(migrate.AccountV1beta3Prefix(), iter.Key()...)
 
 		nVal := migrate.AccountFromV1beta3(cdc, key, iter.Value())
-		bz := cdc.MustMarshal(&nVal)
+		bz := cdc.MustMarshal(&nVal.State)
 
 		switch nVal.State.State {
 		case etypes.StateOpen:
@@ -84,7 +84,7 @@ func (m escrowMigrations) handler(ctx sdk.Context) error {
 		key := append(migrate.PaymentV1beta3Prefix(), iter.Key()...)
 
 		nVal := migrate.PaymentFromV1beta3(cdc, key, iter.Value())
-		bz := cdc.MustMarshal(&nVal)
+		bz := cdc.MustMarshal(&nVal.State)
 
 		switch nVal.State.State {
 		case etypes.StateOpen:

x/escrow/keeper/key.go

@@ -37,12 +37,12 @@ func writeKey(buf *bytes.Buffer, state etypes.State, id escrowid.ID) {
 		buf.Write(stateToPrefix(state))
 
 		if id != nil {
-			writePrefix(buf, id)
+			writeId(buf, id)
 		}
 	}
 }
 
-func writePrefix(buf *bytes.Buffer, id escrowid.ID) {
+func writeId(buf *bytes.Buffer, id escrowid.ID) {
 	buf.WriteRune('/')
 	buf.WriteString(id.Key())
 }