chore: remove beta build flag (#643)

.github/workflows/tests.yml

@@ -123,34 +123,3 @@ jobs:
           sleep 2m
           ./contrib/scripts/test_localnet_liveness.sh 100 5 50 localhost
         if: env.GIT_DIFF
-
-  beta-liveness-test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.17
-      - uses: technote-space/get-diff-action@v6.0.1
-        id: git_diff
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: Install Starport
-        run: |
-          curl https://get.starport.network/starport@v0.19.4! | bash
-        if: env.GIT_DIFF
-      - name: Start Local Beta Network via Starport
-        run: |
-          starport chain serve --reset-once -v -c ./starport.ci.beta.yml > starport.beta.out 2>&1 &
-        env:
-          UMEE_ENABLE_BETA: true
-        if: env.GIT_DIFF
-      - name: Test Local Beta Network Liveness
-        run: |
-          sleep 2m
-          ./contrib/scripts/test_localnet_liveness.sh 100 5 50 localhost
-        if: env.GIT_DIFF

Makefile

@@ -21,10 +21,6 @@ ifeq (,$(VERSION))
   endif
 endif
 
-ifneq (,$(UMEE_ENABLE_BETA))
-	VERSION := $(VERSION)-beta
-endif
-
 ###############################################################################
 ##                                   Build                                   ##
 ###############################################################################
@@ -64,8 +60,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=umee \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
 		  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-			-X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION) \
-			-X github.com/umee-network/umee/cmd/umeed/cmd.EnableBeta=$(UMEE_ENABLE_BETA)
+		  -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION)
 
 ldflags += $(LDFLAGS)
 ldflags := $(strip $(ldflags))
@@ -83,15 +78,6 @@ install: go.sum
 build-linux: go.sum
 	LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build
 
-build-beta: go.sum
-	UMEE_ENABLE_BETA=true $(MAKE) build
-
-install-beta: go.sum
-	UMEE_ENABLE_BETA=true $(MAKE) install
-
-build-linux-beta: go.sum
-	UMEE_ENABLE_BETA=true $(MAKE) build-linux
-
 go-mod-cache: go.sum
 	@echo "--> Download go modules to local cache"
 	@go mod download
@@ -104,7 +90,7 @@ clean:
 	@echo "--> Cleaning..."
 	@rm -rf $(BUILD_DIR)/**  $(DIST_DIR)/**
 
-.PHONY: install build build-linux build-beta install-beta build-linux-beta clean
+.PHONY: install build build-linux clean
 
 ###############################################################################
 ##                                  Docker                                   ##

ante/ante_test.go

@@ -15,20 +15,21 @@ import (
 	"github.com/stretchr/testify/suite"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	umeeappbeta "github.com/umee-network/umee/app/beta"
+
+	umeeapp "github.com/umee-network/umee/app"
 )
 
 type IntegrationTestSuite struct {
 	suite.Suite
-	app         *umeeappbeta.UmeeApp
+	app         *umeeapp.UmeeApp
 	anteHandler sdk.AnteHandler
 	ctx         sdk.Context
 	clientCtx   client.Context
 	txBuilder   client.TxBuilder
 }
 
 func (s *IntegrationTestSuite) SetupTest() {
-	app := umeeappbeta.Setup(s.T(), false, 1)
+	app := umeeapp.Setup(s.T(), false, 1)
 	ctx := app.BaseApp.NewContext(false, tmproto.Header{
 		ChainID: fmt.Sprintf("test-chain-%s", tmrand.Str(4)),
 		Height:  1,

app/app.go

@@ -92,9 +92,17 @@ import (
 	gravitykeeper "github.com/umee-network/Gravity-Bridge/module/x/gravity/keeper"
 	gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types"
 
+	customante "github.com/umee-network/umee/ante"
 	appparams "github.com/umee-network/umee/app/params"
 	uibctransfer "github.com/umee-network/umee/x/ibctransfer"
 	uibctransferkeeper "github.com/umee-network/umee/x/ibctransfer/keeper"
+	"github.com/umee-network/umee/x/leverage"
+	leverageclient "github.com/umee-network/umee/x/leverage/client"
+	leveragekeeper "github.com/umee-network/umee/x/leverage/keeper"
+	leveragetypes "github.com/umee-network/umee/x/leverage/types"
+	"github.com/umee-network/umee/x/oracle"
+	oraclekeeper "github.com/umee-network/umee/x/oracle/keeper"
+	oracletypes "github.com/umee-network/umee/x/oracle/types"
 )
 
 const (
@@ -144,6 +152,8 @@ var (
 		ibctransfer.AppModuleBasic{},
 		vesting.AppModuleBasic{},
 		gravity.AppModuleBasic{},
+		leverage.AppModuleBasic{},
+		oracle.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -156,6 +166,8 @@ var (
 		govtypes.ModuleName:            {authtypes.Burner},
 		ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
 		gravitytypes.ModuleName:        {authtypes.Minter, authtypes.Burner},
+		leveragetypes.ModuleName:       {authtypes.Minter, authtypes.Burner},
+		oracletypes.ModuleName:         nil,
 	}
 )
 
@@ -208,6 +220,8 @@ type UmeeApp struct {
 	FeeGrantKeeper   feegrantkeeper.Keeper
 	AuthzKeeper      authzkeeper.Keeper
 	GravityKeeper    gravitykeeper.Keeper
+	LeverageKeeper   leveragekeeper.Keeper
+	OracleKeeper     oraclekeeper.Keeper
 
 	// make scoped keepers public for testing purposes
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
@@ -247,6 +261,7 @@ func New(
 		govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
 		feegrant.StoreKey, authzkeeper.StoreKey, gravitytypes.StoreKey,
+		leveragetypes.StoreKey, oracletypes.StoreKey,
 	)
 	transientKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -359,6 +374,28 @@ func New(
 		homePath,
 		app.BaseApp,
 	)
+	app.OracleKeeper = oraclekeeper.NewKeeper(
+		appCodec,
+		keys[oracletypes.ModuleName],
+		app.GetSubspace(oracletypes.ModuleName),
+		app.AccountKeeper,
+		app.BankKeeper,
+		app.DistrKeeper,
+		&stakingKeeper,
+		distrtypes.ModuleName,
+	)
+	app.LeverageKeeper = leveragekeeper.NewKeeper(
+		appCodec,
+		keys[leveragetypes.ModuleName],
+		app.GetSubspace(leveragetypes.ModuleName),
+		app.BankKeeper,
+		app.OracleKeeper,
+	)
+	app.LeverageKeeper = *app.LeverageKeeper.SetHooks(
+		leveragetypes.NewMultiHooks(
+			app.OracleKeeper.Hooks(),
+		),
+	)
 
 	baseBankKeeper := app.BankKeeper.(bankkeeper.BaseKeeper)
 	app.GravityKeeper = gravitykeeper.NewKeeper(
@@ -421,14 +458,15 @@ func New(
 		AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
 		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
+		AddRoute(leveragetypes.RouterKey, leverage.NewUpdateRegistryProposalHandler(app.LeverageKeeper)).
 		AddRoute(gravitytypes.RouterKey, gravitykeeper.NewGravityProposalHandler(app.GravityKeeper))
 
 	// Create evidence Keeper so we can register the IBC light client misbehavior
 	// evidence route.
 	evidenceKeeper := evidencekeeper.NewKeeper(
 		appCodec,
 		keys[evidencetypes.StoreKey],
-		&stakingKeeper,
+		&app.StakingKeeper,
 		app.SlashingKeeper,
 	)
 
@@ -450,7 +488,7 @@ func New(
 	app.mm = module.NewManager(
 		genutil.NewAppModule(
 			app.AccountKeeper,
-			&stakingKeeper,
+			app.StakingKeeper,
 			app.BaseApp.DeliverTx,
 			encodingConfig.TxConfig,
 		),
@@ -472,6 +510,8 @@ func New(
 		params.NewAppModule(app.ParamsKeeper),
 		transferModule,
 		gravity.NewAppModule(app.GravityKeeper, app.BankKeeper),
+		leverage.NewAppModule(appCodec, app.LeverageKeeper, app.AccountKeeper, app.BankKeeper),
+		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that there
@@ -498,6 +538,8 @@ func New(
 		evidencetypes.ModuleName,
 		stakingtypes.ModuleName,
 		ibchost.ModuleName,
+		leveragetypes.ModuleName,
+		oracletypes.ModuleName,
 		gravitytypes.ModuleName,
 	)
 
@@ -517,6 +559,8 @@ func New(
 		minttypes.ModuleName,
 		slashingtypes.ModuleName,
 		govtypes.ModuleName,
+		leveragetypes.ModuleName,
+		oracletypes.ModuleName,
 		feegrant.ModuleName,
 		authz.ModuleName,
 		stakingtypes.ModuleName,
@@ -548,6 +592,8 @@ func New(
 		ibctransfertypes.ModuleName,
 		authz.ModuleName,
 		feegrant.ModuleName,
+		oracletypes.ModuleName,
+		leveragetypes.ModuleName,
 		gravitytypes.ModuleName,
 	)
 
@@ -572,6 +618,9 @@ func New(
 		evidence.NewAppModule(app.EvidenceKeeper),
 		ibc.NewAppModule(app.IBCKeeper),
 		transferModule,
+		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper),
+		// TODO: Ensure x/leverage implements simulator and then uncomment.
+		// leverage.NewAppModule(appCodec, app.LeverageKeeper, app.AccountKeeper, app.BankKeeper),
 	)
 
 	app.sm.RegisterStoreDecoders()
@@ -581,13 +630,14 @@ func New(
 	app.MountTransientStores(transientKeys)
 	app.MountMemoryStores(memKeys)
 
-	anteHandler, err := ante.NewAnteHandler(
-		ante.HandlerOptions{
+	anteHandler, err := customante.NewAnteHandler(
+		customante.HandlerOptions{
 			AccountKeeper:   app.AccountKeeper,
 			BankKeeper:      app.BankKeeper,
-			SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
 			FeegrantKeeper:  app.FeeGrantKeeper,
+			OracleKeeper:    app.OracleKeeper,
 			SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
+			SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
 		},
 	)
 	if err != nil {
@@ -792,6 +842,8 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibchost.ModuleName)
 	paramsKeeper.Subspace(gravitytypes.ModuleName)
+	paramsKeeper.Subspace(leveragetypes.ModuleName)
+	paramsKeeper.Subspace(oracletypes.ModuleName)
 
 	return paramsKeeper
 }
@@ -802,6 +854,7 @@ func getGovProposalHandlers() []govclient.ProposalHandler {
 		distrclient.ProposalHandler,
 		upgradeclient.ProposalHandler,
 		upgradeclient.CancelProposalHandler,
+		leverageclient.ProposalHandler,
 	}
 }