refactor(x/bme): add max retries

troian · troian · commit d57ada5bb199 · 2026-04-14T09:51:46.000-05:00
Signed-off-by: Artur Troian &lt;troian@users.noreply.github.com&gt;
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -215,3 +215,11 @@ release:
   prerelease: auto
   mode: replace
   draft: false
+
+changelog:
+  use: github
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
diff --git a/_run/node/price-feeder.sh b/_run/node/price-feeder.sh
@@ -10,10 +10,10 @@
 set -euo pipefail
 
 # Configuration
-AKASH_CHAIN_ID="${AKASH_CHAIN_ID:=testnet-8}"
-AKASH_NODE="${AKASH_NODE:=https://testnetrpc.akashnet.net:443}"
+AKASH_CHAIN_ID="${AKASH_CHAIN_ID:=local}"
+#AKASH_NODE="${AKASH_NODE:=https://testnetrpc.akashnet.net:443}"
 AKASH_KEYRING_BACKEND="${AKASH_KEYRING_BACKEND:=test}"
-AKASH_FROM="${AKASH_FROM:=price-feeder}"
+AKASH_FROM="${AKASH_FROM:=hermes}"
 UPDATE_INTERVAL=10  # seconds between updates
 
 # Pyth configuration
@@ -77,7 +77,7 @@ check_balance() {
 	local balance
 
 	address=$(akash keys show "$AKASH_FROM" -a )
-	balance=$(akash query bank balances "$address" -o json 2>/dev/null | jq -r '.balances[] | select(.denom=="uakt") | .amount // "0"')
+	balance=$(akash query bank balances "$address" -o json 2>/dev/null | jq -r '.balances[] | select(.denom=="akt") | .amount // "0"')
 
 	if [ -z "$balance" ] || [ "$balance" -lt 100000 ]; then
 		log "WARN" "Low balance: ${balance:-0}uakt (recommend >100000uakt for gas)"
@@ -143,6 +143,7 @@ submit_price_to_oracle() {
 		--gas-adjustment 1.5 \
 		--gas-prices 0.025uakt \
 		--yes \
+		--from="${AKASH_FROM}" \
 		-o json 2>&1)
 
 	local exit_code=$?
diff --git a/_run/node/prop.json b/_run/node/prop.json
@@ -5,15 +5,17 @@
             "authority": "akash10d07y265gmmuvt4z0w9aw880jnsr700jhe7z0f",
             "params": {
                 "sources": [
-                    "akash1xcfl5u6g2yprvpr4q8j2pp5h6l5ys3nuf529qa"
+                    "akash1kwngmq9s7mfs6x7aes5t0jcm5yvmd7367jm3ke"
                 ],
                 "min_price_sources": 1,
-                "max_price_staleness_period": "30",
-                "twap_window": "50",
-                "max_price_deviation_bps": "150",
+                "max_price_staleness_period": "60s",
+                "twap_window": "30s",
+                "max_price_deviation_bps": "1000",
+                "feed_contracts_params": [],
                 "price_retention": "86400s",
                 "prune_epoch": "hour",
-                "max_prune_per_epoch": "1000"
+                "max_prune_per_epoch": "1000",
+                "max_future_time_drift": "10s"
             }
         }
     ],
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module pkg.akt.dev/node/v2
 
-go 1.25.5
+go 1.25.9
 
 require (
 	cosmossdk.io/api v0.9.2
@@ -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.6
+	pkg.akt.dev/go v0.2.9
 	pkg.akt.dev/go/cli v0.2.2
 	pkg.akt.dev/go/sdl v0.2.0
 )
diff --git a/go.sum b/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.6 h1:QpZqFNTKu4xNwZcgit6SVJsKNhWkd0IH0Y0Lzgpco9c=
-pkg.akt.dev/go v0.2.6/go.mod h1:x9Cku9yibLk4aGLTE/Yy7eEkkda0uOSRWmYwQeFw23o=
+pkg.akt.dev/go v0.2.9 h1:2oU971PeW/f9UY2pBL4tmFTrsk4CvSroGlTQ38uKQjY=
+pkg.akt.dev/go v0.2.9/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=
diff --git a/make/releasing.mk b/make/releasing.mk
@@ -60,79 +60,53 @@ install: wasmvm-libs
 image-minikube:
 	eval $$(minikube docker-env) && docker-image
 
-.PHONY: test-bins
-test-bins: wasmvm-libs build-contracts
+GORELEASER_ARGS := --clean
+
+ifeq (,$(findstring release,$(BUILDOPTS)))
+	GORELEASER_ARGS += --skip=publish,validate --snapshot
+endif
+
+ifneq (,$(findstring verbose,$(BUILDOPTS)))
+	GORELEASER_ARGS += --verbose
+endif
+
+.PHONY: goreleaser
+goreleaser: wasmvm-libs build-contracts
 	docker run \
 		--rm \
 		-e MOD="$(GOMOD)" \
 		-e STABLE=$(IS_STABLE) \
 		-e BUILD_TAGS="$(GORELEASER_TAGS)" \
 		-e BUILD_LDFLAGS="$(GORELEASER_LDFLAGS)" \
+		-e GITHUB_TOKEN="$(GITHUB_TOKEN)" \
+		-e GORELEASER_CURRENT_TAG="$(RELEASE_TAG)" \
 		-e DOCKER_IMAGE=$(RELEASE_DOCKER_IMAGE) \
-		-e GOPATH=/go \
 		-e GOTOOLCHAIN="$(GOTOOLCHAIN)" \
 		-e GOWORK="$(GORELEASER_GOWORK)" \
+		-e GOPATH=/go \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v $(GOPATH):/go \
 		-v $(AKASH_ROOT):/go/src/$(GORELEASER_MOD_MOUNT) \
 		-w /go/src/$(GORELEASER_MOD_MOUNT) \
 		$(GORELEASER_IMAGE) \
-		-f .goreleaser-test-bins.yaml \
-		--verbose=$(GORELEASER_VERBOSE) \
-		--clean \
-		--skip=publish,validate \
-		--snapshot
+		-f "$(GORELEASER_CONFIG)" \
+		release \
+		$(GORELEASER_ARGS)
+
+.PHONY: test-bins
+test-bins: GORELEASER_CONFIG=.goreleaser-test-bins.yaml
+test-bins: goreleaser
 
 .PHONY: docker-image
-docker-image: wasmvm-libs build-contracts
-	docker run \
-		--rm \
-		-e MOD="$(GOMOD)" \
-		-e STABLE=$(IS_STABLE) \
-		-e BUILD_TAGS="$(GORELEASER_TAGS)" \
-		-e BUILD_LDFLAGS="$(GORELEASER_LDFLAGS)" \
-		-e DOCKER_IMAGE=$(RELEASE_DOCKER_IMAGE) \
-		-e GOPATH=/go \
-		-e GOTOOLCHAIN="$(GOTOOLCHAIN)" \
-		-e GOWORK="$(GORELEASER_GOWORK)" \
-		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v $(GOPATH):/go \
-		-v $(AKASH_ROOT):/go/src/$(GORELEASER_MOD_MOUNT) \
-		-w /go/src/$(GORELEASER_MOD_MOUNT) \
-		$(GORELEASER_IMAGE) \
-		-f .goreleaser-docker.yaml \
-		--verbose=$(GORELEASER_VERBOSE) \
-		--clean \
-		--skip=publish,validate \
-		--snapshot
+docker-image: GORELEASER_CONFIG=.goreleaser-docker.yaml
+docker-image: goreleaser
 
 .PHONY: gen-changelog
 gen-changelog: $(GIT_CHGLOG)
 	@echo "generating changelog to .cache/changelog"
 	./script/genchangelog.sh "$(RELEASE_TAG)" .cache/changelog.md
 
 .PHONY: release
-release: wasmvm-libs build-contracts gen-changelog
-	docker run \
-		--rm \
-		-e MOD="$(GOMOD)" \
-		-e STABLE=$(IS_STABLE) \
-		-e BUILD_TAGS="$(GORELEASER_TAGS)" \
-		-e BUILD_LDFLAGS="$(GORELEASER_LDFLAGS)" \
-		-e GITHUB_TOKEN="$(GITHUB_TOKEN)" \
-		-e GORELEASER_CURRENT_TAG="$(RELEASE_TAG)" \
-		-e DOCKER_IMAGE=$(RELEASE_DOCKER_IMAGE) \
-		-e GOTOOLCHAIN="$(GOTOOLCHAIN)" \
-		-e GOWORK="$(GORELEASER_GOWORK)" \
-		-e GOPATH=/go \
-		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v $(GOPATH):/go \
-		-v $(AKASH_ROOT):/go/src/$(GORELEASER_MOD_MOUNT) \
-		-w /go/src/$(GORELEASER_MOD_MOUNT) \
-		$(GORELEASER_IMAGE) \
-		-f "$(GORELEASER_CONFIG)" \
-		release \
-		$(GORELEASER_SKIP) \
-		--verbose=$(GORELEASER_VERBOSE) \
-		--clean \
-		--release-notes=/go/src/$(GORELEASER_MOD_MOUNT)/.cache/changelog.md
+release: GORELEASER_CONFIG=.goreleaser.yaml
+release: GORELEASER_ARGS:=$(GORELEASER_ARGS) --release-notes=.cache/changelog.md
+release: gen-changelog goreleaser
diff --git a/upgrades/software/v2.1.0/upgrade.go b/upgrades/software/v2.1.0/upgrade.go
@@ -107,6 +107,19 @@ func (up *upgrade) UpgradeHandler() upgradetypes.UpgradeHandler {
 			}
 		}
 
+		bparams, err := up.Keepers.Akash.Bme.GetParams(sctx)
+		if err != nil {
+			return toVM, fmt.Errorf("failed to get bme params: %w", err)
+		}
+
+		if bparams.MaxPendingAttempts == 0 {
+			bparams.MaxPendingAttempts = 3
+			err = up.Keepers.Akash.Bme.SetParams(sctx, bparams)
+			if err != nil {
+				return toVM, fmt.Errorf("failed to set bme params: %w", err)
+			}
+		}
+
 		return toVM, err
 	}
 }
diff --git a/x/bme/keeper/abci.go b/x/bme/keeper/abci.go
@@ -11,7 +11,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	types "pkg.akt.dev/go/node/bme/v1"
-	otypes "pkg.akt.dev/go/node/oracle/v2"
 	"pkg.akt.dev/go/sdkutil"
 )
 
@@ -57,18 +56,50 @@ func (k *keeper) EndBlocker(ctx context.Context) error {
 			return false, err
 		}
 
-		// Use CacheContext so that a partial failure (e.g. MintCoins succeeds
+		// Use CacheContext so that a partial failure (e.g., MintCoins succeeds
 		// but SendCoinsFromModuleToAccount fails) does not leave a corrupted
 		// state. Only commit on success; on error the pending record stays
 		// unmodified and will be retried next block.
 		cacheCtx, writeCache := sctx.CacheContext()
 		err = k.executeBurnMint(cacheCtx, params, id, ownerAddr, dstAddr, value.CoinsToBurn, value.DenomToMint)
 		if err == nil {
 			writeCache()
+			processed++
+			return processed >= int64(params.MaxEndblockerRecords), nil
+		}
+
+		// Error path: classify and handle
+		if isFatalBurnMintError(err) {
+			// Fatal error: cancel immediately with specific reason
+			cancelCtx, writeCancel := sctx.CacheContext()
+			reason := errorToCancelReason(err)
+			if cancelErr := k.cancelBurnMint(cancelCtx, id, ownerAddr, dstAddr, value.CoinsToBurn, value.DenomToMint, reason); cancelErr != nil {
+				sctx.Logger().Error("failed to cancel burn/mint record", "id", id, "reason", reason, "err", cancelErr)
+				return false, cancelErr
+			}
+			writeCancel()
+		} else {
+			// Retriable error: increment attempts
+			value.Attempts++
+			if value.Attempts >= params.MaxPendingAttempts {
+				// Max attempts exceeded: cancel
+				cancelCtx, writeCancel := sctx.CacheContext()
+				if cancelErr := k.cancelBurnMint(cancelCtx, id, ownerAddr, dstAddr, value.CoinsToBurn, value.DenomToMint, types.BMCancelReasonMaxAttempts); cancelErr != nil {
+					sctx.Logger().Error("failed to cancel burn/mint record after max attempts", "id", id, "attempts", value.Attempts, "err", cancelErr)
+					return false, cancelErr
+				}
+				writeCancel()
+			} else {
+				// Still has attempts: update pending record in-place
+				if updErr := k.ledgerPending.Set(sctx, id, value); updErr != nil {
+					sctx.Logger().Error("failed to update pending record attempts", "id", id, "err", updErr)
+					return false, updErr
+				}
+			}
 		}
 
 		processed++
-		return processed >= int64(params.MaxEndblockerRecords), err
+		return processed >= int64(params.MaxEndblockerRecords), nil
 	}
 
 	iteratePending := func(p []byte, postCondition func() error) error {
@@ -94,10 +125,7 @@ func (k *keeper) EndBlocker(ctx context.Context) error {
 
 			stop, err = executeMint(id, val)
 			if err != nil {
-				sctx.Logger().Error("processing ledger pending records ", "id", id, "err", err)
-				if errors.Is(err, otypes.ErrPriceStalled) {
-					return err
-				}
+				sctx.Logger().Error("processing ledger pending records", "id", id, "err", err)
 			}
 		}
 
diff --git a/x/bme/keeper/burn_mint_test.go b/x/bme/keeper/burn_mint_test.go
diff --git a/x/bme/keeper/keeper.go b/x/bme/keeper/keeper.go

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,19 @@ func (up *upgrade) UpgradeHandler() upgradetypes.UpgradeHandler {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ bparams, err := up.Keepers.Akash.Bme.GetParams(sctx)`
	`111`	`+ if err != nil {`
	`112`	`+ return toVM, fmt.Errorf("failed to get bme params: %w", err)`
	`113`	`+ }`
	`114`	`+`
	`115`	`+ if bparams.MaxPendingAttempts == 0 {`
	`116`	`+ bparams.MaxPendingAttempts = 3`
	`117`	`+ err = up.Keepers.Akash.Bme.SetParams(sctx, bparams)`
	`118`	`+ if err != nil {`
	`119`	`+ return toVM, fmt.Errorf("failed to set bme params: %w", err)`
	`120`	`+ }`
	`121`	`+ }`
	`122`	`+`
`110`	`123`	`return toVM, err`
`111`	`124`	`}`
`112`	`125`	`}`