Merge master into future/peggy2

.github/workflows/go.yml

@@ -40,6 +40,10 @@ jobs:
       run: sudo add-apt-repository -y ppa:ethereum/ethereum && sudo apt-get update && sudo apt-get install ethereum
     - name: install golangcli-lint
       run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.3
+
+        - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
 
     - name: Build
       run: make install

Makefile

@@ -25,7 +25,7 @@ smart_contract_file=cmd/ebrelayer/contract/generated/artifacts/contracts/BridgeR
 BUILD_TAGS ?= ${IMAGE_TAG}
 BUILD_FLAGS := -ldflags '$(ldflags)' -tags "$(GOTAGS) ${BUILD_TAGS}"
 
-BINARIES=./cmd/sifnoded ./cmd/sifgen ./cmd/ebrelayer
+BINARIES=./cmd/sifnoded ./cmd/sifgen ./cmd/ebrelayer ./cmd/siftest
 
  # You can regenerate proto_files with
 #	find . -name *.proto | sort | grep -v node_mo | grep -v test/integration | xargs echo

app/ante/ante.go

@@ -1,10 +1,12 @@
 package ante
 
 import (
-	clptypes "github.com/Sifchain/sifnode/x/clp/types"
 	"strings"
 
+	adminkeeper "github.com/Sifchain/sifnode/x/admin/keeper"
+	clptypes "github.com/Sifchain/sifnode/x/clp/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	disptypes "github.com/Sifchain/sifnode/x/dispensation/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -24,8 +26,8 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		sigGasConsumer = ante.DefaultSigVerificationGasConsumer
 	}
 	return sdk.ChainAnteDecorators(
-		ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
-		NewAdjustGasPriceDecorator(),    // Custom decorator to adjust gas price for specific msg types
+		ante.NewSetUpContextDecorator(),                 // outermost AnteDecorator. SetUpContext must be called first
+		NewAdjustGasPriceDecorator(options.AdminKeeper), // Custom decorator to adjust gas price for specific msg types
 		ante.NewRejectExtensionOptionsDecorator(),
 		ante.NewMempoolFeeDecorator(),
 		ante.NewValidateBasicDecorator(),
@@ -45,15 +47,19 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 
 // AdjustGasPriceDecorator is a custom decorator to reduce fee prices .
 type AdjustGasPriceDecorator struct {
+	adminKeeper adminkeeper.Keeper
 }
 
 // NewAdjustGasPriceDecorator create a new instance of AdjustGasPriceDecorator
-func NewAdjustGasPriceDecorator() AdjustGasPriceDecorator {
-	return AdjustGasPriceDecorator{}
+func NewAdjustGasPriceDecorator(adminKeeper adminkeeper.Keeper) AdjustGasPriceDecorator {
+	return AdjustGasPriceDecorator{adminKeeper: adminKeeper}
 }
 
 // AnteHandle adjusts the gas price based on the tx type.
 func (r AdjustGasPriceDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
+	adminParams := r.adminKeeper.GetParams(ctx)
+	submitProposalFee := adminParams.SubmitProposalFee
+
 	msgs := tx.GetMsgs()
 	if len(msgs) == 1 && (strings.Contains(strings.ToLower(sdk.MsgTypeURL(msgs[0])), strings.ToLower(disptypes.MsgTypeCreateDistribution)) ||
 		strings.Contains(strings.ToLower(sdk.MsgTypeURL(msgs[0])), strings.ToLower(disptypes.MsgTypeRunDistribution))) {
@@ -80,6 +86,8 @@ func (r AdjustGasPriceDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
 			minFee = sdk.NewInt(100000000000000000) // 0.1
 		} else if strings.Contains(msgTypeURLLower, "transfer") && minFee.LTE(sdk.NewInt(10000000000000000)) {
 			minFee = sdk.NewInt(10000000000000000) // 0.01
+		} else if strings.Contains(msgTypeURLLower, "submitproposal") || strings.Contains(msgTypeURLLower, govtypes.TypeMsgSubmitProposal) {
+			minFee = sdk.NewIntFromBigInt(submitProposalFee.BigInt())
 		}
 	}
 	if minFee.Equal(sdk.ZeroInt()) {

app/ante/ante_test.go

@@ -22,7 +22,7 @@ func TestAdjustGasPriceDecorator_AnteHandle(t *testing.T) {
 	app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams())
 	initTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction)
 	addrs := sifapp.AddTestAddrs(app, ctx, 6, initTokens)
-	decorator := ante.AdjustGasPriceDecorator{}
+	decorator := ante.NewAdjustGasPriceDecorator(app.AdminKeeper)
 	highGasPrice := sdk.DecCoin{
 		Denom:  "rowan",
 		Amount: sdk.MustNewDecFromStr("0.5"),
@@ -76,7 +76,7 @@ func TestAdjustGasPriceDecorator_AnteHandle_MinFee(t *testing.T) {
 	app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams())
 	initTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction)
 	addrs := sifapp.AddTestAddrs(app, ctx, 6, initTokens)
-	decorator := ante.AdjustGasPriceDecorator{}
+	decorator := ante.NewAdjustGasPriceDecorator(app.AdminKeeper)
 	highFee := sdk.NewCoins(sdk.NewCoin("rowan", sdk.NewInt(100000000000000000))) // 0.1
 	lowFee := sdk.NewCoins(sdk.NewCoin("rowan", sdk.NewInt(10000000000000000)))   // 0.01
 

app/ante/handler_options.go

@@ -1,6 +1,7 @@
 package ante
 
 import (
+	adminkeeper "github.com/Sifchain/sifnode/x/admin/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
@@ -13,6 +14,7 @@ import (
 // HandlerOptions defines the list of module keepers required to run the Sifnode
 // AnteHandler decorators.
 type HandlerOptions struct {
+	AdminKeeper     adminkeeper.Keeper
 	AccountKeeper   ante.AccountKeeper
 	BankKeeper      bankkeeper.Keeper
 	FeegrantKeeper  ante.FeegrantKeeper

app/app.go

@@ -623,6 +623,7 @@ func NewSifAppWithBlacklist(
 	app.MountMemoryStores(memKeys)
 	anteHandler, err := sifchainAnte.NewAnteHandler(
 		sifchainAnte.HandlerOptions{
+			AdminKeeper:     app.AdminKeeper,
 			AccountKeeper:   app.AccountKeeper,
 			BankKeeper:      app.BankKeeper,
 			StakingKeeper:   app.StakingKeeper,

app/app_test.go

@@ -71,7 +71,7 @@ func TestAppUpgrade_CannotDeleteLatestVersion(t *testing.T) {
 		encCfg,
 		EmptyAppOptions{},
 		func(app *baseapp.BaseApp) {
-			cms := rootmulti.NewStore(db)
+			cms := rootmulti.NewStore(db, app.Logger())
 			cms.SetPruning(storetypes.PruneDefault)
 			app.SetCMS(cms)
 		},
@@ -156,7 +156,7 @@ func TestAppUpgrade_CannotLoadCorruptStoreUsingLatestHeight(t *testing.T) {
 		encCfg,
 		EmptyAppOptions{},
 		func(app *baseapp.BaseApp) {
-			cms := rootmulti.NewStore(db)
+			cms := rootmulti.NewStore(db, app.Logger())
 			cms.SetPruning(storetypes.PruneDefault)
 			app.SetCMS(cms)
 		},
@@ -190,7 +190,7 @@ func TestAppUpgrade_CannotLoadCorruptStoreUsingLatestHeight(t *testing.T) {
 		encCfg,
 		EmptyAppOptions{},
 		func(app *baseapp.BaseApp) {
-			cms := rootmulti.NewStore(db)
+			cms := rootmulti.NewStore(db, app.Logger())
 			cms.SetPruning(storetypes.PruneDefault)
 			app.SetCMS(cms)
 		},

app/setup_handlers.go

@@ -1,17 +1,23 @@
 package app
 
 import (
+	admintypes "github.com/Sifchain/sifnode/x/admin/types"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	m "github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-const releaseVersion = "1.0-beta.13"
+const releaseVersion = "1.1.0-beta.rc1"
 
 func SetupHandlers(app *SifchainApp) {
 	app.UpgradeKeeper.SetUpgradeHandler(releaseVersion, func(ctx sdk.Context, plan types.Plan, vm m.VersionMap) (m.VersionMap, error) {
 		app.Logger().Info("Running upgrade handler for " + releaseVersion)
+
+		app.AdminKeeper.SetParams(ctx, &admintypes.Params{
+			SubmitProposalFee: sdk.NewUintFromString("5000000000000000000000"),
+		})
+
 		return app.mm.RunMigrations(ctx, app.configurator, vm)
 	})
 

cmd/siftest/main.go

@@ -0,0 +1,146 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/Sifchain/sifnode/app"
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/config"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
+	"github.com/cosmos/cosmos-sdk/server"
+	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+func main() {
+	encodingConfig := app.MakeTestEncodingConfig()
+	initClientCtx := client.Context{}.
+		WithCodec(encodingConfig.Marshaler).
+		WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
+		WithTxConfig(encodingConfig.TxConfig).
+		WithLegacyAmino(encodingConfig.Amino).
+		WithInput(os.Stdin).
+		WithAccountRetriever(authtypes.AccountRetriever{}).
+		WithBroadcastMode(flags.BroadcastBlock).
+		WithHomeDir(app.DefaultNodeHome).
+		WithViper("")
+	app.SetConfig(false)
+
+	rootCmd := &cobra.Command{
+		Use: "siftest",
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags())
+			if err != nil {
+				return err
+			}
+			initClientCtx, err = config.ReadFromClientConfig(initClientCtx)
+			if err != nil {
+				return err
+			}
+			if err := client.SetCmdClientContextHandler(initClientCtx, cmd); err != nil {
+				return err
+			}
+			return server.InterceptConfigsPreRunHandler(cmd, "", nil)
+		},
+		//RunE: run,
+	}
+
+	rootCmd.AddCommand(GetVerifyCmd(), GetTestCmd())
+
+	err := svrcmd.Execute(rootCmd, app.DefaultNodeHome)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func GetTestCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "test",
+		Short: "Run tests",
+		RunE:  runTest,
+	}
+	flags.AddTxFlagsToCmd(cmd)
+	cmd.PersistentFlags().String(flags.FlagChainID, "", "The network chain ID")
+	return cmd
+}
+
+func GetVerifyCmd() *cobra.Command {
+	verifyCmd := &cobra.Command{
+		Use:   "verify",
+		Short: "Verify transaction results",
+	}
+
+	verifyCmd.AddCommand(GetVerifyRemove(), GetVerifyAdd(), GetVerifyOpen(), GetVerifyClose())
+
+	return verifyCmd
+}
+
+/* VerifySwap verifies amounts sent and received from wallet address.
+ */
+func VerifySwap(clientCtx client.Context, key keyring.Info) {
+
+}
+
+func GetVerifyOpen() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "open-position --height --from --collateralAmount --leverage --collateral-asset --borrow-asset",
+		Short: "Verify a margin long position open",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			fmt.Printf("verifying open...\n")
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			collateralAmount := sdk.NewUintFromString(viper.GetString("collateralAmount"))
+			leverageDec, err := sdk.NewDecFromStr(viper.GetString("leverage"))
+			if err != nil {
+				panic(err)
+			}
+
+			err = VerifyOpenLong(clientCtx,
+				viper.GetString("from"),
+				int64(viper.GetUint64("height")),
+				collateralAmount,
+				viper.GetString("collateral-asset"),
+				viper.GetString("borrow-asset"),
+				leverageDec)
+			if err != nil {
+				panic(err)
+			}
+
+			return nil
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	//cmd.Flags().Uint64("height", 0, "height of transaction")
+	cmd.Flags().String("from", "", "address of transactor")
+	cmd.Flags().String("collateralAmount", "0", "collateral provided")
+	cmd.Flags().String("leverage", "0", "leverage")
+	cmd.Flags().String("collateral-asset", "", "collateral asset")
+	cmd.Flags().String("borrow-asset", "", "borrow asset")
+	_ = cmd.MarkFlagRequired("from")
+	_ = cmd.MarkFlagRequired("collateralAmount")
+	_ = cmd.MarkFlagRequired("leverage")
+	_ = cmd.MarkFlagRequired("collateral-asset")
+	_ = cmd.MarkFlagRequired("height")
+	return cmd
+}
+
+func VerifyOpenLong(clientCtx client.Context,
+	from string,
+	height int64,
+	collateralAmount sdk.Uint,
+	collateralAsset,
+	borrowAsset string,
+	leverage sdk.Dec) error {
+
+	return nil
+}