fix(x/market): ensure orders closed on deployment close

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

Author: troian

_run/init.sh

@@ -100,6 +100,7 @@ configure_genesis() {
 	done
 	guardian_json+="]"
 
+	# shellcheck disable=SC2002
 	cat "${GENESIS_PATH}.orig" | \
 		jq -M '.app_state.gov.voting_params.voting_period = "60s"' \
 		| jq -M '.app_state.gov.params.voting_period = "60s"' \
@@ -109,8 +110,8 @@ configure_genesis() {
 		| jq -M '.app_state.wasm.params.instantiate_default_permission = "Everybody"' \
 		| jq -M --argjson guardians "$guardian_json" --arg feed_id "$AKT_PRICE_FEED_ID" '
 			.app_state.oracle.params.min_price_sources = 1 |
-			.app_state.oracle.params.max_price_staleness_period = 30 |
-			.app_state.oracle.params.twap_window = 50 |
+			.app_state.oracle.params.max_price_staleness_period = "60s" |
+			.app_state.oracle.params.twap_window = "30s" |
 			.app_state.oracle.params.max_price_deviation_bps = 1000 |
 			.app_state.oracle.params.price_retention = "86400s" |
 			.app_state.oracle.params.prune_epoch = "hour" |
@@ -287,8 +288,8 @@ register_oracle_source() {
 			"params": {
 				"sources": ["$pyth_addr"],
 				"min_price_sources": 1,
-				"max_price_staleness_period": 30,
-				"twap_window": 50,
+				"max_price_staleness_period": "60s",
+				"twap_window": "30s",
 				"max_price_deviation_bps": 1000,
 				"price_retention": "86400s",
 				"prune_epoch": "hour",
@@ -299,7 +300,7 @@ register_oracle_source() {
 			"@type": "/akash.bme.v1.MsgFundVault",
 			"authority": "akash10d07y265gmmuvt4z0w9aw880jnsr700jhe7z0f",
 			"amount": {"denom": "${CHAIN_TOKEN_DENOM}", "amount": "1000000000000"},
-			"source": "$admin_addr"
+			"source": "$(akash keys show main -a)"
 		}
 	],
 	"deposit": "10000000uakt",

_run/node/deployment.yaml

@@ -40,8 +40,8 @@ profiles:
       attributes:
         region: us-west
       pricing:
-        web: 
-          denom: uakt
+        web:
+          denom: uact
           amount: 1000
 
 deployment:
@@ -52,4 +52,4 @@ deployment:
   bew:
     westcoast:
       profile: web
-      count: 1
+      count: 1

go.mod

@@ -48,7 +48,7 @@ require (
 	google.golang.org/grpc v1.76.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.2
-	pkg.akt.dev/go v0.2.5
+	pkg.akt.dev/go v0.2.6
 	pkg.akt.dev/go/cli v0.2.2
 	pkg.akt.dev/go/sdl v0.2.0
 )

go.sum

@@ -3293,8 +3293,8 @@ nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
 nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
 pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
-pkg.akt.dev/go v0.2.5 h1:D/sSVGlQvOSgK4zcPA/r/ug/Wkt10lqMUs2N+xUxOpQ=
-pkg.akt.dev/go v0.2.5/go.mod h1:x9Cku9yibLk4aGLTE/Yy7eEkkda0uOSRWmYwQeFw23o=
+pkg.akt.dev/go v0.2.6 h1:QpZqFNTKu4xNwZcgit6SVJsKNhWkd0IH0Y0Lzgpco9c=
+pkg.akt.dev/go v0.2.6/go.mod h1:x9Cku9yibLk4aGLTE/Yy7eEkkda0uOSRWmYwQeFw23o=
 pkg.akt.dev/go/cli v0.2.2 h1:PWDAAeHkVtcZ9qE76yh4IhJ2J/42ekhwSyrGWLPGi/g=
 pkg.akt.dev/go/cli v0.2.2/go.mod h1:MHm9lU8hb+xQ8BX3b9c9S1pMyZKUob5tVjHXQ4T1uwU=
 pkg.akt.dev/go/sdl v0.2.0 h1:hY74GjN4itV92REf8HqGt1rQDtXsruzE/iIzd/FpUB8=

upgrades/CHANGELOG.md

@@ -40,6 +40,14 @@ Goal of the upgrade here
 Add new upgrades after this line based on the template above
 -----
 
+##### v2.1.0
+
+###### Description
+
+- Migrations
+    - oracle     `1 -> 2`
+    - deployment `7 -> 8`
+
 ##### v2.0.0
 
 ###### Description

upgrades/software/v2.1.0/upgrade.go

@@ -7,13 +7,17 @@ import (
 	"fmt"
 
 	"cosmossdk.io/log"
+	sdkmath "cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	etypes "pkg.akt.dev/go/node/escrow/module"
 	otypes "pkg.akt.dev/go/node/oracle/v2"
+	"pkg.akt.dev/go/sdkutil"
 
 	apptypes "pkg.akt.dev/node/v2/app/types"
 	utypes "pkg.akt.dev/node/v2/upgrades/types"
@@ -81,6 +85,27 @@ func (up *upgrade) UpgradeHandler() upgradetypes.UpgradeHandler {
 			return toVM, err
 		}
 
+		if sctx.ChainID() == "akashnet-2" {
+			feePool, err := up.Keepers.Cosmos.Distr.FeePool.Get(ctx)
+			if err != nil {
+				return toVM, fmt.Errorf("failed to get fee pool: %w", err)
+			}
+
+			// deposit 427,414,453uAKT to escrow as stated in the upgrade proposal
+			escrowDepositAmount := sdk.NewCoin(sdkutil.DenomUakt, sdkmath.NewInt(427414453))
+
+			err = up.Keepers.Cosmos.Bank.SendCoinsFromModuleToModule(ctx, distrtypes.ModuleName, etypes.ModuleName, sdk.Coins{escrowDepositAmount})
+			if err != nil {
+				return toVM, fmt.Errorf("failed to transfer funds to escrow: %w", err)
+			}
+
+			feePool.CommunityPool = feePool.CommunityPool.Sub(sdk.DecCoins{sdk.NewDecCoinFromCoin(escrowDepositAmount)})
+
+			err = up.Keepers.Cosmos.Distr.FeePool.Set(ctx, feePool)
+			if err != nil {
+				return toVM, fmt.Errorf("failed to set updated fee pool balance: %w", err)
+			}
+		}
 		return toVM, err
 	}
 }

x/bme/keeper/keeper.go

@@ -846,7 +846,7 @@ func (k *keeper) RequestBurnMint(ctx context.Context, srcAddr sdk.AccAddress, ds
 // on each block sequence starts from 1
 func (k *keeper) nextLedgerSeq(ctx sdk.Context) (int64, error) {
 	seq, err := k.ledgerSequence.Get(ctx)
-	if err != nil {
+	if err != nil && !errors.Is(err, collections.ErrNotFound) {
 		return 0, err
 	}
 

x/market/keeper/keeper.go

@@ -403,11 +403,10 @@ func (k Keeper) OnGroupClosed(ctx sdk.Context, id dtypes.GroupID, state dvbeta.G
 		return nil
 	}
 
-	var err error
-	k.WithOrdersForGroup(ctx, id, types.OrderActive, func(order types.Order) bool {
-		err = k.OnOrderClosed(ctx, order)
+	orderCb := func(ctx sdk.Context, order types.Order) error {
+		err := k.OnOrderClosed(ctx, order)
 		if err != nil {
-			return true
+			return err
 		}
 
 		k.WithBidsForOrder(ctx, order.ID, types.BidOpen, func(bid types.Bid) bool {
@@ -416,14 +415,31 @@ func (k Keeper) OnGroupClosed(ctx sdk.Context, id dtypes.GroupID, state dvbeta.G
 		})
 
 		if err != nil {
-			return true
+			return err
 		}
 
-		k.WithBidsForOrder(ctx, order.ID, types.BidActive, func(bid types.Bid) bool {
-			err = processClose(ctx, bid)
-			return err != nil
-		})
+		if order.State == types.OrderActive {
+			k.WithBidsForOrder(ctx, order.ID, types.BidActive, func(bid types.Bid) bool {
+				err = processClose(ctx, bid)
+				return err != nil
+			})
+		}
+
+		return err
+	}
+
+	var err error
+
+	k.WithOrdersForGroup(ctx, id, types.OrderActive, func(order types.Order) bool {
+		err = orderCb(ctx, order)
+		return err != nil
+	})
+	if err != nil {
+		return err
+	}
 
+	k.WithOrdersForGroup(ctx, id, types.OrderOpen, func(order types.Order) bool {
+		err = orderCb(ctx, order)
 		return err != nil
 	})