Buyback and Burn

.gitmodules

@@ -17,7 +17,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,10 @@ import (
 	airdrop "github.com/Stride-Labs/stride/v24/x/airdrop"
 	airdropkeeper "github.com/Stride-Labs/stride/v24/x/airdrop/keeper"
 	airdroptypes "github.com/Stride-Labs/stride/v24/x/airdrop/types"
+	"github.com/Stride-Labs/stride/v24/x/auction"
+	auctionkeeper "github.com/Stride-Labs/stride/v24/x/auction/keeper"
+	auctiontypes "github.com/Stride-Labs/stride/v24/x/auction/types"
+
 	"github.com/Stride-Labs/stride/v24/x/autopilot"
 	autopilotkeeper "github.com/Stride-Labs/stride/v24/x/autopilot/keeper"
 	autopilottypes "github.com/Stride-Labs/stride/v24/x/autopilot/types"
@@ -146,6 +150,9 @@ import (
 	icaoracle "github.com/Stride-Labs/stride/v24/x/icaoracle"
 	icaoraclekeeper "github.com/Stride-Labs/stride/v24/x/icaoracle/keeper"
 	icaoracletypes "github.com/Stride-Labs/stride/v24/x/icaoracle/types"
+	icqoracle "github.com/Stride-Labs/stride/v24/x/icqoracle"
+	icqoraclekeeper "github.com/Stride-Labs/stride/v24/x/icqoracle/keeper"
+	icqoracletypes "github.com/Stride-Labs/stride/v24/x/icqoracle/types"
 	"github.com/Stride-Labs/stride/v24/x/interchainquery"
 	interchainquerykeeper "github.com/Stride-Labs/stride/v24/x/interchainquery/keeper"
 	interchainquerytypes "github.com/Stride-Labs/stride/v24/x/interchainquery/types"
@@ -236,6 +243,8 @@ var (
 		ibchooks.AppModuleBasic{},
 		ibcwasm.AppModuleBasic{},
 		airdrop.AppModuleBasic{},
+		icqoracle.AppModuleBasic{},
+		auction.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -348,6 +357,8 @@ type StrideApp struct {
 	StaketiaKeeper        staketiakeeper.Keeper
 	StakedymKeeper        stakedymkeeper.Keeper
 	AirdropKeeper         airdropkeeper.Keeper
+	ICQOracleKeeper       icqoraclekeeper.Keeper
+	AuctionKeeper         auctionkeeper.Keeper
 
 	mm           *module.Manager
 	sm           *module.SimulationManager
@@ -404,6 +415,8 @@ func NewStrideApp(
 		ibchookstypes.StoreKey,
 		ibcwasmtypes.StoreKey,
 		airdroptypes.StoreKey,
+		icqoracletypes.StoreKey,
+		auctiontypes.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -757,6 +770,21 @@ func NewStrideApp(
 		app.AccountKeeper, app.BankKeeper, app.DistrKeeper, app.StakingKeeper,
 	)
 
+	app.ICQOracleKeeper = *icqoraclekeeper.NewKeeper(
+		appCodec,
+		keys[icqoracletypes.StoreKey],
+	)
+	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)
+
 	// Register Gov (must be registered after stakeibc)
 	govRouter := govtypesv1beta1.NewRouter()
 	govRouter.AddRoute(govtypes.RouterKey, govtypesv1beta1.ProposalHandler).
@@ -933,6 +961,9 @@ func NewStrideApp(
 		stakeTiaModule,
 		stakeDymModule,
 		airdropModule,
+		stakeTiaModule,
+		icqOracleModule,
+		auctionModule,
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -978,6 +1009,8 @@ func NewStrideApp(
 		ibchookstypes.ModuleName,
 		ibcwasmtypes.ModuleName,
 		airdroptypes.ModuleName,
+		icqoracletypes.ModuleName,
+		auctiontypes.ModuleName,
 	)
 
 	app.mm.SetOrderEndBlockers(
@@ -1019,6 +1052,8 @@ func NewStrideApp(
 		ibchookstypes.ModuleName,
 		ibcwasmtypes.ModuleName,
 		airdroptypes.ModuleName,
+		icqoracletypes.ModuleName,
+		auctiontypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -1065,6 +1100,8 @@ func NewStrideApp(
 		ibchookstypes.ModuleName,
 		ibcwasmtypes.ModuleName,
 		airdroptypes.ModuleName,
+		icqoracletypes.ModuleName,
+		auctiontypes.ModuleName,
 	)
 
 	app.mm.RegisterInvariants(app.CrisisKeeper)

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 \

dockernet/ts-tests/README.md

@@ -2,7 +2,7 @@
 
 ```bash
 # build stride locally and run dokcernet
-(cd ../.. && make sync && make start-docker build=sgr)
+(cd ../.. && make sync && make start-docker build=sgro)
 
 # install deps
 pnpm i
@@ -23,9 +23,11 @@ IMPORTANT: `@cosmjs/*` dependencies must match the versions used by stridejs. To
 ### test new protobufs
 
 - go to https://github.com/Stride-Labs/stridejs
+  - remove `/dist` from `.gitignore`
   - update the config in `scripts/clone_repos.ts` to point to the new `stride/cosmos-sdk/ibc-go` version
   - run `pnpm i`
   - run `pnpm codegen`
+  - run `pnpm build`
   - run `git commit...`
   - run `git push`
   - get the current `stridejs` commit using `git rev-parse HEAD`

dockernet/ts-tests/package.json

@@ -1,10 +1,11 @@
 {
   "name": "stride-integration-tests",
   "version": "1.0.0",
+  "type": "module",
   "description": "integration tests for stride chain",
   "scripts": {
-    "test": "vitest run",
-    "test-watch": "vitest watch"
+    "test": "NODE_OPTIONS=--conditions=node vitest run",
+    "test-watch": "NODE_OPTIONS=--conditions=node vitest watch"
   },
   "keywords": [
     "wow",
@@ -25,7 +26,7 @@
     "bech32": "2.0.0",
     "jest": "29.7.0",
     "prettier": "3.3.3",
-    "stridejs": "github:Stride-Labs/stridejs#e17c404f6451bad95ef0093f2b41244248bd7ebd",
+    "stridejs": "github:Stride-Labs/stridejs#e949e35",
     "typescript": "5.5.3",
     "vitest": "2.0.3"
   },

dockernet/ts-tests/test/main.test.ts

@@ -131,12 +131,13 @@ describe("x/airdrop", () => {
     }
     expect(tx.code).toBe(0);
 
-    const { airdrop } = await stridejs.query.stride.airdrop.airdrop({
-      id: airdropId,
-    });
+    const { id, earlyClaimPenalty } =
+      await stridejs.query.stride.airdrop.airdrop({
+        id: airdropId,
+      });
 
-    expect(airdrop!.id).toBe(airdropId);
-    expect(airdrop!.earlyClaimPenalty).toBe("0.5");
+    expect(id).toBe(airdropId);
+    expect(earlyClaimPenalty).toBe("0.5");
   });
 });
 

dockernet/ts-tests/vitest.config.ts

@@ -0,0 +1,26 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: "node",
+    testTimeout: 30000,
+    hookTimeout: 30000,
+    pool: "forks",
+    poolOptions: {
+      forks: {
+        singleFork: true,
+      },
+    },
+    server: {
+      deps: {
+        inline: ["stridejs"],
+      },
+    },
+  },
+  resolve: {
+    alias: {
+      stridejs: "stridejs/dist/esm", // Force ESM path
+    },
+  },
+});

proto/stride/auction/auction.proto

@@ -0,0 +1,60 @@
+syntax = "proto3";
+package stride.auction;
+
+import "cosmos_proto/cosmos.proto";
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/Stride-Labs/stride/v24/x/auction/types";
+
+enum AuctionType {
+  // Default value - should not be used
+  AUCTION_TYPE_UNSPECIFIED = 0;
+  // First-Come First-Served auction
+  AUCTION_TYPE_FCFS = 1;
+}
+message Params {}
+
+message Auction {
+  // Auction type
+  AuctionType type = 1;
+
+  // A unique auction name
+  string name = 2;
+
+  // Token denom being sold in the auction
+  string selling_denom = 3;
+
+  // Token denom used to place bids
+  string payment_denom = 4;
+
+  // Whether auction is active
+  bool enabled = 5;
+
+  // Minimum price multiplier (e.g. 0.95 for 5% discount off the oracle price)
+  // bids_floor_price = oracle_price * min_price_multiplier
+  string min_price_multiplier = 6 [
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
+    (gogoproto.nullable) = false
+  ];
+
+  // Minimum payment token bid amount
+  string min_bid_amount = 7 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+
+  // Address to send the auction proceeds to
+  string beneficiary = 8 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+
+  // Total amount of payment token received
+  string total_payment_token_received = 9 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+
+  // Total amount of selling token sold
+  string total_selling_token_sold = 10 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+}