Feature/dev

app/app.go

@@ -2,10 +2,12 @@ package app
 
 import (
 	"fmt"
+	"net/http"
+	"sort"
+
 	icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types"
 	"github.com/gorilla/mux"
 	"github.com/rakyll/statik/fs"
-	"net/http"
 
 	ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts"
 	icahost "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host"
@@ -562,7 +564,7 @@ func New(
 		&app.MarketKeeper,
 	)
 
-	app.EsmKeeper = *esmkeeper.NewKeeper(
+	app.EsmKeeper = esmkeeper.NewKeeper(
 		app.cdc,
 		app.keys[esmtypes.StoreKey],
 		app.keys[esmtypes.StoreKey],
@@ -613,7 +615,7 @@ func New(
 		app.IbcKeeper.ChannelKeeper,
 	)
 
-	app.MarketKeeper = *marketkeeper.NewKeeper(
+	app.MarketKeeper = marketkeeper.NewKeeper(
 		app.cdc,
 		app.keys[markettypes.StoreKey],
 		app.GetSubspace(markettypes.ModuleName),
@@ -622,7 +624,7 @@ func New(
 		&app.BandoracleKeeper,
 	)
 
-	app.LiquidationKeeper = *liquidationkeeper.NewKeeper(
+	app.LiquidationKeeper = liquidationkeeper.NewKeeper(
 		app.cdc,
 		keys[liquidationtypes.StoreKey],
 		keys[liquidationtypes.MemStoreKey],
@@ -637,7 +639,7 @@ func New(
 		&app.LendKeeper,
 	)
 
-	app.AuctionKeeper = *auctionkeeper.NewKeeper(
+	app.AuctionKeeper = auctionkeeper.NewKeeper(
 		app.cdc,
 		keys[auctiontypes.StoreKey],
 		keys[auctiontypes.MemStoreKey],
@@ -654,7 +656,7 @@ func New(
 		&app.LendKeeper,
 	)
 
-	app.CollectorKeeper = *collectorkeeper.NewKeeper(
+	app.CollectorKeeper = collectorkeeper.NewKeeper(
 		app.cdc,
 		app.keys[collectortypes.StoreKey],
 		app.keys[collectortypes.MemStoreKey],
@@ -699,7 +701,7 @@ func New(
 		&app.Rewardskeeper,
 	)
 
-	app.Rewardskeeper = *rewardskeeper.NewKeeper(
+	app.Rewardskeeper = rewardskeeper.NewKeeper(
 		app.cdc,
 		app.keys[rewardstypes.StoreKey],
 		app.keys[rewardstypes.MemStoreKey],
@@ -995,7 +997,13 @@ func (a *App) LoadHeight(height int64) error {
 // ModuleAccountAddrs returns all the app's module account addresses.
 func (a *App) ModuleAccountAddrs() map[string]bool {
 	accounts := make(map[string]bool)
+
+	names := make([]string, 0)
 	for name := range a.ModuleAccountsPermissions() {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
 		accounts[authtypes.NewModuleAddress(name).String()] = true
 	}
 

app/wasm/test/helpers_test.go

@@ -0,0 +1,226 @@
+package wasm
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/comdex-official/comdex/app/wasm/bindings"
+	assetTypes "github.com/comdex-official/comdex/x/asset/types"
+	tokenmintTypes "github.com/comdex-official/comdex/x/tokenmint/types"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/cosmos/cosmos-sdk/simapp"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/tendermint/tendermint/crypto"
+	"github.com/tendermint/tendermint/crypto/ed25519"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+
+	"github.com/comdex-official/comdex/app"
+	"github.com/comdex-official/comdex/x/tokenmint/keeper"
+)
+
+func SetupCustomApp() (*app.App, *sdk.Context) {
+	comdex, ctx := CreateTestInput()
+	return comdex, ctx
+}
+
+func CreateTestInput() (*app.App, *sdk.Context) {
+	comdex := app.Setup(false)
+	ctx := comdex.BaseApp.NewContext(false, tmproto.Header{Height: 1, ChainID: "comdex-1", Time: time.Now().UTC()})
+	return comdex, &ctx
+}
+
+func FundAccount(t *testing.T, ctx sdk.Context, comdex *app.App, acct sdk.AccAddress) {
+	err := simapp.FundAccount(comdex.BankKeeper, ctx, acct, sdk.NewCoins(
+		sdk.NewCoin("ucmdx", sdk.NewInt(10000000000)),
+	))
+	require.NoError(t, err)
+}
+
+// we need to make this deterministic (same every test run), as content might affect gas costs
+func keyPubAddr() (crypto.PrivKey, crypto.PubKey, sdk.AccAddress) {
+	key := ed25519.GenPrivKey()
+	pub := key.PubKey()
+	addr := sdk.AccAddress(pub.Address())
+	return key, pub, addr
+}
+
+func RandomAccountAddress() sdk.AccAddress {
+	_, _, addr := keyPubAddr()
+	return addr
+}
+
+func RandomBech32AccountAddress() string {
+	return RandomAccountAddress().String()
+}
+
+func AddAppAsset(app *app.App, ctx1 sdk.Context) {
+	assetKeeper, ctx := &app.AssetKeeper, &ctx1
+	userAddress := "cosmos1q7q90qsl9g0gl2zz0njxwv2a649yqrtyxtnv3v"
+	genesisSupply := sdk.NewIntFromUint64(9000000)
+	msg1 := assetTypes.AppData{
+		Name:             "cswap",
+		ShortName:        "cswap",
+		MinGovDeposit:    sdk.NewIntFromUint64(10000000),
+		GovTimeInSeconds: 900,
+		GenesisToken: []assetTypes.MintGenesisToken{
+			{
+				3,
+				genesisSupply,
+				true,
+				userAddress,
+			},
+		},
+	}
+	_ = assetKeeper.AddAppRecords(*ctx, msg1)
+
+	msg2 := assetTypes.Asset{Name: "CMDX",
+			Denom:     "ucmdx",
+			Decimals:  1000000,
+			IsOnChain: true}
+	_ = assetKeeper.AddAssetRecords(*ctx, msg2)
+
+	msg3 := assetTypes.Asset{Name: "CMST",
+	Denom:     "ucmst",
+	Decimals:  1000000,
+	IsOnChain: true}
+	_ = assetKeeper.AddAssetRecords(*ctx, msg3)
+
+	msg4 := assetTypes.Asset{Name: "HARBOR",
+	Denom:     "uharbor",
+	Decimals:  1000000,
+	IsOnChain: true}
+	_ = assetKeeper.AddAssetRecords(*ctx, msg4)
+
+}
+
+func AddPair(app *app.App, ctx1 sdk.Context) {
+	AddAppAsset(app, ctx1)
+	assetKeeper, ctx := &app.AssetKeeper, &ctx1
+	for _, tc := range []struct {
+		name                   string
+		pair                   assetTypes.Pair
+		symbol1                string
+		symbol2                string
+		isErrorExpectedForPair bool
+		pairID                 uint64
+	}{
+		{"Add Pair 1: cmdx cmst",
+			assetTypes.Pair{
+				AssetIn:  1,
+				AssetOut: 2,
+			},
+			"ucmdx",
+			"ucmst",
+			false,
+			1,
+		},
+	} {
+		_ = assetKeeper.AddPairsRecords(*ctx, tc.pair)
+	}
+}
+
+func AddCollectorLookuptable(app *app.App, ctx1 sdk.Context) {
+	AddAppAsset(app, ctx1)
+	collectorKeeper, ctx := &app.CollectorKeeper, &ctx1
+	for _, tc := range []struct {
+		name string
+		msg  bindings.MsgSetCollectorLookupTable
+	}{
+		{"Wasm Add MsgSetCollectorLookupTable AppID 1 CollectorAssetID 2",
+			bindings.MsgSetCollectorLookupTable{
+				AppID:            1,
+				CollectorAssetID: 2,
+				SecondaryAssetID: 3,
+				SurplusThreshold: 10000000,
+				DebtThreshold:    5000000,
+				LockerSavingRate: sdk.MustNewDecFromStr("0.1"),
+				LotSize:          2000000,
+				BidFactor:        sdk.MustNewDecFromStr("0.01"),
+				DebtLotSize:      2000000,
+			},
+		},
+	} {
+		_ = collectorKeeper.WasmSetCollectorLookupTable(*ctx, &tc.msg)
+	}
+}
+
+func AddExtendedPairVault(app *app.App, ctx1 sdk.Context) {
+	AddAppAsset(app, ctx1)
+	assetKeeper, ctx := &app.AssetKeeper, &ctx1
+	for _, tc := range []struct {
+		name string
+		msg  bindings.MsgAddExtendedPairsVault
+	}{
+		{"Add Extended Pair Vault : cmdx cmst",
+
+			bindings.MsgAddExtendedPairsVault{
+				AppID:               1,
+				PairID:              1,
+				StabilityFee:        sdk.MustNewDecFromStr("0.01"),
+				ClosingFee:          sdk.MustNewDecFromStr("0"),
+				LiquidationPenalty:  sdk.MustNewDecFromStr("0.12"),
+				DrawDownFee:         sdk.MustNewDecFromStr("0.01"),
+				IsVaultActive:       true,
+				DebtCeiling:         1000000000000,
+				DebtFloor:           1000000,
+				IsStableMintVault:   false,
+				MinCr:               sdk.MustNewDecFromStr("1.5"),
+				PairName:            "CMDX-A",
+				AssetOutOraclePrice: true,
+				AssetOutPrice:       1000000,
+				MinUsdValueLeft:     1000000,
+			},
+		},
+	} {
+		_ = assetKeeper.WasmAddExtendedPairsVaultRecords(*ctx, &tc.msg)
+	}
+}
+
+func WhitelistAppIDLiquidation(app *app.App, ctx1 sdk.Context) {
+	AddAppAsset(app, ctx1)
+	liquidationKeeper, ctx := &app.LiquidationKeeper, &ctx1
+	for _, tc := range []struct {
+		name string
+		msg  bindings.MsgWhitelistAppIDLiquidation
+	}{
+		{"Whitelist AppID Liquidation",
+
+			bindings.MsgWhitelistAppIDLiquidation{
+				AppID: 1,
+			},
+		},
+	} {
+		_ = liquidationKeeper.WasmWhitelistAppIDLiquidation(*ctx, tc.msg.AppID)
+	}
+}
+
+func MsgMintNewTokens(app *app.App, ctx1 sdk.Context) {
+	AddAppAsset(app, ctx1)
+	userAddress := "cosmos1q7q90qsl9g0gl2zz0njxwv2a649yqrtyxtnv3v"
+	tokenmintKeeper, ctx := &app.TokenmintKeeper, &ctx1
+	wctx := sdk.WrapSDKContext(*ctx)
+
+	server := keeper.NewMsgServer(*tokenmintKeeper)
+	for _, tc := range []struct {
+		name          string
+		msg           tokenmintTypes.MsgMintNewTokensRequest
+		expectedError bool
+	}{
+		{
+			"Mint New Tokens : App ID : 1, Asset ID : 3",
+			tokenmintTypes.MsgMintNewTokensRequest{
+				From:    userAddress,
+				AppId:   1,
+				AssetId: 3,
+			},
+			false,
+		},
+	} {
+		_, err := server.MsgMintNewTokens(wctx, &tc.msg)
+		fmt.Println(err)
+	}
+
+}