From 8d0a2ed5c9dd4b0c2960da5402e49b464e2eabf1 Mon Sep 17 00:00:00 2001 From: zhongqiuwood Date: Tue, 3 Nov 2020 07:59:39 +0800 Subject: [PATCH] v0.12.3-testnet1 --- Makefile | 2 +- app/genesis/genesis.json | 48 ++++++++++++++-------------- go.mod | 2 +- go.sum | 2 ++ x/backend/orm/backend.db | Bin 249856 -> 249856 bytes x/order/keeper/keeper.go | 9 ++++++ x/order/keeper/keeper_test.go | 2 +- x/order/keeper/memory_cache.go | 14 ++++++++ x/order/keeper/memory_cache_test.go | 9 ++++++ 9 files changed, 61 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index ac1a805e0b..51f45977a9 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CAT := $(if $(filter $(OS),Windows_NT),type,cat) GithubTop=github.com -Version=v0.12.2 +Version=v0.12.3 CosmosSDK=v0.37.9 Tendermint=v0.32.10 Iavl=v0.12.4 diff --git a/app/genesis/genesis.json b/app/genesis/genesis.json index 883084a971..8fccd0c9de 100644 --- a/app/genesis/genesis.json +++ b/app/genesis/genesis.json @@ -25,7 +25,7 @@ "coins": [ { "amount": "9000000.00000000", - "denom": "okt" + "denom": "tokt" } ], "delegated_free": [], @@ -60,7 +60,7 @@ "crisis": { "constant_fee": { "amount": "1000.00000000", - "denom": "okt" + "denom": "tokt" } }, "debug": null, @@ -72,21 +72,21 @@ "delist_min_deposit": [ { "amount": "100.00000000", - "denom": "okt" + "denom": "tokt" } ], "delist_voting_period": "259200000000000", "list_fee": { "amount": "20000.00000000", - "denom": "okt" + "denom": "tokt" }, "register_operator_fee": { "amount": "0.00000000", - "denom": "okt" + "denom": "tokt" }, "transfer_ownership_fee": { "amount": "10.00000000", - "denom": "okt" + "denom": "tokt" }, "withdraw_period": "259200000000000" }, @@ -115,7 +115,7 @@ "amount": [], "gas": "0" }, - "memo": "ab6f676c5d6b4e7c8233ff4ba63d1b5d0d203b56@127.0.0.1:26656", + "memo": "cd8415810b97c447751f5d959b89c99e7b792937@127.0.0.1:26656", "msg": [ { "type": "okexchain/staking/MsgCreateValidator", @@ -129,9 +129,9 @@ }, "min_self_delegation": { "amount": "0.00100000", - "denom": "okt" + "denom": "tokt" }, - "pubkey": "okexchainvalconspub1zcjduepq83e8r6lrt44sxvg66vhh8l4yhpsr825m97yc7qxu06zhpxezuhhsmalm87", + "pubkey": "okexchainvalconspub1zcjduepqwwmh848ta3zk87lc4xcrdqwtfzry9ucq7m4dhd0nn0f5vyjnn3nsqlf09g", "validator_address": "okexchainvaloper10q0rk5qnyag7wfvvt7rtphlw589m7frshchly8" } } @@ -142,7 +142,7 @@ "type": "tendermint/PubKeySecp256k1", "value": "AgYaL1tZ7ekqvweQhKojG8sDHUfN23qJWviAsTDIWvYU" }, - "signature": "42XTaFLh5Z2Aor2kpY5H32ReUUT6Wa5IZhkGSLMas/gvaPY4Pg5XsFPwUuFJpcj36L+E9BQOjxXhM0VF1rKV7A==" + "signature": "MQ+/q0m26lmj+9l/W4Oo8U8Ukaks3eXwYkPn1sDrtOZXfz8d02dTphT+xs9g3pq+YlJOd87gcO8no2wOttqdWg==" } ] } @@ -155,7 +155,7 @@ "min_deposit": [ { "amount": "100.00000000", - "denom": "okt" + "denom": "tokt" } ] }, @@ -179,7 +179,7 @@ "minted_per_block": [ { "amount": "0.00000000", - "denom": "okt" + "denom": "tokt" } ], "next_block_to_update": "0" @@ -189,7 +189,7 @@ "blocks_per_year": "10519200", "deflation_rate": "0.50000000", "inflation_epoch": "3", - "mint_denom": "okt" + "mint_denom": "tokt" } }, "order": { @@ -198,7 +198,7 @@ "cancel_order_msg_gas_unit": "30000", "fee_per_block": { "amount": "0.00000000", - "denom": "okt" + "denom": "tokt" }, "max_deals_per_block": "1000", "new_order_msg_gas_unit": "40000", @@ -213,7 +213,7 @@ "min_deposit": [ { "amount": "100.00000000", - "denom": "okt" + "denom": "tokt" } ], "voting_period": "259200000000000" @@ -238,7 +238,7 @@ "last_total_power": "0", "last_validator_powers": null, "params": { - "bond_denom": "okt", + "bond_denom": "tokt", "epoch": 252, "max_bonded_validators": 21, "max_validators_to_add_shares": 30, @@ -260,34 +260,34 @@ "params": { "burn_fee": { "amount": "10.00000000", - "denom": "okt" + "denom": "tokt" }, "issue_fee": { "amount": "2500.00000000", - "denom": "okt" + "denom": "tokt" }, "mint_fee": { "amount": "10.00000000", - "denom": "okt" + "denom": "tokt" }, "modify_fee": { "amount": "0.00000000", - "denom": "okt" + "denom": "tokt" }, "ownership_confirm_window": "86400000000000", "transfer_ownership_fee": { "amount": "10.00000000", - "denom": "okt" + "denom": "tokt" } }, "tokens": [ { "description": "OK Group Global Utility Token", "mintable": true, - "original_symbol": "okt", + "original_symbol": "tokt", "original_total_supply": "1000000000.00000000", "owner": "okexchain10q0rk5qnyag7wfvvt7rtphlw589m7frsku8qc9", - "symbol": "okt", + "symbol": "tokt", "type": "0", "whole_name": "OKT" } @@ -311,7 +311,7 @@ "app_upgrade_min_deposit": [ { "amount": "100.00000000", - "denom": "okt" + "denom": "tokt" } ], "app_upgrade_voting_period": "259200000000000" diff --git a/go.mod b/go.mod index 438b7f3655..dd075cc85a 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( ) replace ( - github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-okexchain4 + github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-okexchain4-tokt github.com/tendermint/iavl => github.com/okex/iavl v0.12.4-okexchain github.com/tendermint/tendermint => github.com/okex/tendermint v0.32.10-okexchain ) diff --git a/go.sum b/go.sum index da2c30e9d4..db14b16b84 100644 --- a/go.sum +++ b/go.sum @@ -242,6 +242,8 @@ github.com/nacos-group/nacos-sdk-go v1.0.0 h1:CufUF7DZca2ZzIrJtMMCDih1sA58BWCglA github.com/nacos-group/nacos-sdk-go v1.0.0/go.mod h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA= github.com/okex/cosmos-sdk v0.37.9-okexchain4 h1:q1YCAUIvHYNd+aVcPOkMOcvRcQUwGkFhKaIgmaVQ5TY= github.com/okex/cosmos-sdk v0.37.9-okexchain4/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A= +github.com/okex/cosmos-sdk v0.37.9-okexchain4-tokt h1:GRXnqEVmzvHYfkCZFquIJOEOEKzypihb2S0G1nZlM8g= +github.com/okex/cosmos-sdk v0.37.9-okexchain4-tokt/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A= github.com/okex/iavl v0.12.4-okexchain h1:fHH/ax1CABQSNiISXIMba3V76qvNZ4HIILaewsMaMbc= github.com/okex/iavl v0.12.4-okexchain/go.mod h1:8LHakzt8/0G3/I8FUU0ReNx98S/EP6eyPJkAUvEXT/o= github.com/okex/tendermint v0.32.10-okexchain h1:fYrmdPNH5e1QGr0lzI4yuBZ6QLv52t4enfoBVAoe5rg= diff --git a/x/backend/orm/backend.db b/x/backend/orm/backend.db index fc09cd0137f02167da4bc5f1a37b1a5988d07a83..a743933f2506df3d7b4cadac8933e10b8219f604 100644 GIT binary patch delta 4210 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 VmAVF7&(_Rui~b+M{a&L|{{_#rQ-uHk diff --git a/x/order/keeper/keeper.go b/x/order/keeper/keeper.go index de6c18524a..838568fd6e 100644 --- a/x/order/keeper/keeper.go +++ b/x/order/keeper/keeper.go @@ -452,14 +452,23 @@ func (k Keeper) AddCollectedFees(ctx sdk.Context, coins sdk.DecCoins, from sdk.A // GetParams gets inflation params from the global param store func (k Keeper) GetParams(ctx sdk.Context) *types.Params { + // get params from cache + cacheParams := k.cache.GetParams() + if cacheParams != nil { + return cacheParams + } + + // if param not stored in cache, get param from KVStore and cache it var param types.Params k.paramSpace.GetParamSet(ctx, ¶m) + k.cache.SetParams(¶m) return ¶m } // SetParams sets inflation params from the global param store func (k Keeper) SetParams(ctx sdk.Context, params *types.Params) { k.paramSpace.SetParamSet(ctx, params) + k.cache.SetParams(params) } // nolint diff --git a/x/order/keeper/keeper_test.go b/x/order/keeper/keeper_test.go index 32c4bf0512..76833093f0 100644 --- a/x/order/keeper/keeper_test.go +++ b/x/order/keeper/keeper_test.go @@ -67,7 +67,7 @@ func TestCache(t *testing.T) { order.Sender = testInput.TestAddrs[0] err = keeper.PlaceOrder(ctx, order) require.Nil(t, err) - require.EqualValues(t, 1, keeper.GetParams(ctx).OrderExpireBlocks) + require.EqualValues(t, 1, keeper.GetCache().params.OrderExpireBlocks) require.EqualValues(t, 1, keeper.GetOperationMetric().OpenNum) // current cache diff --git a/x/order/keeper/memory_cache.go b/x/order/keeper/memory_cache.go index d71d5e5547..7617b09ebf 100644 --- a/x/order/keeper/memory_cache.go +++ b/x/order/keeper/memory_cache.go @@ -12,6 +12,8 @@ type Cache struct { blockMatchResult *types.BlockMatchResult handlerTxMsgResult []bitset.BitSet + params *types.Params + // for statistic cancelNum int64 // canceled orders num in this block expireNum int64 // expired orders num in this block @@ -24,6 +26,7 @@ func NewCache() *Cache { return &Cache{ updatedOrderIDs: []string{}, blockMatchResult: nil, + params: nil, } } @@ -32,6 +35,7 @@ func (c *Cache) reset() { c.updatedOrderIDs = []string{} c.blockMatchResult = &types.BlockMatchResult{} c.handlerTxMsgResult = []bitset.BitSet{} + c.params = nil c.cancelNum = 0 c.expireNum = 0 @@ -99,6 +103,16 @@ func (c *Cache) getBlockMatchResult() *types.BlockMatchResult { return c.blockMatchResult } +// nolint +func (c *Cache) SetParams(params *types.Params) { + c.params = params +} + +// nolint +func (c *Cache) GetParams() *types.Params { + return c.params +} + func (c *Cache) getUpdatedOrderIDs() []string { return c.updatedOrderIDs } diff --git a/x/order/keeper/memory_cache_test.go b/x/order/keeper/memory_cache_test.go index 7848c47cf5..2f81c73fef 100644 --- a/x/order/keeper/memory_cache_test.go +++ b/x/order/keeper/memory_cache_test.go @@ -30,6 +30,11 @@ func TestCache_GetCancelNum(t *testing.T) { require.EqualValues(t, 0, cache.GetFullFillNum()) require.EqualValues(t, 0, cache.GetPartialFillNum()) + feeParams := types.DefaultTestParams() + cache.SetParams(&feeParams) + + require.EqualValues(t, types.DefaultOrderExpireBlocks, cache.params.OrderExpireBlocks) + res := types.BlockMatchResult{ BlockHeight: 0, ResultMap: nil, @@ -38,4 +43,8 @@ func TestCache_GetCancelNum(t *testing.T) { cache.setBlockMatchResult(&res) require.NotEqual(t, 0, cache.getBlockMatchResult().TimeStamp) + + cache.reset() + require.Nil(t, cache.GetParams()) + }