Buyback and Burn

.github/workflows/build.yml

@@ -32,7 +32,6 @@ jobs:
 
       - name: Compile stride
         run: make build
-
       - uses: actions/upload-artifact@v4
         with:
           name: strided ${{ matrix.targetos }} ${{ matrix.arch }}

.gitmodules

@@ -13,7 +13,7 @@
 	path = deps/juno
 	url = https://github.com/CosmosContracts/juno.git
 [submodule "deps/osmosis"]
-	# Commit: v20.5.0-no-fees
+	# Commit: v27.0.0-no-fees
 	path = deps/osmosis
 	url = https://github.com/Stride-Labs/osmosis.git
 [submodule "deps/stargaze"]

app/app.go

@@ -129,6 +129,9 @@ import (
 	airdrop "github.com/Stride-Labs/stride/v25/x/airdrop"
 	airdropkeeper "github.com/Stride-Labs/stride/v25/x/airdrop/keeper"
 	airdroptypes "github.com/Stride-Labs/stride/v25/x/airdrop/types"
+	auction "github.com/Stride-Labs/stride/v25/x/auction"
+	auctionkeeper "github.com/Stride-Labs/stride/v25/x/auction/keeper"
+	auctiontypes "github.com/Stride-Labs/stride/v25/x/auction/types"
 	"github.com/Stride-Labs/stride/v25/x/autopilot"
 	autopilotkeeper "github.com/Stride-Labs/stride/v25/x/autopilot/keeper"
 	autopilottypes "github.com/Stride-Labs/stride/v25/x/autopilot/types"
@@ -146,6 +149,9 @@ import (
 	icaoracle "github.com/Stride-Labs/stride/v25/x/icaoracle"
 	icaoraclekeeper "github.com/Stride-Labs/stride/v25/x/icaoracle/keeper"
 	icaoracletypes "github.com/Stride-Labs/stride/v25/x/icaoracle/types"
+	icqoracle "github.com/Stride-Labs/stride/v25/x/icqoracle"
+	icqoraclekeeper "github.com/Stride-Labs/stride/v25/x/icqoracle/keeper"
+	icqoracletypes "github.com/Stride-Labs/stride/v25/x/icqoracle/types"
 	"github.com/Stride-Labs/stride/v25/x/interchainquery"
 	interchainquerykeeper "github.com/Stride-Labs/stride/v25/x/interchainquery/keeper"
 	interchainquerytypes "github.com/Stride-Labs/stride/v25/x/interchainquery/types"
@@ -165,6 +171,9 @@ import (
 	staketia "github.com/Stride-Labs/stride/v25/x/staketia"
 	staketiakeeper "github.com/Stride-Labs/stride/v25/x/staketia/keeper"
 	staketiatypes "github.com/Stride-Labs/stride/v25/x/staketia/types"
+	strdburner "github.com/Stride-Labs/stride/v25/x/strdburner"
+	strdburnerkeeper "github.com/Stride-Labs/stride/v25/x/strdburner/keeper"
+	strdburnertypes "github.com/Stride-Labs/stride/v25/x/strdburner/types"
 )
 
 const (
@@ -236,6 +245,9 @@ var (
 		ibchooks.AppModuleBasic{},
 		ibcwasm.AppModuleBasic{},
 		airdrop.AppModuleBasic{},
+		icqoracle.AppModuleBasic{},
+		auction.AppModuleBasic{},
+		strdburner.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -260,6 +272,10 @@ var (
 		stakedymtypes.ModuleName:                      {authtypes.Minter, authtypes.Burner},
 		stakedymtypes.FeeAddress:                      nil,
 		wasmtypes.ModuleName:                          {authtypes.Burner},
+		icqoracletypes.ModuleName:                     nil,
+		auctiontypes.ModuleName:                       nil,
+		// strdburner module needs burn access to burn STRD tokens that are sent to it
+		strdburnertypes.ModuleName: {authtypes.Burner},
 	}
 )
 
@@ -348,6 +364,9 @@ type StrideApp struct {
 	StaketiaKeeper        staketiakeeper.Keeper
 	StakedymKeeper        stakedymkeeper.Keeper
 	AirdropKeeper         airdropkeeper.Keeper
+	ICQOracleKeeper       icqoraclekeeper.Keeper
+	AuctionKeeper         auctionkeeper.Keeper
+	StrdBurnerKeeper      strdburnerkeeper.Keeper
 
 	mm           *module.Manager
 	sm           *module.SimulationManager
@@ -404,6 +423,9 @@ func NewStrideApp(
 		ibchookstypes.StoreKey,
 		ibcwasmtypes.StoreKey,
 		airdroptypes.StoreKey,
+		icqoracletypes.StoreKey,
+		auctiontypes.StoreKey,
+		strdburnertypes.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -759,6 +781,31 @@ func NewStrideApp(
 		app.AccountKeeper, app.BankKeeper, app.DistrKeeper, app.StakingKeeper,
 	)
 
+	app.ICQOracleKeeper = *icqoraclekeeper.NewKeeper(
+		appCodec,
+		keys[icqoracletypes.StoreKey],
+		&app.InterchainqueryKeeper,
+		app.TransferKeeper,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+	icqOracleModule := icqoracle.NewAppModule(appCodec, app.ICQOracleKeeper)
+
+	app.AuctionKeeper = *auctionkeeper.NewKeeper(
+		appCodec,
+		keys[auctiontypes.StoreKey],
+		app.AccountKeeper,
+		app.BankKeeper,
+		app.ICQOracleKeeper,
+	)
+	auctionModule := auction.NewAppModule(appCodec, app.AuctionKeeper)
+
+	app.StrdBurnerKeeper = *strdburnerkeeper.NewKeeper(
+		appCodec,
+		keys[strdburnertypes.StoreKey],
+		app.BankKeeper,
+	)
+	strdburnerModule := strdburner.NewAppModule(appCodec, app.StrdBurnerKeeper)
+
 	// Register Gov (must be registered after stakeibc)
 	govRouter := govtypesv1beta1.NewRouter()
 	govRouter.AddRoute(govtypes.RouterKey, govtypesv1beta1.ProposalHandler).
@@ -780,6 +827,10 @@ func NewStrideApp(
 	if err != nil {
 		return nil
 	}
+	err = app.InterchainqueryKeeper.SetCallbackHandler(icqoracletypes.ModuleName, app.ICQOracleKeeper.ICQCallbackHandler())
+	if err != nil {
+		return nil
+	}
 
 	app.EpochsKeeper = *epochsKeeper.SetHooks(
 		epochsmoduletypes.NewMultiEpochHooks(
@@ -935,6 +986,10 @@ func NewStrideApp(
 		stakeTiaModule,
 		stakeDymModule,
 		airdropModule,
+		stakeTiaModule,
+		icqOracleModule,
+		auctionModule,
+		strdburnerModule,
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -980,6 +1035,9 @@ func NewStrideApp(
 		ibchookstypes.ModuleName,
 		ibcwasmtypes.ModuleName,
 		airdroptypes.ModuleName,
+		icqoracletypes.ModuleName,
+		auctiontypes.ModuleName,
+		strdburnertypes.ModuleName,
 	)
 
 	app.mm.SetOrderEndBlockers(
@@ -1021,6 +1079,9 @@ func NewStrideApp(
 		ibchookstypes.ModuleName,
 		ibcwasmtypes.ModuleName,
 		airdroptypes.ModuleName,
+		icqoracletypes.ModuleName,
+		auctiontypes.ModuleName,
+		strdburnertypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -1067,6 +1128,9 @@ func NewStrideApp(
 		ibchookstypes.ModuleName,
 		ibcwasmtypes.ModuleName,
 		airdroptypes.ModuleName,
+		icqoracletypes.ModuleName,
+		auctiontypes.ModuleName,
+		strdburnertypes.ModuleName,
 	)
 
 	app.mm.RegisterInvariants(app.CrisisKeeper)

app/upgrades.go

@@ -35,6 +35,7 @@ import (
 	v23 "github.com/Stride-Labs/stride/v25/app/upgrades/v23"
 	v24 "github.com/Stride-Labs/stride/v25/app/upgrades/v24"
 	v25 "github.com/Stride-Labs/stride/v25/app/upgrades/v25"
+	v26 "github.com/Stride-Labs/stride/v25/app/upgrades/v26"
 	v3 "github.com/Stride-Labs/stride/v25/app/upgrades/v3"
 	v4 "github.com/Stride-Labs/stride/v25/app/upgrades/v4"
 	v5 "github.com/Stride-Labs/stride/v25/app/upgrades/v5"
@@ -43,14 +44,17 @@ import (
 	v8 "github.com/Stride-Labs/stride/v25/app/upgrades/v8"
 	v9 "github.com/Stride-Labs/stride/v25/app/upgrades/v9"
 	airdroptypes "github.com/Stride-Labs/stride/v25/x/airdrop/types"
+	auctiontypes "github.com/Stride-Labs/stride/v25/x/auction/types"
 	autopilottypes "github.com/Stride-Labs/stride/v25/x/autopilot/types"
 	claimtypes "github.com/Stride-Labs/stride/v25/x/claim/types"
 	icacallbacktypes "github.com/Stride-Labs/stride/v25/x/icacallbacks/types"
 	icaoracletypes "github.com/Stride-Labs/stride/v25/x/icaoracle/types"
+	icqoracletypes "github.com/Stride-Labs/stride/v25/x/icqoracle/types"
 	recordtypes "github.com/Stride-Labs/stride/v25/x/records/types"
 	stakedymtypes "github.com/Stride-Labs/stride/v25/x/stakedym/types"
 	stakeibctypes "github.com/Stride-Labs/stride/v25/x/stakeibc/types"
 	staketiatypes "github.com/Stride-Labs/stride/v25/x/staketia/types"
+	strdburnertypes "github.com/Stride-Labs/stride/v25/x/strdburner/types"
 )
 
 func (app *StrideApp) setupUpgradeHandlers(appOpts servertypes.AppOptions) {
@@ -338,6 +342,16 @@ func (app *StrideApp) setupUpgradeHandlers(appOpts servertypes.AppOptions) {
 		),
 	)
 
+	// v26 upgrade handler
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v26.UpgradeName,
+		v26.CreateUpgradeHandler(
+			app.mm,
+			app.configurator,
+			app.ICQOracleKeeper,
+		),
+	)
+
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(fmt.Errorf("Failed to read upgrade info from disk: %w", err))
@@ -399,6 +413,10 @@ func (app *StrideApp) setupUpgradeHandlers(appOpts servertypes.AppOptions) {
 		storeUpgrades = &storetypes.StoreUpgrades{
 			Added: []string{ibcwasmtypes.ModuleName, airdroptypes.ModuleName},
 		}
+	case "v26":
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{icqoracletypes.ModuleName, strdburnertypes.ModuleName, auctiontypes.ModuleName},
+		}
 	}
 
 	if storeUpgrades != nil {

app/upgrades/v26/upgrades.go

@@ -0,0 +1,41 @@
+package v26
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	icqoraclekeeper "github.com/Stride-Labs/stride/v25/x/icqoracle/keeper"
+	icqoracletypes "github.com/Stride-Labs/stride/v25/x/icqoracle/types"
+)
+
+var (
+	UpgradeName = "v26"
+
+	OsmosisChainId      = "osmosis-1"
+	OsmosisConnectionId = "connection-2"
+
+	ICQOracleUpdateIntervalSec         = uint64(5 * 60)  // 5 min
+	ICQOraclePriceExpirationTimeoutSec = uint64(15 * 60) // 15 min
+)
+
+// CreateUpgradeHandler creates an SDK upgrade handler for v23
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	icqoracleKeeper icqoraclekeeper.Keeper,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("Starting upgrade v26...")
+
+		icqoracleKeeper.SetParams(ctx, icqoracletypes.Params{
+			OsmosisChainId:            OsmosisChainId,
+			OsmosisConnectionId:       OsmosisConnectionId,
+			UpdateIntervalSec:         ICQOracleUpdateIntervalSec,
+			PriceExpirationTimeoutSec: ICQOraclePriceExpirationTimeoutSec,
+		})
+
+		ctx.Logger().Info("Running module migrations...")
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

app/upgrades/v26/upgrades_test.go

@@ -0,0 +1,34 @@
+package v26_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+
+	"github.com/Stride-Labs/stride/v25/app/apptesting"
+	v26 "github.com/Stride-Labs/stride/v25/app/upgrades/v26"
+)
+
+type UpgradeTestSuite struct {
+	apptesting.AppTestHelper
+}
+
+func (s *UpgradeTestSuite) SetupTest() {
+	s.Setup()
+}
+
+func TestKeeperTestSuite(t *testing.T) {
+	suite.Run(t, new(UpgradeTestSuite))
+}
+
+func (s *UpgradeTestSuite) TestUpgrade() {
+	upgradeHeight := int64(4)
+
+	s.ConfirmUpgradeSucceededs(v26.UpgradeName, upgradeHeight)
+
+	params := s.App.ICQOracleKeeper.GetParams(s.Ctx)
+	s.Require().Equal(v26.OsmosisChainId, params.OsmosisChainId, "Osmosis chain ID")
+	s.Require().Equal(v26.OsmosisConnectionId, params.OsmosisConnectionId, "Osmosis connection ID")
+	s.Require().Equal(v26.ICQOracleUpdateIntervalSec, params.UpdateIntervalSec, "Update interval")
+	s.Require().Equal(v26.ICQOraclePriceExpirationTimeoutSec, params.PriceExpirationTimeoutSec, "Timeout")
+}

dockernet/config.sh

@@ -512,7 +512,7 @@ GET_VAL_ADDR() {
   val_index=$2
 
   MAIN_CMD=$(GET_VAR_VALUE ${chain}_MAIN_CMD)
-  $MAIN_CMD q staking validators | grep ${chain}_${val_index} -A 6 | grep operator | awk '{print $2}'
+  $MAIN_CMD q staking validators 2>&1 | grep ${chain}_${val_index} -A 6 | grep operator | awk '{print $2}'
 }
 
 GET_ICA_ADDR() {

dockernet/dockerfiles/Dockerfile.osmo

@@ -1,10 +1,10 @@
-FROM golang:1.20-alpine3.16 AS builder
+FROM golang:1.23-alpine3.21 AS builder
 
 WORKDIR /opt/
 
 RUN set -eux; apk add --no-cache ca-certificates build-base; apk add git linux-headers
 
-ENV COMMIT_HASH=v20.5.0-no-fees
+ENV COMMIT_HASH=v27.0.0-no-fees
 
 RUN git clone https://github.com/Stride-Labs/osmosis.git \
     && cd osmosis \
@@ -13,16 +13,16 @@ RUN git clone https://github.com/Stride-Labs/osmosis.git \
 WORKDIR /opt/osmosis
 
 # Cosmwasm - download correct libwasmvm version and verify checksum
-# Note: checksum not available for v1.2.3, otherwise command should be
-#  wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt
-#  && sha256sum /lib/libwasmvm_muslc.a | grep $(cat /tmp/checksums.txt | grep $(uname -m) | cut -d ' ' -f 1)
-RUN WASMVM_VERSION=v1.2.3 \
-    && wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$(uname -m).a \
-    -O /lib/libwasmvm_muslc.a 
+RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm/v2 | sed 's/.* //') && \
+    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$ARCH.a \
+    -O /lib/libwasmvm_muslc.$ARCH.a && \
+    # verify checksum
+    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
+    sha256sum /lib/libwasmvm_muslc.$ARCH.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1) 
 
 RUN BUILD_TAGS=muslc LINK_STATICALLY=true make build
 
-FROM alpine:3.16
+FROM alpine:3.21
 COPY --from=builder /opt/osmosis/build/osmosisd /usr/local/bin/
 RUN apk add bash vim \
     && addgroup -g 1000 osmosis \