diff --git a/aclmapping/dex/mappings_test.go b/aclmapping/dex/mappings_test.go index f906061134..c8770b3659 100644 --- a/aclmapping/dex/mappings_test.go +++ b/aclmapping/dex/mappings_test.go @@ -56,7 +56,7 @@ func (suite *KeeperTestSuite) PrepareTest() { suite.defaultExchangeRate = fmt.Sprintf("%dusei", sdk.NewDec(1700)) suite.initialBalance = sdk.Coins{sdk.NewInt64Coin(suite.defaultDenom, 100000000000)} - suite.initialBalance = sdk.Coins{sdk.NewInt64Coin("stake", 100000000000)} + suite.initialBalance = sdk.Coins{sdk.NewInt64Coin("usei", 100000000000)} suite.FundAcc(suite.TestAccs[0], suite.initialBalance) suite.queryClient = dextypes.NewQueryClient(suite.QueryHelper) diff --git a/aclmapping/staking/mappings_test.go b/aclmapping/staking/mappings_test.go index 41755e3a0e..022c4d15ce 100644 --- a/aclmapping/staking/mappings_test.go +++ b/aclmapping/staking/mappings_test.go @@ -55,7 +55,7 @@ func (suite *KeeperTestSuite) PrepareTest() { suite.defaultExchangeRate = fmt.Sprintf("%dusei", sdk.NewDec(1700)) suite.initalBalance = sdk.Coins{sdk.NewInt64Coin(suite.defaultDenom, 100000000000)} - suite.initalBalance = sdk.Coins{sdk.NewInt64Coin("stake", 100000000000)} + suite.initalBalance = sdk.Coins{sdk.NewInt64Coin("usei", 100000000000)} suite.FundAcc(suite.TestAccs[0], suite.initalBalance) suite.queryClient = stakingtypes.NewQueryClient(suite.QueryHelper) @@ -99,17 +99,17 @@ func (suite *KeeperTestSuite) PrepareTest() { suite.App.AccountKeeper.SetModuleAccount(suite.Ctx, bondedPool) suite.delegateMsg = &stakingtypes.MsgDelegate{ - Amount: sdk.NewInt64Coin("stake", 10), + Amount: sdk.NewInt64Coin("usei", 10), ValidatorAddress: suite.validator.String(), DelegatorAddress: suite.TestAccs[0].String(), } suite.undelegateMsg = &stakingtypes.MsgUndelegate{ - Amount: sdk.NewInt64Coin("stake", 10), + Amount: sdk.NewInt64Coin("usei", 10), ValidatorAddress: suite.validator.String(), DelegatorAddress: suite.TestAccs[0].String(), } suite.redelegateMsg = &stakingtypes.MsgBeginRedelegate{ - Amount: sdk.NewInt64Coin("stake", 10), + Amount: sdk.NewInt64Coin("usei", 10), ValidatorSrcAddress: suite.validator.String(), ValidatorDstAddress: suite.newValidator.String(), DelegatorAddress: suite.TestAccs[0].String(), diff --git a/app/params/config.go b/app/params/config.go index 014515de07..4ca5d71335 100644 --- a/app/params/config.go +++ b/app/params/config.go @@ -90,9 +90,14 @@ func SetTendermintConfigs(config *tmcfg.Config) { config.Mempool.MaxTxsBytes = 10737418240 config.Mempool.MaxTxBytes = 2048576 // Consensus Configs - config.Consensus.UnsafeProposeTimeoutOverride = 250 * time.Millisecond - config.Consensus.UnsafeVoteTimeoutOverride = 250 * time.Millisecond - config.Consensus.UnsafeCommitTimeoutOverride = 250 * time.Millisecond + config.Consensus.GossipTransactionKeyOnly = true + config.Consensus.UnsafeProposeTimeoutOverride = 1 * time.Second + config.Consensus.UnsafeProposeTimeoutDeltaOverride = 500 * time.Millisecond + + config.Consensus.UnsafeVoteTimeoutOverride = 50 * time.Millisecond + config.Consensus.UnsafeVoteTimeoutDeltaOverride = 500 * time.Millisecond + config.Consensus.UnsafeCommitTimeoutOverride = 50 * time.Millisecond + config.Consensus.UnsafeBypassCommitTimeoutOverride = &UnsafeBypassCommitTimeoutOverride // Metrics config.Instrumentation.Prometheus = true diff --git a/docker/localnode/scripts/step1_configure_init.sh b/docker/localnode/scripts/step1_configure_init.sh index 3c93fedb60..e822d835fb 100755 --- a/docker/localnode/scripts/step1_configure_init.sh +++ b/docker/localnode/scripts/step1_configure_init.sh @@ -21,7 +21,7 @@ mkdir -p build/generated/exported_keys/ # Initialize validator node MONIKER="sei-node-$NODE_ID" -./build/seid init "$MONIKER" --chain-id sei >/dev/null 2>&1 +./build/seid init "$MONIKER" --chain-id sei # Copy configs cp docker/localnode/config/app.toml ~/.sei/config/app.toml @@ -63,4 +63,4 @@ echo "$PRIV_KEY" >> build/generated/exported_keys/"$NODE0_SEIVALOPER_INFO".txt sed -i'' -e 's/address = "sei"/address = \"'$GENESIS_ACCOUNT_ADDRESS'\"/g' ~/price_feeder_config.toml sed -i'' -e 's/validator = "seivaloper"/validator = \"'$NODE0_SEIVALOPER_INFO'\"/g' ~/price_feeder_config.toml -echo "DONE" >> build/generated/init.complete \ No newline at end of file +echo "DONE" >> build/generated/init.complete diff --git a/docker/localnode/scripts/step2_genesis.sh b/docker/localnode/scripts/step2_genesis.sh index c7e60230ab..b45be1c3d3 100755 --- a/docker/localnode/scripts/step2_genesis.sh +++ b/docker/localnode/scripts/step2_genesis.sh @@ -20,7 +20,6 @@ override_genesis '.app_state["oracle"]["params"]["vote_period"]="1"' override_genesis '.app_state["slashing"]["params"]["signed_blocks_window"]="10000"' override_genesis '.app_state["slashing"]["params"]["min_signed_per_window"]="0.050000000000000000"' override_genesis '.app_state["staking"]["params"]["max_validators"]="50"' -override_genesis '.consensus_params["block"]["time_iota_ms"]="1"' override_genesis '.consensus_params["block"]["max_gas"]="5000000000"' override_genesis '.app_state["staking"]["params"]["unbonding_time"]="86400s"' @@ -61,4 +60,4 @@ echo "Collecting all gentx" ./build/seid collect-gentxs >/dev/null 2>&1 cp ~/.sei/config/genesis.json build/generated/genesis-sei.json -echo "Genesis file has been created successfully" \ No newline at end of file +echo "Genesis file has been created successfully" diff --git a/go.mod b/go.mod index ac41de8622..ef0355fc6a 100644 --- a/go.mod +++ b/go.mod @@ -267,9 +267,9 @@ require ( replace ( github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 - github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.1.373 + github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.1.376 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 - github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.1.130 + github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.1.132 google.golang.org/grpc => google.golang.org/grpc v1.33.2 ) diff --git a/go.sum b/go.sum index 964784d196..2cf55d4f4b 100644 --- a/go.sum +++ b/go.sum @@ -1067,10 +1067,10 @@ github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod github.com/securego/gosec/v2 v2.11.0 h1:+PDkpzR41OI2jrw1q6AdXZCbsNGNGT7pQjal0H0cArI= github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+fscA+Pulbpo= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= -github.com/sei-protocol/sei-cosmos v0.1.373 h1:VkM4AWgui28NnYgxkstMM/k54o8P5YygbNAv1mWvtC4= -github.com/sei-protocol/sei-cosmos v0.1.373/go.mod h1:pmWgLJxzDS+WMVvBWoncAnlXBjb0lFJvMw5ULbjWVwc= -github.com/sei-protocol/sei-tendermint v0.1.130 h1:DHhNAXZExcbFc9aMHILhGFP0vsWfynx74kIS4Kb9nxc= -github.com/sei-protocol/sei-tendermint v0.1.130/go.mod h1:ubqjn2T/nvqmQYjgpOTV7uSyUvdfvJCepc7zNYL2mkw= +github.com/sei-protocol/sei-cosmos v0.1.376 h1:94X4TWRK+wfq0BK7JRj+cu0Vx903EDiKBJVEG5NaIek= +github.com/sei-protocol/sei-cosmos v0.1.376/go.mod h1:lX+jDZ9u+afukL4Gc76YtKFEeCe9HfrAOCYAzSevAPw= +github.com/sei-protocol/sei-tendermint v0.1.132 h1:bGzvArngcXgZ0PZSif2Qqp7p/YLd+fBxsYnH6Lqc0E4= +github.com/sei-protocol/sei-tendermint v0.1.132/go.mod h1:ubqjn2T/nvqmQYjgpOTV7uSyUvdfvJCepc7zNYL2mkw= github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY= github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= diff --git a/scripts/initialize_local.sh b/scripts/initialize_local.sh index 888f0377e3..d3cdaaadbd 100755 --- a/scripts/initialize_local.sh +++ b/scripts/initialize_local.sh @@ -36,12 +36,7 @@ jq '.validators[0] += {"power":"70000000000000"}' ~/.sei/config/tmp_genesis.json jq '.validators[0] += {"pub_key":'$KEY'}' ~/.sei/config/tmp_genesis_2.json > ~/.sei/config/tmp_genesis_3.json mv ~/.sei/config/tmp_genesis_3.json ~/.sei/config/genesis.json && rm ~/.sei/config/tmp_genesis.json && rm ~/.sei/config/tmp_genesis_2.json ./build/seid collect-gentxs -cat ~/.sei/config/genesis.json | jq '.app_state["crisis"]["constant_fee"]["denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.app_state["staking"]["params"]["bond_denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["max_deposit_period"]="300s"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["voting_params"]["voting_period"]="120s"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.consensus_params["block"]["time_iota_ms"]="30"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["distribution"]["params"]["community_tax"]="0.000000000000000000"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json ./build/seid start --chain-id sei-chain diff --git a/scripts/initialize_local_test_node.sh b/scripts/initialize_local_test_node.sh index 5b6b2896a1..3210f0da2d 100755 --- a/scripts/initialize_local_test_node.sh +++ b/scripts/initialize_local_test_node.sh @@ -47,7 +47,6 @@ cat ~/.sei/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]= cat ~/.sei/config/genesis.json | jq '.app_state["staking"]["params"]["bond_denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["max_deposit_period"]="300s"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["voting_params"]["voting_period"]="5s"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.consensus_params["block"]["time_iota_ms"]="50"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["distribution"]["params"]["community_tax"]="0.000000000000000000"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json # set block time to 2s diff --git a/scripts/old_initialize_local.sh b/scripts/old_initialize_local.sh index 2e8d7431aa..27c02493cc 100755 --- a/scripts/old_initialize_local.sh +++ b/scripts/old_initialize_local.sh @@ -40,14 +40,9 @@ echo "Creating Accounts" python3 loadtest/scripts/populate_genesis_accounts.py 50 loc ~/go/bin/seid collect-gentxs -cat ~/.sei/config/genesis.json | jq '.app_state["crisis"]["constant_fee"]["denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.app_state["staking"]["params"]["bond_denom"]="usei"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["max_deposit_period"]="300s"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["gov"]["voting_params"]["voting_period"]="5s"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["oracle"]["params"]["vote_period"]="1"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json -cat ~/.sei/config/genesis.json | jq '.consensus_params["block"]["time_iota_ms"]="50"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json cat ~/.sei/config/genesis.json | jq '.app_state["distribution"]["params"]["community_tax"]="0.000000000000000000"' > ~/.sei/config/tmp_genesis.json && mv ~/.sei/config/tmp_genesis.json ~/.sei/config/genesis.json # set block time to 2s diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go index bb97ae3cb9..51b7c40328 100644 --- a/x/dex/types/keys.go +++ b/x/dex/types/keys.go @@ -152,7 +152,7 @@ func MemDepositPrefix(contractAddr string) []byte { } const ( - DefaultPriceDenom = "stake" + DefaultPriceDenom = "usei" DefaultAssetDenom = "dummy" ) diff --git a/x/mint/client/rest/grpc_query_test.go b/x/mint/client/rest/grpc_query_test.go index 9fa7676c50..80f9851f81 100644 --- a/x/mint/client/rest/grpc_query_test.go +++ b/x/mint/client/rest/grpc_query_test.go @@ -73,7 +73,7 @@ func (s *IntegrationTestSuite) TestQueryGRPC() { map[string]string{}, &minttypes.QueryParamsResponse{}, &minttypes.QueryParamsResponse{ - Params: minttypes.NewParams("stake", sdk.NewDecWithPrec(13, 2), sdk.NewDecWithPrec(100, 2), + Params: minttypes.NewParams("usei", sdk.NewDecWithPrec(13, 2), sdk.NewDecWithPrec(100, 2), sdk.NewDec(1), sdk.NewDecWithPrec(67, 2), (60 * 60 * 8766 / 5)), }, }, diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 9860d30316..0336dadf8b 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -39,8 +39,8 @@ func TestRandomizedGenState(t *testing.T) { var mintGenesis types.GenesisState simState.Cdc.MustUnmarshalJSON(simState.GenState[types.ModuleName], &mintGenesis) - require.Equal(t, "stake", mintGenesis.Params.MintDenom) - require.Equal(t, "0stake", mintGenesis.Minter.EpochProvision(mintGenesis.Params).String()) + require.Equal(t, "usei", mintGenesis.Params.MintDenom) + require.Equal(t, "0usei", mintGenesis.Minter.EpochProvision(mintGenesis.Params).String()) require.Equal(t, "0.000000000000000000", mintGenesis.Minter.EpochProvisions.String()) } diff --git a/x/oracle/simulation/operations.go b/x/oracle/simulation/operations.go index 2028e73625..3988c4b164 100644 --- a/x/oracle/simulation/operations.go +++ b/x/oracle/simulation/operations.go @@ -65,7 +65,7 @@ func WeightedOperations( } // SimulateMsgAggregateExchangeRateVote generates a MsgAggregateExchangeRateVote with random values. -// nolint: funlen +//nolint: funlen func SimulateMsgAggregateExchangeRateVote(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation { return func( r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, @@ -122,7 +122,7 @@ func SimulateMsgAggregateExchangeRateVote(ak types.AccountKeeper, bk types.BankK } // SimulateMsgDelegateFeedConsent generates a MsgDelegateFeedConsent with random values. -// nolint: funlen +//nolint: funlen func SimulateMsgDelegateFeedConsent(ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper) simtypes.Operation { return func( r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,