diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e6e395b7..33539830 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -53,11 +53,9 @@ jobs: files: ./coverage.txt fail_ci_if_error: false if: env.GIT_DIFF - regression-test: name: Regression Test runs-on: ubuntu-latest - steps: - name: Check out repository code uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd17113..673fd1d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,12 +33,14 @@ Contains all the PRs that improved the code without changing the behaviors. ## Added - Thorchain Claims Proto Updates - Documentation of Testnet Setup using local build and Cosmovisor +- Documentation update and addition of validator setup documentation ## Fixed - Testnet binary generation using go build - Fixed Regression Testing - Updated Docs - Fixed Consumer in Directory Service +- Fixed Regression Export # v1.0.0-Prerelease diff --git a/docs/TESTNET.md b/docs/TESTNET.md index dd0001ce..e927f79c 100644 --- a/docs/TESTNET.md +++ b/docs/TESTNET.md @@ -57,7 +57,6 @@ TAG=testnet make install Configure The Binary ```shell - arkeod keys add arkeod config set client node tcp://localhost:${ARKEO_PORT}57 arkeod config set client keyring-backend test @@ -73,15 +72,10 @@ curl -s http://seed.innovationtheory.com:26657/genesis | jq '.result.genesis' > ## Configure Pruning, Minimum gas price , enable prometheus and disable indexing ```shell - sed -i -e "s/^pruning *=.*/pruning = \"custom\"/" $HOME/.arkeo/config/app.toml sed -i -e "s/^pruning-keep-recent *=.*/pruning-keep-recent = \"100\"/" $HOME/.arkeo/config/app.toml sed -i -e "s/^pruning-interval *=.*/pruning-interval = \"50\"/" $HOME/.arkeo/config/app.toml - sed -i 's|minimum-gas-prices =.*|minimum-gas-prices = "0.001uarkeo"|g' $HOME/.arkeo/config/app.toml -sed -i -e "s/prometheus = false/prometheus = true/" $HOME/.arkeo/config/config.toml -sed -i -e "s/^indexer *=.*/indexer = \"null\"/" $HOME/.arkeo/config/config.toml - ``` ## Configure Seeds and Peers diff --git a/docs/VALIDATOR.md b/docs/VALIDATOR.md new file mode 100644 index 00000000..7a2c47a2 --- /dev/null +++ b/docs/VALIDATOR.md @@ -0,0 +1,92 @@ +# Setup Validator +Becoming a validator involves running node and staking arkeo tokens to participate in network consensus + +## Prerequisites + +- [Prerequisites](./TESTNET.md#prerequisites) +- [Configure Binary](./TESTNET.md#arkeo-binary) +- [Start Node](./TESTNET.md#configure-service) + + +## Setting Up Wallet +```shell +arkeod keys add +``` + +### Check the balances +```shell +arkeod query bank balances $(arkeod keys show -a) +``` +> For the new account balances wont be there if you're running a testnet validator please request tokens from the faucet + +## Create A Validator +> Don’t change anything if you don’t understand what you’re doing. + +```shell +arkeod tx staking create-validator \ +--chain-id arkeo \ +--commission-rate 0.05 \ +--commission-max-rate 0.2 \ +--commission-max-change-rate 0.1 \ +--min-self-delegation "1" \ +--amount uarkeo \ +--pubkey $(arkeod tendermint show-validator) \ +--moniker "" \ +--from \ +--fees="5000uarkeo" \ +--yes +``` + +## Restart the Service +Check the node logs +```shell +journalctl -u arkeod -f -o cat +``` + +Restart the Node +```shell +sudo systemctl restart arkeod +``` + +Check your node status here; +```shell +curl http://127.0.0.1:26657/status +``` + +Check node synchronization, if results false – node is synchronized + +```shell +curl -s http://127.0.0.1:26657/status | jq .result.sync_info.catching_up +``` + +## Additionally To Bond More Tokens +Get your valoper address: + +```shell +arkeod keys show wallet --bech val -a +``` + +Bond more tokens (if you want to increase your validator stake you should bond more to your valoper address): + +```shell +arkeod tx staking delegate YOUR_VALOPER_ADDRESS uarkeo --from wallet --chain-id $CHAIN_ID --fees="500uarkeo" +``` + +## Check Validators Status +Active validators list + +```shell +arkeod query staking validators -o json | jq -r '.validators[] | select(.status=="BOND_STATUS_BONDED") | [.operator_address, .status, (.tokens|tonumber / pow(10; 6)), .description.moniker] | @csv' | column -t -s"," | sort -k3 -n -r +``` +Inactive validators list + +```shell +arkeod query staking validators -o json | jq -r '.validators[] | select(.status=="BOND_STATUS_UNBONDED") | [.operator_address, .status, (.tokens|tonumber / pow(10; 6)), .description.moniker] | @csv' | column -t -s"," | sort -k3 -n -r +``` + +## Remove Node: +```shell +systemctl stop arkeod +sudo systemctl disable arkeod +sudo rm -rf ~/.arkeod /etc/systemd/system/arkeod.service +``` \ No newline at end of file diff --git a/test/regression/cmd/export.go b/test/regression/cmd/export.go index ac1d14c3..dae96fb8 100644 --- a/test/regression/cmd/export.go +++ b/test/regression/cmd/export.go @@ -3,6 +3,7 @@ package main import ( "bytes" "encoding/json" + "errors" "fmt" "os" "os/exec" @@ -145,8 +146,8 @@ func checkExportChanges(newExport map[string]any, path string) error { log.Debug().Msg("Comparing exports") diff := cmp.Diff(oldExport, newExport) if diff != "" { - // log.Error().Msgf("exports differ: %s", diff) - // return errors.New("exports differ") + log.Error().Msgf("exports differ: %s", diff) + return errors.New("exports differ") } log.Info().Msg("State export matches expected") diff --git a/test/regression/mnt/exports/suites_contracts_pay-as-you-go.json b/test/regression/mnt/exports/suites_contracts_pay-as-you-go.json index 8f5a81bc..0990565f 100644 --- a/test/regression/mnt/exports/suites_contracts_pay-as-you-go.json +++ b/test/regression/mnt/exports/suites_contracts_pay-as-you-go.json @@ -1,5 +1,6 @@ { - "app_hash": "", + "app_hash": null, + "app_name": "arkeo", "app_state": { "arkeo": { "contract_expiration_sets": [ @@ -25,7 +26,7 @@ "authorization": "STRICT", "client": "tarkeopub1addwnpepq2res6tu0m73ulk5sepgp6g3y37schfgymxy8z6l3lc78k7ju9u45yajwem", "delegate": "", - "deposit": "3", + "deposit": "100", "duration": "10", "height": "2", "id": "1", @@ -39,7 +40,7 @@ }, "service": 1, "settlement_duration": "11", - "settlement_height": "15", + "settlement_height": "0", "type": "PAY_AS_YOU_GO" } ], @@ -71,8 +72,17 @@ ] } ], - "user_contract_sets": [], - "version": "1" + "user_contract_sets": [ + { + "contract_set": { + "contract_ids": [ + "1" + ] + }, + "user": "tarkeopub1addwnpepq2res6tu0m73ulk5sepgp6g3y37schfgymxy8z6l3lc78k7ju9u45yajwem" + } + ], + "version": "0" }, "auth": { "accounts": [ @@ -249,7 +259,7 @@ "address": "tarkeo1d0m97ywk2y4vq58ud6q5e0r3q9khj9e3unfe4t", "coins": [ { - "amount": "99999961", + "amount": "100000000", "denom": "uarkeo" } ] @@ -258,16 +268,16 @@ "address": "tarkeo1jv65s3grqf6v6jl3dp4t6c9t9rk99cd8t6gr9e", "coins": [ { - "amount": "16066160612", - "denom": "stake" + "amount": "16066162928", + "denom": "uarkeo" } ] }, { - "address": "tarkeo1hnyy4gp5tgarpg3xu6w5cw4zsyphx2lyvls9rz", + "address": "tarkeo1kz2dkl8zlxwte008astc5e65htrxdcse6x3h3h", "coins": [ { - "amount": "39", + "amount": "97", "denom": "uarkeo" } ] @@ -276,7 +286,7 @@ "address": "tarkeo1uhapc6jjq6ns0ydnk7zld5x7f5kl2ukemjw5fg", "coins": [ { - "amount": "999999899999997", + "amount": "999999899999900", "denom": "uarkeo" } ] @@ -287,13 +297,10 @@ "default_send_enabled": true, "send_enabled": [] }, + "send_enabled": [], "supply": [ { - "amount": "16066160612", - "denom": "stake" - }, - { - "amount": "52001000000000000", + "amount": "52001016066162928", "denom": "uarkeo" } ] @@ -333,23 +340,10 @@ } ] }, - "claimarkeo": { - "claim_records": [], - "module_account_balance": { - "amount": "0", - "denom": "uarkeo" - }, - "params": { - "claim_denom": "uarkeo", - "duration_of_decay": "3600s", - "duration_until_decay": "3600s", - "initial_gas_amount": null - } - }, "crisis": { "constant_fee": { "amount": "1000", - "denom": "stake" + "denom": "uarkeo" } }, "distribution": { @@ -368,8 +362,8 @@ "fee_pool": { "community_pool": [ { - "amount": "321323212.240000000000000000", - "denom": "stake" + "amount": "321323258.560000000000000000", + "denom": "uarkeo" } ] }, @@ -377,16 +371,16 @@ { "outstanding_rewards": [ { - "amount": "15744837399.760000000000000000", - "denom": "stake" + "amount": "15744839669.440000000000000000", + "denom": "uarkeo" } ], "validator_address": "tarkeovaloper1hnyy4gp5tgarpg3xu6w5cw4zsyphx2lyfn54sh" } ], "params": { - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", + "base_proposer_reward": "0.000000000000000000", + "bonus_proposer_reward": "0.000000000000000000", "community_tax": "0.020000000000000000", "withdraw_addr_enabled": true }, @@ -396,8 +390,8 @@ "accumulated": { "commission": [ { - "amount": "1574483739.976000000000000000", - "denom": "stake" + "amount": "1574483966.944000000000000000", + "denom": "uarkeo" } ] }, @@ -410,8 +404,8 @@ "period": "2", "rewards": [ { - "amount": "14170353659.784000000000000000", - "denom": "stake" + "amount": "14170355702.496000000000000000", + "denom": "uarkeo" } ] }, @@ -440,27 +434,42 @@ "gen_txs": [] }, "gov": { - "deposit_params": { + "constitution": "", + "deposit_params": null, + "deposits": [], + "params": { + "burn_proposal_deposit_prevote": false, + "burn_vote_quorum": false, + "burn_vote_veto": true, + "expedited_min_deposit": [ + { + "amount": "50000000", + "denom": "uarkeo" + } + ], + "expedited_threshold": "0.667000000000000000", + "expedited_voting_period": "86400s", "max_deposit_period": "172800s", "min_deposit": [ { "amount": "10000000", - "denom": "stake" + "denom": "uarkeo" } - ] - }, - "deposits": [], - "proposals": [], - "starting_proposal_id": "1", - "tally_params": { + ], + "min_deposit_ratio": "0.010000000000000000", + "min_initial_deposit_ratio": "0.000000000000000000", + "proposal_cancel_dest": "", + "proposal_cancel_ratio": "0.500000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", - "veto_threshold": "0.334000000000000000" + "veto_threshold": "0.334000000000000000", + "voting_period": "172800s" }, + "proposals": [], + "starting_proposal_id": "1", + "tally_params": null, "votes": [], - "voting_params": { - "voting_period": "172800s" - } + "voting_params": null }, "group": { "group_members": [], @@ -479,26 +488,68 @@ "channels": [], "commitments": [], "next_channel_sequence": "0", + "params": { + "upgrade_timeout": { + "height": { + "revision_height": "0", + "revision_number": "0" + }, + "timestamp": "600000000000" + } + }, "receipts": [], "recv_sequences": [], "send_sequences": [] }, "client_genesis": { - "clients": [], + "clients": [ + { + "client_id": "09-localhost", + "client_state": { + "@type": "/ibc.lightclients.localhost.v2.ClientState", + "latest_height": { + "revision_height": "15", + "revision_number": "0" + } + } + } + ], "clients_consensus": [], "clients_metadata": [], "create_localhost": false, "next_client_sequence": "0", "params": { "allowed_clients": [ - "06-solomachine", - "07-tendermint" + "*" ] } }, "connection_genesis": { "client_connection_paths": [], - "connections": [], + "connections": [ + { + "client_id": "09-localhost", + "counterparty": { + "client_id": "09-localhost", + "connection_id": "connection-localhost", + "prefix": { + "key_prefix": "aWJj" + } + }, + "delay_period": "0", + "id": "connection-localhost", + "state": "STATE_OPEN", + "versions": [ + { + "features": [ + "ORDER_ORDERED", + "ORDER_UNORDERED" + ], + "identifier": "1" + } + ] + } + ], "next_connection_sequence": "0", "params": { "max_expected_time_per_block": "30000000000" @@ -518,7 +569,9 @@ "active_channels": [], "interchain_accounts": [], "params": { - "allow_messages": [], + "allow_messages": [ + "*" + ], "host_enabled": true }, "port": "icahost" @@ -526,8 +579,8 @@ }, "mint": { "minter": { - "annual_provisions": "6760123009538421.891755000000000000", - "inflation": "0.129999865570631755" + "annual_provisions": "6760124958900879.440734825593079684", + "inflation": "0.129999865570695682" }, "params": { "blocks_per_year": "6311520", @@ -535,10 +588,9 @@ "inflation_max": "0.200000000000000000", "inflation_min": "0.070000000000000000", "inflation_rate_change": "0.130000000000000000", - "mint_denom": "stake" + "mint_denom": "uarkeo" } }, - "params": null, "slashing": { "missed_blocks": [ { @@ -620,6 +672,8 @@ "status": "BOND_STATUS_BONDED", "tokens": "50000000000000000", "unbonding_height": "0", + "unbonding_ids": [], + "unbonding_on_hold_ref_count": "0", "unbonding_time": "1970-01-01T00:00:00Z" } ] @@ -630,40 +684,48 @@ "receive_enabled": true, "send_enabled": true }, - "port_id": "transfer" + "port_id": "transfer", + "total_escrowed": [] }, "upgrade": {}, "vesting": {} }, + "app_version": "null", "chain_id": "arkeo", - "consensus_params": { - "block": { - "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" - }, - "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" - }, - "validator": { - "pub_key_types": [ - "ed25519" - ] + "consensus": { + "params": { + "abci": { + "vote_extensions_enable_height": "0" + }, + "block": { + "max_bytes": "22020096", + "max_gas": "-1" + }, + "evidence": { + "max_age_duration": "172800000000000", + "max_age_num_blocks": "100000", + "max_bytes": "1048576" + }, + "validator": { + "pub_key_types": [ + "ed25519" + ] + }, + "version": { + "app": "0" + } }, - "version": {} - }, - "initial_height": "16", - "validators": [ - { - "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", - "name": "local", - "power": "50000000000", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + "validators": [ + { + "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", + "name": "local", + "power": "50000000000", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + } } - } - ] + ] + }, + "initial_height": 16 } \ No newline at end of file diff --git a/test/regression/mnt/exports/suites_contracts_subscription.json b/test/regression/mnt/exports/suites_contracts_subscription.json index 9d58e72f..0c6d12ce 100644 --- a/test/regression/mnt/exports/suites_contracts_subscription.json +++ b/test/regression/mnt/exports/suites_contracts_subscription.json @@ -1,5 +1,6 @@ { - "app_hash": "", + "app_hash": null, + "app_name": "arkeo", "app_state": { "arkeo": { "contract_expiration_sets": [ @@ -30,7 +31,7 @@ "height": "2", "id": "1", "nonce": "0", - "paid": "100", + "paid": "0", "provider": "tarkeopub1addwnpepqtsg8syrpcn60t2nnvnhtk6psr8qxlrtwjk8rmpkhxk9vy9wkd8ewmqv7rh", "queries_per_minute": "1", "rate": { @@ -39,7 +40,7 @@ }, "service": 1, "settlement_duration": "11", - "settlement_height": "12", + "settlement_height": "0", "type": "SUBSCRIPTION" }, { @@ -92,8 +93,17 @@ ] } ], - "user_contract_sets": [], - "version": "1" + "user_contract_sets": [ + { + "contract_set": { + "contract_ids": [ + "1" + ] + }, + "user": "tarkeopub1addwnpepq2res6tu0m73ulk5sepgp6g3y37schfgymxy8z6l3lc78k7ju9u45yajwem" + } + ], + "version": "0" }, "auth": { "accounts": [ @@ -258,7 +268,7 @@ "address": "tarkeo1v0n7wer498vqq6yddkr4clg3lck7kaw9lstp4k", "coins": [ { - "amount": "1000000000000108", + "amount": "1000000000000018", "denom": "uarkeo" } ] @@ -267,7 +277,7 @@ "address": "tarkeo1d0m97ywk2y4vq58ud6q5e0r3q9khj9e3unfe4t", "coins": [ { - "amount": "199999958", + "amount": "200000002", "denom": "uarkeo" } ] @@ -276,16 +286,16 @@ "address": "tarkeo1jv65s3grqf6v6jl3dp4t6c9t9rk99cd8t6gr9e", "coins": [ { - "amount": "19279390741", - "denom": "stake" + "amount": "19279394116", + "denom": "uarkeo" } ] }, { - "address": "tarkeo1hnyy4gp5tgarpg3xu6w5cw4zsyphx2lyvls9rz", + "address": "tarkeo1kz2dkl8zlxwte008astc5e65htrxdcse6x3h3h", "coins": [ { - "amount": "54", + "amount": "100", "denom": "uarkeo" } ] @@ -305,13 +315,10 @@ "default_send_enabled": true, "send_enabled": [] }, + "send_enabled": [], "supply": [ { - "amount": "19279390741", - "denom": "stake" - }, - { - "amount": "52001000000000000", + "amount": "52001019279394116", "denom": "uarkeo" } ] @@ -351,23 +358,10 @@ } ] }, - "claimarkeo": { - "claim_records": [], - "module_account_balance": { - "amount": "0", - "denom": "uarkeo" - }, - "params": { - "claim_denom": "uarkeo", - "duration_of_decay": "3600s", - "duration_until_decay": "3600s", - "initial_gas_amount": null - } - }, "crisis": { "constant_fee": { "amount": "1000", - "denom": "stake" + "denom": "uarkeo" } }, "distribution": { @@ -386,8 +380,8 @@ "fee_pool": { "community_pool": [ { - "amount": "385587814.820000000000000000", - "denom": "stake" + "amount": "385587882.320000000000000000", + "denom": "uarkeo" } ] }, @@ -395,16 +389,16 @@ { "outstanding_rewards": [ { - "amount": "18893802926.180000000000000000", - "denom": "stake" + "amount": "18893806233.680000000000000000", + "denom": "uarkeo" } ], "validator_address": "tarkeovaloper1hnyy4gp5tgarpg3xu6w5cw4zsyphx2lyfn54sh" } ], "params": { - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", + "base_proposer_reward": "0.000000000000000000", + "bonus_proposer_reward": "0.000000000000000000", "community_tax": "0.020000000000000000", "withdraw_addr_enabled": true }, @@ -414,8 +408,8 @@ "accumulated": { "commission": [ { - "amount": "1889380292.618000000000000000", - "denom": "stake" + "amount": "1889380623.368000000000000000", + "denom": "uarkeo" } ] }, @@ -428,8 +422,8 @@ "period": "2", "rewards": [ { - "amount": "17004422633.562000000000000000", - "denom": "stake" + "amount": "17004425610.312000000000000000", + "denom": "uarkeo" } ] }, @@ -458,27 +452,42 @@ "gen_txs": [] }, "gov": { - "deposit_params": { + "constitution": "", + "deposit_params": null, + "deposits": [], + "params": { + "burn_proposal_deposit_prevote": false, + "burn_vote_quorum": false, + "burn_vote_veto": true, + "expedited_min_deposit": [ + { + "amount": "50000000", + "denom": "uarkeo" + } + ], + "expedited_threshold": "0.667000000000000000", + "expedited_voting_period": "86400s", "max_deposit_period": "172800s", "min_deposit": [ { "amount": "10000000", - "denom": "stake" + "denom": "uarkeo" } - ] - }, - "deposits": [], - "proposals": [], - "starting_proposal_id": "1", - "tally_params": { + ], + "min_deposit_ratio": "0.010000000000000000", + "min_initial_deposit_ratio": "0.000000000000000000", + "proposal_cancel_dest": "", + "proposal_cancel_ratio": "0.500000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", - "veto_threshold": "0.334000000000000000" + "veto_threshold": "0.334000000000000000", + "voting_period": "172800s" }, + "proposals": [], + "starting_proposal_id": "1", + "tally_params": null, "votes": [], - "voting_params": { - "voting_period": "172800s" - } + "voting_params": null }, "group": { "group_members": [], @@ -497,26 +506,68 @@ "channels": [], "commitments": [], "next_channel_sequence": "0", + "params": { + "upgrade_timeout": { + "height": { + "revision_height": "0", + "revision_number": "0" + }, + "timestamp": "600000000000" + } + }, "receipts": [], "recv_sequences": [], "send_sequences": [] }, "client_genesis": { - "clients": [], + "clients": [ + { + "client_id": "09-localhost", + "client_state": { + "@type": "/ibc.lightclients.localhost.v2.ClientState", + "latest_height": { + "revision_height": "18", + "revision_number": "0" + } + } + } + ], "clients_consensus": [], "clients_metadata": [], "create_localhost": false, "next_client_sequence": "0", "params": { "allowed_clients": [ - "06-solomachine", - "07-tendermint" + "*" ] } }, "connection_genesis": { "client_connection_paths": [], - "connections": [], + "connections": [ + { + "client_id": "09-localhost", + "counterparty": { + "client_id": "09-localhost", + "connection_id": "connection-localhost", + "prefix": { + "key_prefix": "aWJj" + } + }, + "delay_period": "0", + "id": "connection-localhost", + "state": "STATE_OPEN", + "versions": [ + { + "features": [ + "ORDER_ORDERED", + "ORDER_UNORDERED" + ], + "identifier": "1" + } + ] + } + ], "next_connection_sequence": "0", "params": { "max_expected_time_per_block": "30000000000" @@ -536,7 +587,9 @@ "active_channels": [], "interchain_accounts": [], "params": { - "allow_messages": [], + "allow_messages": [ + "*" + ], "host_enabled": true }, "port": "icahost" @@ -544,8 +597,8 @@ }, "mint": { "minter": { - "annual_provisions": "6760121611446106.270106000000000000", - "inflation": "0.129999838684758106" + "annual_provisions": "6760123978529236.587874847213850985", + "inflation": "0.129999838684851257" }, "params": { "blocks_per_year": "6311520", @@ -553,10 +606,9 @@ "inflation_max": "0.200000000000000000", "inflation_min": "0.070000000000000000", "inflation_rate_change": "0.130000000000000000", - "mint_denom": "stake" + "mint_denom": "uarkeo" } }, - "params": null, "slashing": { "missed_blocks": [ { @@ -638,6 +690,8 @@ "status": "BOND_STATUS_BONDED", "tokens": "50000000000000000", "unbonding_height": "0", + "unbonding_ids": [], + "unbonding_on_hold_ref_count": "0", "unbonding_time": "1970-01-01T00:00:00Z" } ] @@ -648,40 +702,48 @@ "receive_enabled": true, "send_enabled": true }, - "port_id": "transfer" + "port_id": "transfer", + "total_escrowed": [] }, "upgrade": {}, "vesting": {} }, + "app_version": "null", "chain_id": "arkeo", - "consensus_params": { - "block": { - "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" - }, - "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" - }, - "validator": { - "pub_key_types": [ - "ed25519" - ] + "consensus": { + "params": { + "abci": { + "vote_extensions_enable_height": "0" + }, + "block": { + "max_bytes": "22020096", + "max_gas": "-1" + }, + "evidence": { + "max_age_duration": "172800000000000", + "max_age_num_blocks": "100000", + "max_bytes": "1048576" + }, + "validator": { + "pub_key_types": [ + "ed25519" + ] + }, + "version": { + "app": "0" + } }, - "version": {} - }, - "initial_height": "19", - "validators": [ - { - "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", - "name": "local", - "power": "50000000000", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + "validators": [ + { + "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", + "name": "local", + "power": "50000000000", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + } } - } - ] + ] + }, + "initial_height": 19 } \ No newline at end of file diff --git a/test/regression/mnt/exports/suites_core_send.json b/test/regression/mnt/exports/suites_core_send.json index 38bb6b97..fd63cdba 100644 --- a/test/regression/mnt/exports/suites_core_send.json +++ b/test/regression/mnt/exports/suites_core_send.json @@ -1,5 +1,6 @@ { - "app_hash": "", + "app_hash": null, + "app_name": "arkeo", "app_state": { "arkeo": { "contract_expiration_sets": [], @@ -8,7 +9,7 @@ "params": {}, "providers": [], "user_contract_sets": [], - "version": "1" + "version": "0" }, "auth": { "accounts": [ @@ -151,8 +152,8 @@ "address": "tarkeo1jv65s3grqf6v6jl3dp4t6c9t9rk99cd8t6gr9e", "coins": [ { - "amount": "3213171660", - "denom": "stake" + "amount": "3213171726", + "denom": "uarkeo" } ] }, @@ -171,13 +172,10 @@ "default_send_enabled": true, "send_enabled": [] }, + "send_enabled": [], "supply": [ { - "amount": "3213171660", - "denom": "stake" - }, - { - "amount": "52000000000000000", + "amount": "52000003213171726", "denom": "uarkeo" } ] @@ -217,23 +215,10 @@ } ] }, - "claimarkeo": { - "claim_records": [], - "module_account_balance": { - "amount": "0", - "denom": "uarkeo" - }, - "params": { - "claim_denom": "uarkeo", - "duration_of_decay": "3600s", - "duration_until_decay": "3600s", - "initial_gas_amount": null - } - }, "crisis": { "constant_fee": { "amount": "1000", - "denom": "stake" + "denom": "uarkeo" } }, "distribution": { @@ -252,8 +237,8 @@ "fee_pool": { "community_pool": [ { - "amount": "64263433.200000000000000000", - "denom": "stake" + "amount": "64263434.520000000000000000", + "denom": "uarkeo" } ] }, @@ -261,16 +246,16 @@ { "outstanding_rewards": [ { - "amount": "3148908226.800000000000000000", - "denom": "stake" + "amount": "3148908291.480000000000000000", + "denom": "uarkeo" } ], "validator_address": "tarkeovaloper1hnyy4gp5tgarpg3xu6w5cw4zsyphx2lyfn54sh" } ], "params": { - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", + "base_proposer_reward": "0.000000000000000000", + "bonus_proposer_reward": "0.000000000000000000", "community_tax": "0.020000000000000000", "withdraw_addr_enabled": true }, @@ -280,8 +265,8 @@ "accumulated": { "commission": [ { - "amount": "314890822.680000000000000000", - "denom": "stake" + "amount": "314890829.148000000000000000", + "denom": "uarkeo" } ] }, @@ -294,8 +279,8 @@ "period": "2", "rewards": [ { - "amount": "2834017404.120000000000000000", - "denom": "stake" + "amount": "2834017462.332000000000000000", + "denom": "uarkeo" } ] }, @@ -324,27 +309,42 @@ "gen_txs": [] }, "gov": { - "deposit_params": { + "constitution": "", + "deposit_params": null, + "deposits": [], + "params": { + "burn_proposal_deposit_prevote": false, + "burn_vote_quorum": false, + "burn_vote_veto": true, + "expedited_min_deposit": [ + { + "amount": "50000000", + "denom": "uarkeo" + } + ], + "expedited_threshold": "0.667000000000000000", + "expedited_voting_period": "86400s", "max_deposit_period": "172800s", "min_deposit": [ { "amount": "10000000", - "denom": "stake" + "denom": "uarkeo" } - ] - }, - "deposits": [], - "proposals": [], - "starting_proposal_id": "1", - "tally_params": { + ], + "min_deposit_ratio": "0.010000000000000000", + "min_initial_deposit_ratio": "0.000000000000000000", + "proposal_cancel_dest": "", + "proposal_cancel_ratio": "0.500000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", - "veto_threshold": "0.334000000000000000" + "veto_threshold": "0.334000000000000000", + "voting_period": "172800s" }, + "proposals": [], + "starting_proposal_id": "1", + "tally_params": null, "votes": [], - "voting_params": { - "voting_period": "172800s" - } + "voting_params": null }, "group": { "group_members": [], @@ -363,26 +363,68 @@ "channels": [], "commitments": [], "next_channel_sequence": "0", + "params": { + "upgrade_timeout": { + "height": { + "revision_height": "0", + "revision_number": "0" + }, + "timestamp": "600000000000" + } + }, "receipts": [], "recv_sequences": [], "send_sequences": [] }, "client_genesis": { - "clients": [], + "clients": [ + { + "client_id": "09-localhost", + "client_state": { + "@type": "/ibc.lightclients.localhost.v2.ClientState", + "latest_height": { + "revision_height": "3", + "revision_number": "0" + } + } + } + ], "clients_consensus": [], "clients_metadata": [], "create_localhost": false, "next_client_sequence": "0", "params": { "allowed_clients": [ - "06-solomachine", - "07-tendermint" + "*" ] } }, "connection_genesis": { "client_connection_paths": [], - "connections": [], + "connections": [ + { + "client_id": "09-localhost", + "counterparty": { + "client_id": "09-localhost", + "connection_id": "connection-localhost", + "prefix": { + "key_prefix": "aWJj" + } + }, + "delay_period": "0", + "id": "connection-localhost", + "state": "STATE_OPEN", + "versions": [ + { + "features": [ + "ORDER_ORDERED", + "ORDER_UNORDERED" + ], + "identifier": "1" + } + ] + } + ], "next_connection_sequence": "0", "params": { "max_expected_time_per_block": "30000000000" @@ -402,7 +444,9 @@ "active_channels": [], "interchain_accounts": [], "params": { - "allow_messages": [], + "allow_messages": [ + "*" + ], "host_enabled": true }, "port": "icahost" @@ -410,8 +454,8 @@ }, "mint": { "minter": { - "annual_provisions": "6759998601845892.676000000000000000", - "inflation": "0.129999973112421013" + "annual_provisions": "6759998880320819.659730123458173168", + "inflation": "0.129999973112422838" }, "params": { "blocks_per_year": "6311520", @@ -419,10 +463,9 @@ "inflation_max": "0.200000000000000000", "inflation_min": "0.070000000000000000", "inflation_rate_change": "0.130000000000000000", - "mint_denom": "stake" + "mint_denom": "uarkeo" } }, - "params": null, "slashing": { "missed_blocks": [ { @@ -504,6 +547,8 @@ "status": "BOND_STATUS_BONDED", "tokens": "50000000000000000", "unbonding_height": "0", + "unbonding_ids": [], + "unbonding_on_hold_ref_count": "0", "unbonding_time": "1970-01-01T00:00:00Z" } ] @@ -514,40 +559,48 @@ "receive_enabled": true, "send_enabled": true }, - "port_id": "transfer" + "port_id": "transfer", + "total_escrowed": [] }, "upgrade": {}, "vesting": {} }, + "app_version": "null", "chain_id": "arkeo", - "consensus_params": { - "block": { - "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" - }, - "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" - }, - "validator": { - "pub_key_types": [ - "ed25519" - ] + "consensus": { + "params": { + "abci": { + "vote_extensions_enable_height": "0" + }, + "block": { + "max_bytes": "22020096", + "max_gas": "-1" + }, + "evidence": { + "max_age_duration": "172800000000000", + "max_age_num_blocks": "100000", + "max_bytes": "1048576" + }, + "validator": { + "pub_key_types": [ + "ed25519" + ] + }, + "version": { + "app": "0" + } }, - "version": {} - }, - "initial_height": "4", - "validators": [ - { - "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", - "name": "local", - "power": "50000000000", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + "validators": [ + { + "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", + "name": "local", + "power": "50000000000", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + } } - } - ] + ] + }, + "initial_height": 4 } \ No newline at end of file diff --git a/test/regression/mnt/exports/suites_initialize.json b/test/regression/mnt/exports/suites_initialize.json index 67335305..e768c2fd 100644 --- a/test/regression/mnt/exports/suites_initialize.json +++ b/test/regression/mnt/exports/suites_initialize.json @@ -1,5 +1,6 @@ { - "app_hash": "", + "app_hash": null, + "app_name": "arkeo", "app_state": { "arkeo": { "contract_expiration_sets": [], @@ -8,7 +9,7 @@ "params": {}, "providers": [], "user_contract_sets": [], - "version": "1" + "version": "0" }, "auth": { "accounts": [ @@ -148,8 +149,8 @@ "address": "tarkeo1jv65s3grqf6v6jl3dp4t6c9t9rk99cd8t6gr9e", "coins": [ { - "amount": "2142114514", - "denom": "stake" + "amount": "2142114536", + "denom": "uarkeo" } ] }, @@ -168,13 +169,10 @@ "default_send_enabled": true, "send_enabled": [] }, + "send_enabled": [], "supply": [ { - "amount": "2142114514", - "denom": "stake" - }, - { - "amount": "52000000000000000", + "amount": "52000002142114536", "denom": "uarkeo" } ] @@ -214,23 +212,10 @@ } ] }, - "claimarkeo": { - "claim_records": [], - "module_account_balance": { - "amount": "0", - "denom": "uarkeo" - }, - "params": { - "claim_denom": "uarkeo", - "duration_of_decay": "3600s", - "duration_until_decay": "3600s", - "initial_gas_amount": null - } - }, "crisis": { "constant_fee": { "amount": "1000", - "denom": "stake" + "denom": "uarkeo" } }, "distribution": { @@ -249,8 +234,8 @@ "fee_pool": { "community_pool": [ { - "amount": "42842290.280000000000000000", - "denom": "stake" + "amount": "42842290.720000000000000000", + "denom": "uarkeo" } ] }, @@ -258,16 +243,16 @@ { "outstanding_rewards": [ { - "amount": "2099272223.720000000000000000", - "denom": "stake" + "amount": "2099272245.280000000000000000", + "denom": "uarkeo" } ], "validator_address": "tarkeovaloper1hnyy4gp5tgarpg3xu6w5cw4zsyphx2lyfn54sh" } ], "params": { - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", + "base_proposer_reward": "0.000000000000000000", + "bonus_proposer_reward": "0.000000000000000000", "community_tax": "0.020000000000000000", "withdraw_addr_enabled": true }, @@ -277,8 +262,8 @@ "accumulated": { "commission": [ { - "amount": "209927222.372000000000000000", - "denom": "stake" + "amount": "209927224.528000000000000000", + "denom": "uarkeo" } ] }, @@ -291,8 +276,8 @@ "period": "2", "rewards": [ { - "amount": "1889345001.348000000000000000", - "denom": "stake" + "amount": "1889345020.752000000000000000", + "denom": "uarkeo" } ] }, @@ -321,27 +306,42 @@ "gen_txs": [] }, "gov": { - "deposit_params": { + "constitution": "", + "deposit_params": null, + "deposits": [], + "params": { + "burn_proposal_deposit_prevote": false, + "burn_vote_quorum": false, + "burn_vote_veto": true, + "expedited_min_deposit": [ + { + "amount": "50000000", + "denom": "uarkeo" + } + ], + "expedited_threshold": "0.667000000000000000", + "expedited_voting_period": "86400s", "max_deposit_period": "172800s", "min_deposit": [ { "amount": "10000000", - "denom": "stake" + "denom": "uarkeo" } - ] - }, - "deposits": [], - "proposals": [], - "starting_proposal_id": "1", - "tally_params": { + ], + "min_deposit_ratio": "0.010000000000000000", + "min_initial_deposit_ratio": "0.000000000000000000", + "proposal_cancel_dest": "", + "proposal_cancel_ratio": "0.500000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", - "veto_threshold": "0.334000000000000000" + "veto_threshold": "0.334000000000000000", + "voting_period": "172800s" }, + "proposals": [], + "starting_proposal_id": "1", + "tally_params": null, "votes": [], - "voting_params": { - "voting_period": "172800s" - } + "voting_params": null }, "group": { "group_members": [], @@ -360,26 +360,68 @@ "channels": [], "commitments": [], "next_channel_sequence": "0", + "params": { + "upgrade_timeout": { + "height": { + "revision_height": "0", + "revision_number": "0" + }, + "timestamp": "600000000000" + } + }, "receipts": [], "recv_sequences": [], "send_sequences": [] }, "client_genesis": { - "clients": [], + "clients": [ + { + "client_id": "09-localhost", + "client_state": { + "@type": "/ibc.lightclients.localhost.v2.ClientState", + "latest_height": { + "revision_height": "2", + "revision_number": "0" + } + } + } + ], "clients_consensus": [], "clients_metadata": [], "create_localhost": false, "next_client_sequence": "0", "params": { "allowed_clients": [ - "06-solomachine", - "07-tendermint" + "*" ] } }, "connection_genesis": { "client_connection_paths": [], - "connections": [], + "connections": [ + { + "client_id": "09-localhost", + "counterparty": { + "client_id": "09-localhost", + "connection_id": "connection-localhost", + "prefix": { + "key_prefix": "aWJj" + } + }, + "delay_period": "0", + "id": "connection-localhost", + "state": "STATE_OPEN", + "versions": [ + { + "features": [ + "ORDER_ORDERED", + "ORDER_UNORDERED" + ], + "identifier": "1" + } + ] + } + ], "next_connection_sequence": "0", "params": { "max_expected_time_per_block": "30000000000" @@ -399,7 +441,9 @@ "active_channels": [], "interchain_accounts": [], "params": { - "allow_messages": [], + "allow_messages": [ + "*" + ], "host_enabled": true }, "port": "icahost" @@ -407,8 +451,8 @@ }, "mint": { "minter": { - "annual_provisions": "6759999067897261.784000000000000000", - "inflation": "0.129999982074947342" + "annual_provisions": "6759999207134722.421242256517847300", + "inflation": "0.129999982074947950" }, "params": { "blocks_per_year": "6311520", @@ -416,10 +460,9 @@ "inflation_max": "0.200000000000000000", "inflation_min": "0.070000000000000000", "inflation_rate_change": "0.130000000000000000", - "mint_denom": "stake" + "mint_denom": "uarkeo" } }, - "params": null, "slashing": { "missed_blocks": [ { @@ -501,6 +544,8 @@ "status": "BOND_STATUS_BONDED", "tokens": "50000000000000000", "unbonding_height": "0", + "unbonding_ids": [], + "unbonding_on_hold_ref_count": "0", "unbonding_time": "1970-01-01T00:00:00Z" } ] @@ -511,40 +556,48 @@ "receive_enabled": true, "send_enabled": true }, - "port_id": "transfer" + "port_id": "transfer", + "total_escrowed": [] }, "upgrade": {}, "vesting": {} }, + "app_version": "null", "chain_id": "arkeo", - "consensus_params": { - "block": { - "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" - }, - "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" - }, - "validator": { - "pub_key_types": [ - "ed25519" - ] + "consensus": { + "params": { + "abci": { + "vote_extensions_enable_height": "0" + }, + "block": { + "max_bytes": "22020096", + "max_gas": "-1" + }, + "evidence": { + "max_age_duration": "172800000000000", + "max_age_num_blocks": "100000", + "max_bytes": "1048576" + }, + "validator": { + "pub_key_types": [ + "ed25519" + ] + }, + "version": { + "app": "0" + } }, - "version": {} - }, - "initial_height": "3", - "validators": [ - { - "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", - "name": "local", - "power": "50000000000", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + "validators": [ + { + "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", + "name": "local", + "power": "50000000000", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + } } - } - ] + ] + }, + "initial_height": 3 } \ No newline at end of file diff --git a/test/regression/mnt/exports/suites_providers_providers.json b/test/regression/mnt/exports/suites_providers_providers.json index b88c062d..f1341408 100644 --- a/test/regression/mnt/exports/suites_providers_providers.json +++ b/test/regression/mnt/exports/suites_providers_providers.json @@ -1,5 +1,6 @@ { - "app_hash": "", + "app_hash": null, + "app_name": "arkeo", "app_state": { "arkeo": { "contract_expiration_sets": [], @@ -8,7 +9,7 @@ "params": {}, "providers": [], "user_contract_sets": [], - "version": "1" + "version": "0" }, "auth": { "accounts": [ @@ -162,8 +163,8 @@ "address": "tarkeo1jv65s3grqf6v6jl3dp4t6c9t9rk99cd8t6gr9e", "coins": [ { - "amount": "6426342655", - "denom": "stake" + "amount": "6426342986", + "denom": "uarkeo" } ] }, @@ -182,13 +183,10 @@ "default_send_enabled": true, "send_enabled": [] }, + "send_enabled": [], "supply": [ { - "amount": "6426342655", - "denom": "stake" - }, - { - "amount": "52000000000000000", + "amount": "52000006426342986", "denom": "uarkeo" } ] @@ -228,23 +226,10 @@ } ] }, - "claimarkeo": { - "claim_records": [], - "module_account_balance": { - "amount": "0", - "denom": "uarkeo" - }, - "params": { - "claim_denom": "uarkeo", - "duration_of_decay": "3600s", - "duration_until_decay": "3600s", - "initial_gas_amount": null - } - }, "crisis": { "constant_fee": { "amount": "1000", - "denom": "stake" + "denom": "uarkeo" } }, "distribution": { @@ -263,8 +248,8 @@ "fee_pool": { "community_pool": [ { - "amount": "128526853.100000000000000000", - "denom": "stake" + "amount": "128526859.720000000000000000", + "denom": "uarkeo" } ] }, @@ -272,16 +257,16 @@ { "outstanding_rewards": [ { - "amount": "6297815801.900000000000000000", - "denom": "stake" + "amount": "6297816126.280000000000000000", + "denom": "uarkeo" } ], "validator_address": "tarkeovaloper1hnyy4gp5tgarpg3xu6w5cw4zsyphx2lyfn54sh" } ], "params": { - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", + "base_proposer_reward": "0.000000000000000000", + "bonus_proposer_reward": "0.000000000000000000", "community_tax": "0.020000000000000000", "withdraw_addr_enabled": true }, @@ -291,8 +276,8 @@ "accumulated": { "commission": [ { - "amount": "629781580.190000000000000000", - "denom": "stake" + "amount": "629781612.628000000000000000", + "denom": "uarkeo" } ] }, @@ -305,8 +290,8 @@ "period": "2", "rewards": [ { - "amount": "5668034221.710000000000000000", - "denom": "stake" + "amount": "5668034513.652000000000000000", + "denom": "uarkeo" } ] }, @@ -335,27 +320,42 @@ "gen_txs": [] }, "gov": { - "deposit_params": { + "constitution": "", + "deposit_params": null, + "deposits": [], + "params": { + "burn_proposal_deposit_prevote": false, + "burn_vote_quorum": false, + "burn_vote_veto": true, + "expedited_min_deposit": [ + { + "amount": "50000000", + "denom": "uarkeo" + } + ], + "expedited_threshold": "0.667000000000000000", + "expedited_voting_period": "86400s", "max_deposit_period": "172800s", "min_deposit": [ { "amount": "10000000", - "denom": "stake" + "denom": "uarkeo" } - ] - }, - "deposits": [], - "proposals": [], - "starting_proposal_id": "1", - "tally_params": { + ], + "min_deposit_ratio": "0.010000000000000000", + "min_initial_deposit_ratio": "0.000000000000000000", + "proposal_cancel_dest": "", + "proposal_cancel_ratio": "0.500000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", - "veto_threshold": "0.334000000000000000" + "veto_threshold": "0.334000000000000000", + "voting_period": "172800s" }, + "proposals": [], + "starting_proposal_id": "1", + "tally_params": null, "votes": [], - "voting_params": { - "voting_period": "172800s" - } + "voting_params": null }, "group": { "group_members": [], @@ -374,26 +374,68 @@ "channels": [], "commitments": [], "next_channel_sequence": "0", + "params": { + "upgrade_timeout": { + "height": { + "revision_height": "0", + "revision_number": "0" + }, + "timestamp": "600000000000" + } + }, "receipts": [], "recv_sequences": [], "send_sequences": [] }, "client_genesis": { - "clients": [], + "clients": [ + { + "client_id": "09-localhost", + "client_state": { + "@type": "/ibc.lightclients.localhost.v2.ClientState", + "latest_height": { + "revision_height": "6", + "revision_number": "0" + } + } + } + ], "clients_consensus": [], "clients_metadata": [], "create_localhost": false, "next_client_sequence": "0", "params": { "allowed_clients": [ - "06-solomachine", - "07-tendermint" + "*" ] } }, "connection_genesis": { "client_connection_paths": [], - "connections": [], + "connections": [ + { + "client_id": "09-localhost", + "counterparty": { + "client_id": "09-localhost", + "connection_id": "connection-localhost", + "prefix": { + "key_prefix": "aWJj" + } + }, + "delay_period": "0", + "id": "connection-localhost", + "state": "STATE_OPEN", + "versions": [ + { + "features": [ + "ORDER_ORDERED", + "ORDER_UNORDERED" + ], + "identifier": "1" + } + ] + } + ], "next_connection_sequence": "0", "params": { "max_expected_time_per_block": "30000000000" @@ -413,7 +455,9 @@ "active_channels": [], "interchain_accounts": [], "params": { - "allow_messages": [], + "allow_messages": [ + "*" + ], "host_enabled": true }, "port": "icahost" @@ -421,8 +465,8 @@ }, "mint": { "minter": { - "annual_provisions": "6759997203691785.352000000000000000", - "inflation": "0.129999946224842026" + "annual_provisions": "6759997899879145.760700882792909356", + "inflation": "0.129999946224851156" }, "params": { "blocks_per_year": "6311520", @@ -430,10 +474,9 @@ "inflation_max": "0.200000000000000000", "inflation_min": "0.070000000000000000", "inflation_rate_change": "0.130000000000000000", - "mint_denom": "stake" + "mint_denom": "uarkeo" } }, - "params": null, "slashing": { "missed_blocks": [ { @@ -515,6 +558,8 @@ "status": "BOND_STATUS_BONDED", "tokens": "50000000000000000", "unbonding_height": "0", + "unbonding_ids": [], + "unbonding_on_hold_ref_count": "0", "unbonding_time": "1970-01-01T00:00:00Z" } ] @@ -525,40 +570,48 @@ "receive_enabled": true, "send_enabled": true }, - "port_id": "transfer" + "port_id": "transfer", + "total_escrowed": [] }, "upgrade": {}, "vesting": {} }, + "app_version": "null", "chain_id": "arkeo", - "consensus_params": { - "block": { - "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" - }, - "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" - }, - "validator": { - "pub_key_types": [ - "ed25519" - ] + "consensus": { + "params": { + "abci": { + "vote_extensions_enable_height": "0" + }, + "block": { + "max_bytes": "22020096", + "max_gas": "-1" + }, + "evidence": { + "max_age_duration": "172800000000000", + "max_age_num_blocks": "100000", + "max_bytes": "1048576" + }, + "validator": { + "pub_key_types": [ + "ed25519" + ] + }, + "version": { + "app": "0" + } }, - "version": {} - }, - "initial_height": "7", - "validators": [ - { - "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", - "name": "local", - "power": "50000000000", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + "validators": [ + { + "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", + "name": "local", + "power": "50000000000", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + } } - } - ] + ] + }, + "initial_height": 7 } \ No newline at end of file diff --git a/test/regression/mnt/exports/suites_sentinel_contract_config.json b/test/regression/mnt/exports/suites_sentinel_contract_config.json index 55f4ddd5..e146fd5d 100644 --- a/test/regression/mnt/exports/suites_sentinel_contract_config.json +++ b/test/regression/mnt/exports/suites_sentinel_contract_config.json @@ -1,5 +1,6 @@ { - "app_hash": "", + "app_hash": null, + "app_name": "arkeo", "app_state": { "arkeo": { "contract_expiration_sets": [], @@ -97,7 +98,7 @@ } ], "user_contract_sets": [], - "version": "1" + "version": "0" }, "auth": { "accounts": [ @@ -265,7 +266,7 @@ "coins": [ { "amount": "1071077891", - "denom": "stake" + "denom": "uarkeo" } ] } @@ -275,13 +276,10 @@ "default_send_enabled": true, "send_enabled": [] }, + "send_enabled": [], "supply": [ { - "amount": "1071077891", - "denom": "stake" - }, - { - "amount": "52001000000000300", + "amount": "52001001071078191", "denom": "uarkeo" } ] @@ -321,23 +319,10 @@ } ] }, - "claimarkeo": { - "claim_records": [], - "module_account_balance": { - "amount": "0", - "denom": "uarkeo" - }, - "params": { - "claim_denom": "uarkeo", - "duration_of_decay": "3600s", - "duration_until_decay": "3600s", - "initial_gas_amount": null - } - }, "crisis": { "constant_fee": { "amount": "1000", - "denom": "stake" + "denom": "uarkeo" } }, "distribution": { @@ -363,8 +348,8 @@ } ], "params": { - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", + "base_proposer_reward": "0.000000000000000000", + "bonus_proposer_reward": "0.000000000000000000", "community_tax": "0.020000000000000000", "withdraw_addr_enabled": true }, @@ -408,27 +393,42 @@ "gen_txs": [] }, "gov": { - "deposit_params": { + "constitution": "", + "deposit_params": null, + "deposits": [], + "params": { + "burn_proposal_deposit_prevote": false, + "burn_vote_quorum": false, + "burn_vote_veto": true, + "expedited_min_deposit": [ + { + "amount": "50000000", + "denom": "uarkeo" + } + ], + "expedited_threshold": "0.667000000000000000", + "expedited_voting_period": "86400s", "max_deposit_period": "172800s", "min_deposit": [ { "amount": "10000000", - "denom": "stake" + "denom": "uarkeo" } - ] - }, - "deposits": [], - "proposals": [], - "starting_proposal_id": "1", - "tally_params": { + ], + "min_deposit_ratio": "0.010000000000000000", + "min_initial_deposit_ratio": "0.000000000000000000", + "proposal_cancel_dest": "", + "proposal_cancel_ratio": "0.500000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", - "veto_threshold": "0.334000000000000000" + "veto_threshold": "0.334000000000000000", + "voting_period": "172800s" }, + "proposals": [], + "starting_proposal_id": "1", + "tally_params": null, "votes": [], - "voting_params": { - "voting_period": "172800s" - } + "voting_params": null }, "group": { "group_members": [], @@ -447,26 +447,68 @@ "channels": [], "commitments": [], "next_channel_sequence": "0", + "params": { + "upgrade_timeout": { + "height": { + "revision_height": "0", + "revision_number": "0" + }, + "timestamp": "600000000000" + } + }, "receipts": [], "recv_sequences": [], "send_sequences": [] }, "client_genesis": { - "clients": [], + "clients": [ + { + "client_id": "09-localhost", + "client_state": { + "@type": "/ibc.lightclients.localhost.v2.ClientState", + "latest_height": { + "revision_height": "1", + "revision_number": "0" + } + } + } + ], "clients_consensus": [], "clients_metadata": [], "create_localhost": false, "next_client_sequence": "0", "params": { "allowed_clients": [ - "06-solomachine", - "07-tendermint" + "*" ] } }, "connection_genesis": { "client_connection_paths": [], - "connections": [], + "connections": [ + { + "client_id": "09-localhost", + "counterparty": { + "client_id": "09-localhost", + "connection_id": "connection-localhost", + "prefix": { + "key_prefix": "aWJj" + } + }, + "delay_period": "0", + "id": "connection-localhost", + "state": "STATE_OPEN", + "versions": [ + { + "features": [ + "ORDER_ORDERED", + "ORDER_UNORDERED" + ], + "identifier": "1" + } + ] + } + ], "next_connection_sequence": "0", "params": { "max_expected_time_per_block": "30000000000" @@ -486,7 +528,9 @@ "active_channels": [], "interchain_accounts": [], "params": { - "allow_messages": [], + "allow_messages": [ + "*" + ], "host_enabled": true }, "port": "icahost" @@ -503,10 +547,9 @@ "inflation_max": "0.200000000000000000", "inflation_min": "0.070000000000000000", "inflation_rate_change": "0.130000000000000000", - "mint_denom": "stake" + "mint_denom": "uarkeo" } }, - "params": null, "slashing": { "missed_blocks": [ { @@ -588,6 +631,8 @@ "status": "BOND_STATUS_BONDED", "tokens": "50000000000000000", "unbonding_height": "0", + "unbonding_ids": [], + "unbonding_on_hold_ref_count": "0", "unbonding_time": "1970-01-01T00:00:00Z" } ] @@ -598,40 +643,48 @@ "receive_enabled": true, "send_enabled": true }, - "port_id": "transfer" + "port_id": "transfer", + "total_escrowed": [] }, "upgrade": {}, "vesting": {} }, + "app_version": "null", "chain_id": "arkeo", - "consensus_params": { - "block": { - "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" - }, - "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" - }, - "validator": { - "pub_key_types": [ - "ed25519" - ] + "consensus": { + "params": { + "abci": { + "vote_extensions_enable_height": "0" + }, + "block": { + "max_bytes": "22020096", + "max_gas": "-1" + }, + "evidence": { + "max_age_duration": "172800000000000", + "max_age_num_blocks": "100000", + "max_bytes": "1048576" + }, + "validator": { + "pub_key_types": [ + "ed25519" + ] + }, + "version": { + "app": "0" + } }, - "version": {} - }, - "initial_height": "2", - "validators": [ - { - "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", - "name": "local", - "power": "50000000000", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + "validators": [ + { + "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", + "name": "local", + "power": "50000000000", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + } } - } - ] + ] + }, + "initial_height": 2 } \ No newline at end of file diff --git a/test/regression/mnt/exports/suites_sentinel_sentinel.json b/test/regression/mnt/exports/suites_sentinel_sentinel.json index 9b23cd6c..6d460ace 100644 --- a/test/regression/mnt/exports/suites_sentinel_sentinel.json +++ b/test/regression/mnt/exports/suites_sentinel_sentinel.json @@ -1,5 +1,6 @@ { - "app_hash": "", + "app_hash": null, + "app_name": "arkeo", "app_state": { "arkeo": { "contract_expiration_sets": [], @@ -8,7 +9,7 @@ "params": {}, "providers": [], "user_contract_sets": [], - "version": "1" + "version": "0" }, "auth": { "accounts": [ @@ -158,7 +159,7 @@ "coins": [ { "amount": "1071057294", - "denom": "stake" + "denom": "uarkeo" } ] } @@ -168,13 +169,10 @@ "default_send_enabled": true, "send_enabled": [] }, + "send_enabled": [], "supply": [ { - "amount": "1071057294", - "denom": "stake" - }, - { - "amount": "52000000000000000", + "amount": "52000001071057294", "denom": "uarkeo" } ] @@ -214,23 +212,10 @@ } ] }, - "claimarkeo": { - "claim_records": [], - "module_account_balance": { - "amount": "0", - "denom": "uarkeo" - }, - "params": { - "claim_denom": "uarkeo", - "duration_of_decay": "3600s", - "duration_until_decay": "3600s", - "initial_gas_amount": null - } - }, "crisis": { "constant_fee": { "amount": "1000", - "denom": "stake" + "denom": "uarkeo" } }, "distribution": { @@ -256,8 +241,8 @@ } ], "params": { - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", + "base_proposer_reward": "0.000000000000000000", + "bonus_proposer_reward": "0.000000000000000000", "community_tax": "0.020000000000000000", "withdraw_addr_enabled": true }, @@ -301,27 +286,42 @@ "gen_txs": [] }, "gov": { - "deposit_params": { + "constitution": "", + "deposit_params": null, + "deposits": [], + "params": { + "burn_proposal_deposit_prevote": false, + "burn_vote_quorum": false, + "burn_vote_veto": true, + "expedited_min_deposit": [ + { + "amount": "50000000", + "denom": "uarkeo" + } + ], + "expedited_threshold": "0.667000000000000000", + "expedited_voting_period": "86400s", "max_deposit_period": "172800s", "min_deposit": [ { "amount": "10000000", - "denom": "stake" + "denom": "uarkeo" } - ] - }, - "deposits": [], - "proposals": [], - "starting_proposal_id": "1", - "tally_params": { + ], + "min_deposit_ratio": "0.010000000000000000", + "min_initial_deposit_ratio": "0.000000000000000000", + "proposal_cancel_dest": "", + "proposal_cancel_ratio": "0.500000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", - "veto_threshold": "0.334000000000000000" + "veto_threshold": "0.334000000000000000", + "voting_period": "172800s" }, + "proposals": [], + "starting_proposal_id": "1", + "tally_params": null, "votes": [], - "voting_params": { - "voting_period": "172800s" - } + "voting_params": null }, "group": { "group_members": [], @@ -340,26 +340,68 @@ "channels": [], "commitments": [], "next_channel_sequence": "0", + "params": { + "upgrade_timeout": { + "height": { + "revision_height": "0", + "revision_number": "0" + }, + "timestamp": "600000000000" + } + }, "receipts": [], "recv_sequences": [], "send_sequences": [] }, "client_genesis": { - "clients": [], + "clients": [ + { + "client_id": "09-localhost", + "client_state": { + "@type": "/ibc.lightclients.localhost.v2.ClientState", + "latest_height": { + "revision_height": "1", + "revision_number": "0" + } + } + } + ], "clients_consensus": [], "clients_metadata": [], "create_localhost": false, "next_client_sequence": "0", "params": { "allowed_clients": [ - "06-solomachine", - "07-tendermint" + "*" ] } }, "connection_genesis": { "client_connection_paths": [], - "connections": [], + "connections": [ + { + "client_id": "09-localhost", + "counterparty": { + "client_id": "09-localhost", + "connection_id": "connection-localhost", + "prefix": { + "key_prefix": "aWJj" + } + }, + "delay_period": "0", + "id": "connection-localhost", + "state": "STATE_OPEN", + "versions": [ + { + "features": [ + "ORDER_ORDERED", + "ORDER_UNORDERED" + ], + "identifier": "1" + } + ] + } + ], "next_connection_sequence": "0", "params": { "max_expected_time_per_block": "30000000000" @@ -379,7 +421,9 @@ "active_channels": [], "interchain_accounts": [], "params": { - "allow_messages": [], + "allow_messages": [ + "*" + ], "host_enabled": true }, "port": "icahost" @@ -396,10 +440,9 @@ "inflation_max": "0.200000000000000000", "inflation_min": "0.070000000000000000", "inflation_rate_change": "0.130000000000000000", - "mint_denom": "stake" + "mint_denom": "uarkeo" } }, - "params": null, "slashing": { "missed_blocks": [ { @@ -481,6 +524,8 @@ "status": "BOND_STATUS_BONDED", "tokens": "50000000000000000", "unbonding_height": "0", + "unbonding_ids": [], + "unbonding_on_hold_ref_count": "0", "unbonding_time": "1970-01-01T00:00:00Z" } ] @@ -491,40 +536,48 @@ "receive_enabled": true, "send_enabled": true }, - "port_id": "transfer" + "port_id": "transfer", + "total_escrowed": [] }, "upgrade": {}, "vesting": {} }, + "app_version": "null", "chain_id": "arkeo", - "consensus_params": { - "block": { - "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" - }, - "evidence": { - "max_age_duration": "172800000000000", - "max_age_num_blocks": "100000", - "max_bytes": "1048576" - }, - "validator": { - "pub_key_types": [ - "ed25519" - ] + "consensus": { + "params": { + "abci": { + "vote_extensions_enable_height": "0" + }, + "block": { + "max_bytes": "22020096", + "max_gas": "-1" + }, + "evidence": { + "max_age_duration": "172800000000000", + "max_age_num_blocks": "100000", + "max_bytes": "1048576" + }, + "validator": { + "pub_key_types": [ + "ed25519" + ] + }, + "version": { + "app": "0" + } }, - "version": {} - }, - "initial_height": "2", - "validators": [ - { - "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", - "name": "local", - "power": "50000000000", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + "validators": [ + { + "address": "5C887D7F98C1B007B7DA9AC180DBB9E66F3C7680", + "name": "local", + "power": "50000000000", + "pub_key": { + "type": "tendermint/PubKeyEd25519", + "value": "6ERoG0djS6fNNdNZCezEL8e8aSdffT87d2sJMK5TXVo=" + } } - } - ] + ] + }, + "initial_height": 2 } \ No newline at end of file diff --git a/x/arkeo/keeper/manager.go b/x/arkeo/keeper/manager.go index 56c3f466..9281f7d4 100644 --- a/x/arkeo/keeper/manager.go +++ b/x/arkeo/keeper/manager.go @@ -41,8 +41,8 @@ func (mgr *Manager) BeginBlock(ctx cosmos.Context) error { mgr.keeper.SetVersion(ctx, ver) // update stored version var votes = []abci.VoteInfo{} - for i := 0; i <= ctx.CometInfo().GetLastCommit().Votes().Len(); i++ { - vote := ctx.CometInfo().GetLastCommit().Votes().Get(0) + for i := 0; i < ctx.CometInfo().GetLastCommit().Votes().Len(); i++ { + vote := ctx.CometInfo().GetLastCommit().Votes().Get(i) abciVote := abci.VoteInfo{ Validator: abci.Validator{ Address: vote.Validator().Address(), @@ -221,10 +221,11 @@ func (mgr Manager) ValidatorPayout(ctx cosmos.Context, votes []abci.VoteInfo) er } for _, vote := range votes { - // if !vote.SignedLastBlock { - // ctx.Logger().Info("validator rewards skipped due to lack of signature", "validator", string(vote.Validator.Address)) - // continue - // } + + if vote.BlockIdFlag.String() == "BLOCK_ID_FLAG_ABSENT" { + ctx.Logger().Info("validator rewards skipped due to lack of signature", "validator", string(vote.Validator.Address)) + continue + } val, err := mgr.sk.ValidatorByConsAddr(ctx, vote.Validator.Address) if err != nil {