#51 free liquidity -- Draft PR

app.go

@@ -343,7 +343,7 @@ func NewApp(
 	app.lpKeeper = liquidityprovider.NewKeeper(app.accountKeeper, app.bankKeeper)
 	app.issuerKeeper = issuer.NewKeeper(app.appCodec, keys[issuer.StoreKey], app.lpKeeper, app.inflationKeeper)
 	app.authorityKeeper = authority.NewKeeper(app.appCodec, keys[authority.StoreKey], app.issuerKeeper, app.bankKeeper, app)
-	app.marketKeeper = market.NewKeeper(app.appCodec, keys[market.StoreKey], keys[market.StoreKeyIdx], app.accountKeeper, app.bankKeeper)
+	app.marketKeeper = market.NewKeeper(app.appCodec, keys[market.StoreKey], keys[market.StoreKeyIdx], app.accountKeeper, app.bankKeeper, app.GetSubspace(market.ModuleName))
 	app.buybackKeeper = buyback.NewKeeper(app.appCodec, keys[buyback.StoreKey], app.marketKeeper, app.accountKeeper, app.stakingKeeper, app.bankKeeper)
 	app.bep3Keeper = bep3.NewKeeper(app.appCodec, keys[bep3.StoreKey], app.bankKeeper, app.accountKeeper, app.paramsKeeper.Subspace(bep3.ModuleName), GetMaccs())
 
@@ -623,6 +623,7 @@ func initParamsKeeper(appCodec codec.BinaryMarshaler, legacyAmino *codec.LegacyA
 	paramsKeeper.Subspace(distrtypes.ModuleName)
 	paramsKeeper.Subspace(emslashing.ModuleName)
 	paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable())
+	paramsKeeper.Subspace(market.ModuleName)
 	paramsKeeper.Subspace(crisistypes.ModuleName)
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibchost.ModuleName)

app_test.go

@@ -2,11 +2,24 @@ package emoney
 
 import (
 	"encoding/json"
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	"github.com/cosmos/cosmos-sdk/client"
+	clienttx "github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/cosmos/cosmos-sdk/crypto/hd"
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/tx/signing"
+	authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
+	authsign "github.com/cosmos/cosmos-sdk/x/auth/signing"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/e-money/em-ledger/x/authority"
+	"github.com/e-money/em-ledger/x/market/types"
 	"github.com/tendermint/tendermint/libs/rand"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+
 	"os"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
@@ -15,6 +28,196 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 )
 
+func setupMarketApp(t *testing.T, options ...func(*baseapp.BaseApp)) (sdk.Context, *EMoneyApp, EncodingConfig) {
+	t.Helper()
+
+	encCfg := MakeEncodingConfig()
+
+	db := dbm.NewMemDB()
+
+	app := NewApp(
+		log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true,
+		map[int64]bool{}, t.TempDir(), 0, encCfg, EmptyAppOptions{}, options...,
+	)
+	require.NotNil(t, app)
+
+	ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{ChainID: "test-market-chain"})
+	ctx = ctx.WithBlockTime(time.Now())
+
+	app.marketKeeper.InitParamsStore(ctx)
+
+	return ctx, app, encCfg
+}
+
+func coins(s string) sdk.Coins {
+	coins, err := sdk.ParseCoinsNormalized(s)
+	if err != nil {
+		panic(err)
+	}
+	return coins
+}
+
+func TestAppLimitOrder_0_Full_Err_Gas(t *testing.T) {
+	// Gas cost expended before entering the market module.
+	const gasStartingCost = 55914
+
+	ctx, app, enc := setupMarketApp(t,  []func(*baseapp.BaseApp){}...)
+	require.NotNil(t, app)
+
+	genesisState := ModuleBasics.DefaultGenesis(enc.Marshaler)
+	authorityState := authority.NewGenesisState(
+		rand.Bytes(sdk.AddrLen), nil,
+	)
+	genesisState[authority.ModuleName] = enc.Marshaler.MustMarshalJSON(&authorityState)
+
+	keystore1, acct1 := getNewAcctInfo(t)
+	keystore2, acct2 := getNewAcctInfo(t)
+
+	bal1 := coins("100000chf,1000000ngm")
+	bal2 := coins("100000eur,1000000ngm")
+	supply := coins("100000chf,100000eur,2000000ngm")
+
+	bankState := banktypes.NewGenesisState(
+		banktypes.DefaultParams(),
+		[]banktypes.Balance{
+			{acct1.GetAddress().String(), bal1},
+			{acct2.GetAddress().String(), bal2},
+		},
+		supply,
+		[]banktypes.Metadata{},
+	)
+	genesisState[banktypes.ModuleName] = enc.Marshaler.MustMarshalJSON(bankState)
+
+	stateBytes, err := json.MarshalIndent(genesisState, "", "  ")
+	require.NoError(t, err)
+
+	app.bankKeeper.SetSupply(ctx, banktypes.NewSupply(supply))
+
+	// Initialize the chain
+	app.InitChain(
+		abci.RequestInitChain{
+			Validators:    []abci.ValidatorUpdate{},
+			AppStateBytes: stateBytes,
+		},
+	)
+
+	total := app.bankKeeper.GetSupply(ctx)
+	require.NotNil(t, total)
+
+	app.accountKeeper.SetAccount(
+		ctx, app.accountKeeper.NewAccountWithAddress(ctx, acct1.GetAddress()),
+	)
+	app.accountKeeper.SetAccount(
+		ctx, app.accountKeeper.NewAccountWithAddress(ctx, acct2.GetAddress()),
+	)
+
+	//
+	// Liquid 0 Gas Cost
+	//
+	msg := &types.MsgAddLimitOrder{
+		TimeInForce:   types.TimeInForce_GoodTillCancel,
+		Owner:         acct1.GetAddress().String(),
+		Source:        sdk.NewCoin("chf", sdk.NewInt(50000)),
+		Destination:   sdk.NewCoin("eur", sdk.NewInt(50000)),
+		ClientOrderId: "testAddLimitOrder-chf-eur1",
+	}
+
+	tx := getSignedTrx(ctx, t, app.accountKeeper, enc, msg, keystore1, acct1, 0, 0)
+
+	gasInfo, _, err := app.Deliver(enc.TxConfig.TxEncoder(), tx)
+	require.NoError(t, err)
+	t.Log(gasInfo.GasUsed)
+	require.Equal(t, gasInfo.GasUsed, sdk.Gas(gasStartingCost))
+
+	//
+	// Destination denomination xxx does not exist and errs
+	//
+	msg2 := &types.MsgAddLimitOrder{
+		TimeInForce:   types.TimeInForce_GoodTillCancel,
+		Owner:         acct1.GetAddress().String(),
+		Source:        sdk.NewCoin("chf", sdk.NewInt(50000)),
+		Destination:   sdk.NewCoin("xxx", sdk.NewInt(50000)),
+		ClientOrderId: "testAddLimitOrder-chf-eur2",
+	}
+
+	tx = getSignedTrx(ctx, t, app.accountKeeper, enc, msg2, keystore1, acct1, 0, 1)
+
+	gasInfo, _, err = app.Deliver(enc.TxConfig.TxEncoder(), tx)
+	require.Error(t, err)
+	t.Log(gasInfo.GasUsed)
+	require.Less(t, sdk.Gas(gasStartingCost), gasInfo.GasUsed)
+
+	msg3 := &types.MsgAddLimitOrder{
+		TimeInForce:   types.TimeInForce_GoodTillCancel,
+		Owner:         acct2.GetAddress().String(),
+		Source:        sdk.NewCoin("eur", sdk.NewInt(50000)),
+		Destination:   sdk.NewCoin("chf", sdk.NewInt(50000)),
+		ClientOrderId: "testAddLimitOrder-eur-chf",
+	}
+
+	ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter())
+	tx = getSignedTrx(ctx, t, app.accountKeeper, enc, msg3, keystore2, acct2, 0, 0)
+
+	gasInfo, _, err = app.Deliver(enc.TxConfig.TxEncoder(), tx)
+	require.NoError(t, err)
+	t.Log(gasInfo.GasUsed)
+	require.Less(t, sdk.Gas(gasStartingCost), gasInfo.GasUsed)
+}
+
+func getSignedTrx(
+	ctx sdk.Context,
+	t *testing.T, ak types.AccountKeeper, enc EncodingConfig,
+	msg *types.MsgAddLimitOrder,
+	keystore keyring.Keyring, acct keyring.Info,
+	accountNumber, sequence uint64,
+) authsign.Tx {
+	acci := ak.GetAccount(ctx, acct.GetAddress())
+	require.Equal(t, acci.GetAddress().String(), acct.GetAddress().String())
+
+	txBuilder := enc.TxConfig.NewTxBuilder()
+	txBuilder.SetMsgs(msg)
+	txBuilder.SetFeeAmount(coins("25000ngm"))
+	txBuilder.SetGasLimit(213456)
+	txBuilder.SetMemo("TestMarketOrder")
+
+	txFactory := clienttx.Factory{}.
+		WithChainID("").
+		WithTxConfig(enc.TxConfig).
+		WithSignMode(signing.SignMode_SIGN_MODE_DIRECT).
+		WithAccountNumber(accountNumber).
+		WithSequence(sequence).
+		WithKeybase(keystore)
+
+	tx := txBuilder.GetTx()
+	signers := tx.GetSigners()
+	require.Equal(t, signers[0].String(), acct.GetAddress().String())
+
+	err := authclient.SignTx(
+		txFactory, client.Context{}, acct.GetName(),
+		txBuilder, true, true,
+	)
+	require.NoError(t, err)
+
+	_, err = enc.TxConfig.TxEncoder()(txBuilder.GetTx())
+	require.NoError(t, err)
+
+	return tx
+}
+
+func getNewAcctInfo(t *testing.T) (keyring.Keyring, keyring.Info) {
+	keystore, err := keyring.New(t.Name()+"1", keyring.BackendMemory, "", nil)
+	require.NoError(t, err)
+
+	uid := "theKeyName"
+
+	info, _, err := keystore.NewMnemonic(
+		uid, keyring.English, sdk.FullFundraiserPath, hd.Secp256k1,
+	)
+	require.NoError(t, err)
+
+	return keystore, info
+}
+
 func TestSimAppExportAndBlockedAddrs(t *testing.T) {
 	encCfg := MakeEncodingConfig()
 	db := dbm.NewMemDB()

docs/client/em/market/v1/query.swagger.json

@@ -147,6 +147,11 @@
         "created": {
           "type": "string",
           "format": "date-time"
+        },
+        "orig_order_created": {
+          "type": "string",
+          "format": "date-time",
+          "description": "applicable to CancelReplace orders: the creation timestamp of the original\norder."
         }
       }
     },

docs/proto/em/proto-docs.md

@@ -120,6 +120,7 @@
     - [MsgCancelReplaceLimitOrderResponse](#em.market.v1.MsgCancelReplaceLimitOrderResponse)
     - [MsgCancelReplaceMarketOrder](#em.market.v1.MsgCancelReplaceMarketOrder)
     - [MsgCancelReplaceMarketOrderResponse](#em.market.v1.MsgCancelReplaceMarketOrderResponse)
+    - [TxParams](#em.market.v1.TxParams)
 
     - [Msg](#em.market.v1.Msg)
 
@@ -1424,6 +1425,23 @@
 
 
 
+
+<a name="em.market.v1.TxParams"></a>
+
+### TxParams
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `trx_fee` | [uint64](#uint64) |  | default fee for a market transaction. |
+| `liquid_trx_fee` | [uint64](#uint64) |  | Valid liquidity adding orders are free or adjusted to a minimum nominal/fee |
+| `liquidity_rebate_minutes_span` | [int64](#int64) |  | Minutes interval for eligible replacing transactions to receive a rebate. For a rebate to apply, the replacing transaction should occur these minutes after the signer's original trx. |
+
+
+
+
+
  <!-- end messages -->
 
  <!-- end enums -->

proto/em/market/v1/tx.proto

@@ -20,6 +20,21 @@ service Msg {
       returns (MsgCancelReplaceMarketOrderResponse);
 }
 
+message TxParams {
+  // default fee for a market transaction.
+  uint64 trx_fee = 1 [(gogoproto.moretags) = "yaml:\"trx_fee\""];
+
+  // Valid liquidity adding orders are free or adjusted to a minimum nominal/fee
+  uint64 liquid_trx_fee = 2 [(gogoproto.moretags) = "yaml:\"liquid_trx_fee\""];
+
+  // Minutes interval for eligible replacing transactions to receive a rebate.
+  // For a rebate to apply, the replacing transaction should occur these minutes
+  // after the signer's original trx.
+  int64 liquidity_rebate_minutes_span = 3 [
+    (gogoproto.moretags) = "yaml:\"liquidity_rebate_minutes_span\""
+  ];
+}
+
 message MsgAddLimitOrder {
   string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
 

x/buyback/abci_test.go

@@ -13,6 +13,7 @@ import (
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
+	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	embank "github.com/e-money/em-ledger/hooks/bank"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	"strings"
@@ -208,7 +209,13 @@ func generateMarketActivity(ctx sdk.Context, marketKeeper *market.Keeper, ak ban
 func order(account authtypes.AccountI, src, dst string) types.Order {
 	s, _ := sdk.ParseCoinNormalized(src)
 	d, _ := sdk.ParseCoinNormalized(dst)
-	o, err := types.NewOrder(time.Now(), types.TimeInForce_GoodTillCancel, s, d, account.GetAddress(), tmrand.Str(10))
+	o, err := types.NewOrder(
+		time.Now(),
+		types.TimeInForce_GoodTillCancel,
+		s, d,
+		account.GetAddress(),
+		tmrand.Str(10),
+	)
 	if err != nil {
 		panic(err)
 	}
@@ -230,15 +237,15 @@ func createTestComponents(t *testing.T) (sdk.Context, keeper.Keeper, *market.Kee
 	encConfig := MakeTestEncodingConfig()
 
 	var (
-		keyMarket  = sdk.NewKVStoreKey(types.ModuleName)
+		keyMarket  = sdk.NewKVStoreKey(types.StoreKey)
 		keyIndices = sdk.NewKVStoreKey(types.StoreKeyIdx)
 		authCapKey = sdk.NewKVStoreKey("authCapKey")
 		keyParams  = sdk.NewKVStoreKey("params")
 		stakingKey = sdk.NewKVStoreKey("staking")
 		buybackKey = sdk.NewKVStoreKey("buyback")
 		bankKey    = sdk.NewKVStoreKey(banktypes.ModuleName)
 
-		tkeyParams = sdk.NewTransientStoreKey("transient_params")
+		tkeyParams = sdk.NewTransientStoreKey(paramstypes.TStoreKey)
 
 		blockedAddr = make(map[string]bool)
 		maccPerms   = map[string][]string{
@@ -248,12 +255,14 @@ func createTestComponents(t *testing.T) (sdk.Context, keeper.Keeper, *market.Kee
 
 	db := dbm.NewMemDB()
 	ms := store.NewCommitMultiStore(db)
+	ms.MountStoreWithDB(keyParams, sdk.StoreTypeIAVL, db)
 	ms.MountStoreWithDB(authCapKey, sdk.StoreTypeIAVL, db)
 	ms.MountStoreWithDB(stakingKey, sdk.StoreTypeIAVL, db)
 	ms.MountStoreWithDB(keyMarket, sdk.StoreTypeIAVL, db)
 	ms.MountStoreWithDB(keyIndices, sdk.StoreTypeIAVL, db)
 	ms.MountStoreWithDB(buybackKey, sdk.StoreTypeIAVL, db)
 	ms.MountStoreWithDB(bankKey, sdk.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(tkeyParams, sdk.StoreTypeTransient, db)
 
 	err := ms.LoadLatestVersion()
 	require.Nil(t, err)
@@ -263,15 +272,19 @@ func createTestComponents(t *testing.T) (sdk.Context, keeper.Keeper, *market.Kee
 		pk = paramskeeper.NewKeeper(encConfig.Marshaler, encConfig.Amino, keyParams, tkeyParams)
 		ak = authkeeper.NewAccountKeeper(
 			encConfig.Marshaler, authCapKey, pk.Subspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms,
-		)
-
+		)        
 		bk = embank.Wrap(bankkeeper.NewBaseKeeper(encConfig.Marshaler, bankKey, ak, pk.Subspace(banktypes.ModuleName), blockedAddr))
+
+		marketKeeper = market.NewKeeper(
+			encConfig.Marshaler, keyMarket, keyIndices, ak, bk,
+			pk.Subspace(market.ModuleName),
+		)
 	)
 
 	initialSupply := coins(fmt.Sprintf("1000000eur,1000000usd,1000000chf,1000000jpy,1000000gbp,1000000%v,500000000pesos", stakingDenom))
 	bk.SetSupply(ctx, banktypes.NewSupply(initialSupply))
 
-	marketKeeper := market.NewKeeper(encConfig.Marshaler, keyMarket, keyIndices, ak, bk)
+	marketKeeper.InitParamsStore(ctx)
 
 	keeper := NewKeeper(encConfig.Marshaler, buybackKey, marketKeeper, ak, mockStakingKeeper{}, bk)
 	keeper.SetUpdateInterval(ctx, time.Hour)

x/market/keeper/grpc_query_test.go

@@ -25,7 +25,7 @@ func TestQueryByAccount(t *testing.T) {
 		types.TimeInForce_GoodTillCancel,
 		sdk.NewCoin("alx", sdk.OneInt()),
 		sdk.NewCoin("blx", sdk.OneInt()),
-		myAddress, "myOrderID",
+		myAddress,"myOrderID",
 	)
 	require.NoError(t, err)
 	k.setOrder(ctx, &o)