diff --git a/.circleci/config.yml b/.circleci/config.yml index a8d42872e..116bdc866 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: name: Get metalinter command: | export PATH="$GOBIN:$PATH" - make get_tools + make get_dev_tools - run: name: Lint source command: | @@ -85,6 +85,54 @@ jobs: export PATH="$GOBIN:$PATH" make test_cli + test_sim_modules: + <<: *defaults + parallelism: 1 + steps: + - attach_workspace: + at: /tmp/workspace + - restore_cache: + key: v1-pkg-cache + - restore_cache: + key: v1-tree-{{ .Environment.CIRCLE_SHA1 }} + - run: + name: Test individual module simulations + command: | + export PATH="$GOBIN:$PATH" + make test_sim_modules + + test_sim_gaia_nondeterminism: + <<: *defaults + parallelism: 1 + steps: + - attach_workspace: + at: /tmp/workspace + - restore_cache: + key: v1-pkg-cache + - restore_cache: + key: v1-tree-{{ .Environment.CIRCLE_SHA1 }} + - run: + name: Test individual module simulations + command: | + export PATH="$GOBIN:$PATH" + make test_sim_gaia_nondeterminism + + test_sim_gaia_fast: + <<: *defaults + parallelism: 1 + steps: + - attach_workspace: + at: /tmp/workspace + - restore_cache: + key: v1-pkg-cache + - restore_cache: + key: v1-tree-{{ .Environment.CIRCLE_SHA1 }} + - run: + name: Test full Gaia simulation + command: | + export PATH="$GOBIN:$PATH" + make test_sim_gaia_fast + test_cover: <<: *defaults parallelism: 4 @@ -101,9 +149,9 @@ jobs: command: | export PATH="$GOBIN:$PATH" make install - for pkg in $(go list github.com/cosmos/cosmos-sdk/... | grep -v /vendor/ | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test | circleci tests split --split-by=timings); do + for pkg in $(go list github.com/cosmos/cosmos-sdk/... | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test | grep -v '/simulation' | circleci tests split --split-by=timings); do id=$(basename "$pkg") - GOCACHE=off go test -v -timeout 8m -race -coverprofile=/tmp/workspace/profiles/$id.out -covermode=atomic "$pkg" | tee "/tmp/logs/$id-$RANDOM.log" + GOCACHE=off go test -timeout 8m -race -coverprofile=/tmp/workspace/profiles/$id.out -covermode=atomic "$pkg" | tee "/tmp/logs/$id-$RANDOM.log" done - persist_to_workspace: root: /tmp/workspace @@ -133,6 +181,29 @@ jobs: name: upload command: bash <(curl -s https://codecov.io/bash) -f coverage.txt + localnet: + working_directory: /home/circleci/.go_workspace/src/github.com/cosmos/cosmos-sdk + machine: + image: circleci/classic:latest + environment: + GOBIN: /home/circleci/.go_workspace/bin + GOPATH: /home/circleci/.go_workspace/ + GOOS: linux + GOARCH: amd64 + parallelism: 1 + steps: + - checkout + - run: + name: run localnet and exit on failure + command: | + set -x + make get_tools + make get_vendor_deps + make build-linux + make localnet-start + ./scripts/localnet-blocks-test.sh 40 5 10 localhost + + workflows: version: 2 test-suite: @@ -144,9 +215,21 @@ workflows: - test_cli: requires: - setup_dependencies + - test_sim_modules: + requires: + - setup_dependencies + - test_sim_gaia_nondeterminism: + requires: + - setup_dependencies + - test_sim_gaia_fast: + requires: + - setup_dependencies - test_cover: requires: - setup_dependencies + - localnet: + requires: + - setup_dependencies - upload_coverage: requires: - test_cover diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a85e301ae..f7e2d0fd6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,16 +1,17 @@ - +☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > --> -* [ ] Updated all relevant documentation (`docs/`) -* [ ] Updated all relevant code comments -* [ ] Wrote tests -* [ ] Updated `CHANGELOG.md` -* [ ] Updated `cmd/gaia` and `examples/` +- [ ] Linked to github-issue with discussion and accepted design OR link to spec that describes this work. +- [ ] Updated all relevant documentation (`docs/`) +- [ ] Updated all relevant code comments +- [ ] Wrote tests +- [ ] Added entries in `PENDING.md` that include links to the relevant issue or PR that most accurately describes the change. +- [ ] Updated `cmd/gaia` and `examples/` ___________________________________ For Admin Use: -* [ ] Added appropriate labels to PR (ex. wip, ready-for-review, docs) -* [ ] Reviewers Assigned -* [ ] Squashed all commits, uses message "Merge pull request #XYZ: [title]" ([coding standards](https://github.com/tendermint/coding/blob/master/README.md#merging-a-pr)) +- [ ] Added appropriate labels to PR (ex. wip, ready-for-review, docs) +- [ ] Reviewers Assigned +- [ ] Squashed all commits, uses message "Merge pull request #XYZ: [title]" ([coding standards](https://github.com/tendermint/coding/blob/master/README.md#merging-a-pr)) diff --git a/CHANGELOG.md b/CHANGELOG.md index 538d30c6e..f6b91607a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,119 @@ # Changelog +## 0.24.0 + +*August 13th, 2018* + +BREAKING CHANGES + +* Gaia REST API (`gaiacli advanced rest-server`) + - [x/stake] \#1880 More REST-ful endpoints (large refactor) + - [x/slashing] \#1866 `/slashing/signing_info` takes cosmosvalpub instead of cosmosvaladdr + - use time.Time instead of int64 for time. See Tendermint v0.23.0 + - Signatures are no longer Amino encoded with prefixes (just encoded as raw + bytes) - see Tendermint v0.23.0 + +* Gaia CLI (`gaiacli`) + - [x/stake] change `--keybase-sig` to `--identity` + - [x/stake] \#1828 Force user to specify amount on create-validator command by removing default + - [x/gov] Change `--proposalID` to `--proposal-id` + - [x/stake, x/gov] \#1606 Use `--from` instead of adhoc flags like `--address-validator` + and `--proposer` to indicate the sender address. + - \#1551 Remove `--name` completely + - Genesis/key creation (`gaiad init`) now supports user-provided key passwords + +* Gaia + - [x/stake] Inflation doesn't use rationals in calculation (performance boost) + - [x/stake] Persist a map from `addr->pubkey` in the state since BeginBlock + doesn't provide pubkeys. + - [x/gov] \#1781 Added tags sub-package, changed tags to use dash-case + - [x/gov] \#1688 Governance parameters are now stored in globalparams store + - [x/gov] \#1859 Slash validators who do not vote on a proposal + - [x/gov] \#1914 added TallyResult type that gets stored in Proposal after tallying is finished + +* SDK + - [baseapp] Msgs are no longer run on CheckTx, removed `ctx.IsCheckTx()` + - [baseapp] NewBaseApp constructor takes sdk.TxDecoder as argument instead of wire.Codec + - [types] sdk.NewCoin takes sdk.Int, sdk.NewInt64Coin takes int64 + - [x/auth] Default TxDecoder can be found in `x/auth` rather than baseapp + - [client] \#1551: Refactored `CoreContext` to `TxContext` and `QueryContext` + - Removed all tx related fields and logic (building & signing) to separate + structure `TxContext` in `x/auth/client/context` + +* Tendermint + - v0.22.5 -> See [Tendermint PR](https://github.com/tendermint/tendermint/pull/1966) + - change all the cryptography imports. + - v0.23.0 -> See + [Changelog](https://github.com/tendermint/tendermint/blob/v0.23.0/CHANGELOG.md#0230) + and [SDK PR](https://github.com/cosmos/cosmos-sdk/pull/1927) + - BeginBlock no longer includes crypto.Pubkey + - use time.Time instead of int64 for time. + +FEATURES + +* Gaia REST API (`gaiacli advanced rest-server`) + - [x/gov] Can now query governance proposals by ProposalStatus + +* Gaia CLI (`gaiacli`) + - [x/gov] added `query-proposals` command. Can filter by `depositer`, `voter`, and `status` + - [x/stake] \#2043 Added staking query cli cmds for unbonding-delegations and redelegations + +* Gaia + - [networks] Added ansible scripts to upgrade seed nodes on a network + +* SDK + - [x/mock/simulation] Randomized simulation framework + - Modules specify invariants and operations, preferably in an x/[module]/simulation package + - Modules can test random combinations of their own operations + - Applications can integrate operations and invariants from modules together for an integrated simulation + - Simulates Tendermint's algorithm for validator set updates + - Simulates validator signing/downtime with a Markov chain, and occaisional double-signatures + - Includes simulated operations & invariants for staking, slashing, governance, and bank modules + - [store] \#1481 Add transient store + - [baseapp] Initialize validator set on ResponseInitChain + - [baseapp] added BaseApp.Seal - ability to seal baseapp parameters once they've been set + - [cosmos-sdk-cli] New `cosmos-sdk-cli` tool to quickly initialize a new + SDK-based project + - [scripts] added log output monitoring to DataDog using Ansible scripts + +IMPROVEMENTS + +* Gaia + - [spec] \#967 Inflation and distribution specs drastically improved + - [x/gov] \#1773 Votes on a proposal can now be queried + - [x/gov] Initial governance parameters can now be set in the genesis file + - [x/stake] \#1815 Sped up the processing of `EditValidator` txs. + - [config] \#1930 Transactions indexer indexes all tags by default. + - [ci] [#2057](https://github.com/cosmos/cosmos-sdk/pull/2057) Run `make localnet-start` on every commit and ensure network reaches at least 10 blocks + +* SDK + - [baseapp] \#1587 Allow any alphanumeric character in route + - [baseapp] Allow any alphanumeric character in route + - [tools] Remove `rm -rf vendor/` from `make get_vendor_deps` + - [x/auth] Recover ErrorOutOfGas panic in order to set sdk.Result attributes correctly + - [x/bank] Unit tests are now table-driven + - [tests] Add tests to example apps in docs + - [tests] Fixes ansible scripts to work with AWS too + - [tests] \#1806 CLI tests are now behind the build flag 'cli_test', so go test works on a new repo + +BUG FIXES + +* Gaia CLI (`gaiacli`) + - \#1766 Fixes bad example for keybase identity + - [x/stake] \#2021 Fixed repeated CLI commands in staking + +* Gaia + - [x/stake] [#2077](https://github.com/cosmos/cosmos-sdk/pull/2077) Fixed invalid cliff power comparison + - \#1804 Fixes gen-tx genesis generation logic temporarily until upstream updates + - \#1799 Fix `gaiad export` + - \#1839 Fixed bug where intra-tx counter wasn't set correctly for genesis validators + - [x/stake] \#1858 Fixed bug where the cliff validator was not updated correctly + - [tests] \#1675 Fix non-deterministic `test_cover` + - [tests] \#1551 Fixed invalid LCD test JSON payload in `doIBCTransfer` + - [basecoin] Fixes coin transaction failure and account query [discussion](https://forum.cosmos.network/t/unmarshalbinarybare-expected-to-read-prefix-bytes-75fbfab8-since-it-is-registered-concrete-but-got-0a141dfa/664/6) + - [x/gov] \#1757 Fix VoteOption conversion to String + * [x/stake] [#2083] Fix broken invariant of bonded validator power decrease + ## 0.23.1 *July 27th, 2018* @@ -20,7 +134,7 @@ IMPROVEMENTS * [cli] Improve error messages for all txs when the account doesn't exist * [tendermint] Update to v0.22.6 - Updates the crypto imports/API (#1966) -* [x/stake] Add revoked to human-readable validator +* [x/stake] Add revoked to human-readable validator BUG FIXES * [tendermint] Update to v0.22.6 @@ -77,6 +191,8 @@ BUG FIXES * [keys] \#1629 - updating password no longer asks for a new password when the first entered password was incorrect * [lcd] importing an account would create a random account * [server] 'gaiad init' command family now writes provided name as the moniker in `config.toml` +* [build] Added Ledger build support via `LEDGER_ENABLED=true|false` + * True by default except when cross-compiling ## 0.20.0 @@ -165,7 +281,7 @@ FEATURES * [types] Added MinInt and MinUint functions * [gaiad] `unsafe_reset_all` now resets addrbook.json * [democoin] add x/oracle, x/assoc -* [tests] created a randomized testing framework. +* [tests] created a randomized testing framework. - Currently bank has limited functionality in the framework - Auth has its invariants checked within the framework * [tests] Add WaitForNextNBlocksTM helper method diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0fcf36def..7b7ad81fd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,18 +1,52 @@ # Contributing -Thank you for considering making contributions to Cosmos-SDK and related repositories! Start by taking a look at this [coding repo](https://github.com/tendermint/coding) for overall information on repository workflow and standards. +Thank you for considering making contributions to Cosmos-SDK and related +repositories! -Please follow standard github best practices: fork the repo, branch from the tip of develop, make some commits, and submit a pull request to develop. See the [open issues](https://github.com/cosmos/cosmos-sdk/issues) for things we need help with! +Contributing to this repo can mean many things such as participated in +discussion or proposing code changes. To ensure a smooth workflow for all +contributors, the general procedure for contributing has been established: -Please make sure to use `gofmt` before every commit - the easiest way to do this is have your editor run it for you upon saving a file. Additionally please ensure that your code is lint compliant by running `make lint` + 1. either [open](https://github.com/cosmos/cosmos-sdk/issues/new/choose) or + [find](https://github.com/cosmos/cosmos-sdk/issues) an issue you'd like to help with, + 2. participate in thoughtful discussion on that issue, + 3. if you would then like to contribute code: + 1. if a the issue is a proposal, ensure that the proposal has been accepted, + 2. ensure that nobody else has already begun working on this issue, if they have + make sure to contact them to collaborate, + 3. if nobody has been assigned the issue and you would like to work on it + make a comment on the issue to inform the community of your intentions + to begin work, + 4. follow standard github best practices: fork the repo, branch from the + tip of `develop`, make some commits, and submit a PR to `develop`, + 5. include `WIP:` in the PR-title to and submit your PR early, even if it's + incomplete, this indicates to the community you're working on something and + allows them to provide comments early in the development process. When the code + is complete it can be marked as ready-for-review by replacing `WIP:` with + `R4R:` in the PR-title. -Looking for a good place to start contributing? How about checking out some [good first issues](https://github.com/cosmos/cosmos-sdk/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) +Note that for very small or blatantly obvious problems (such as typos) it is +not required to an open issue to submit a PR, but be aware that for more complex +problems/features, if a PR is opened before an adequate design discussion has +taken place in a github issue, that PR runs a high likelihood of being rejected. + +Take a peek at our [coding repo](https://github.com/tendermint/coding) for +overall information on repository workflow and standards. Note, we use `make +get_dev_tools` and `make update_dev_tools` for installing the linting tools. + +Other notes: + - Looking for a good place to start contributing? How about checking out some + [good first + issues](https://github.com/cosmos/cosmos-sdk/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) + - Please make sure to use `gofmt` before every commit - the easiest way to do + this is have your editor run it for you upon saving a file. Additionally + please ensure that your code is lint compliant by running `make lint` ## Pull Requests -To accommodate review process we suggest that PRs are catagorically broken up. +To accommodate review process we suggest that PRs are categorically broken up. Ideally each PR addresses only a single issue. Additionally, as much as possible -code refactoring and cleanup should be submitted as a seperate PRs from bugfixes/feature-additions. +code refactoring and cleanup should be submitted as a separate PRs from bugfixes/feature-additions. ## Forking @@ -24,10 +58,10 @@ Instead, we use `git remote` to add the fork as a new remote for the original re For instance, to create a fork and work on a branch of it, I would: - * Create the fork on github, using the fork button. - * Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/cosmos/cosmos-sdk`) - * `git remote rename origin upstream` - * `git remote add origin git@github.com:ebuchman/basecoin.git` + - Create the fork on github, using the fork button. + - Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/cosmos/cosmos-sdk`) + - `git remote rename origin upstream` + - `git remote add origin git@github.com:ebuchman/basecoin.git` Now `origin` refers to my fork and `upstream` refers to the Cosmos-SDK version. So I can `git push -u origin master` to update my fork, and make pull requests to Cosmos-SDK from there. @@ -35,8 +69,8 @@ Of course, replace `ebuchman` with your git handle. To pull in updates from the origin repo, run - * `git fetch upstream` - * `git rebase upstream/master` (or whatever branch you want) + - `git fetch upstream` + - `git rebase upstream/master` (or whatever branch you want) Please don't make Pull Requests to `master`. @@ -67,6 +101,29 @@ tested by circle using `go test -v -race ./...`. If not, they will need a `circle.yml`. Ideally, every repo has a `Makefile` that defines `make test` and includes its continuous integration status using a badge in the `README.md`. +We expect tests to use `require` or `assert` rather than `t.Skip` or `t.Fail`, +unless there is a reason to do otherwise. +When testing a function under a variety of different inputs, we prefer to use +[table driven tests](https://github.com/golang/go/wiki/TableDrivenTests). +Table driven test error messages should follow the following format +`, tc #, i #`. +`` is an optional short description of whats failing, `tc` is the +index within the table of the testcase that is failing, and `i` is when there +is a loop, exactly which iteration of the loop failed. +The idea is you should be able to see the +error message and figure out exactly what failed. +Here is an example check: + +``` + +for tcIndex, tc := range cases { + + for i := 0; i < tc.numTxsToTest; i++ { + + require.Equal(t, expectedTx[:32], calculatedTx[:32], + "First 32 bytes of the txs differed. tc #%d, i #%d", tcIndex, i) + ``` + ## Branching Model and Release User-facing repos should adhere to the branching model: http://nvie.com/posts/a-successful-git-branching-model/. @@ -77,35 +134,35 @@ Libraries need not follow the model strictly, but would be wise to. The SDK utilizes [semantic versioning](https://semver.org/). ### Development Procedure: -- the latest state of development is on `develop` -- `develop` must never fail `make test` or `make test_cli` -- `develop` should not fail `make test_lint` -- no --force onto `develop` (except when reverting a broken commit, which should seldom happen) -- create a development branch either on github.com/cosmos/cosmos-sdk, or your fork (using `git remote add origin`) -- before submitting a pull request, begin `git rebase` on top of `develop` + - the latest state of development is on `develop` + - `develop` must never fail `make test` or `make test_cli` + - `develop` should not fail `make test_lint` + - no --force onto `develop` (except when reverting a broken commit, which should seldom happen) + - create a development branch either on github.com/cosmos/cosmos-sdk, or your fork (using `git remote add origin`) + - before submitting a pull request, begin `git rebase` on top of `develop` ### Pull Merge Procedure: -- ensure pull branch is rebased on develop -- run `make test` and `make test_cli` to ensure that all tests pass -- merge pull request -- push master may request that pull requests be rebased on top of `unstable` + - ensure pull branch is rebased on develop + - run `make test` and `make test_cli` to ensure that all tests pass + - merge pull request + - push master may request that pull requests be rebased on top of `unstable` ### Release Procedure: -- start on `develop` -- prepare changelog/release issue -- bump versions -- push to release-vX.X.X to run CI -- merge to master -- merge master back to develop + - start on `develop` + - prepare changelog/release issue + - bump versions + - push to release-vX.X.X to run CI + - merge to master + - merge master back to develop ### Hotfix Procedure: -- start on `master` -- checkout a new branch named hotfix-vX.X.X -- make the required changes - - these changes should be small and an absolute necessity - - add a note to CHANGELOG.md -- bump versions -- push to hotfix-vX.X.X to run the extended integration tests on the CI -- merge hotfix-vX.X.X to master -- merge hotfix-vX.X.X to develop -- delete the hotfix-vX.X.X branch + - start on `master` + - checkout a new branch named hotfix-vX.X.X + - make the required changes + - these changes should be small and an absolute necessity + - add a note to CHANGELOG.md + - bump versions + - push to hotfix-vX.X.X to run the extended integration tests on the CI + - merge hotfix-vX.X.X to master + - merge hotfix-vX.X.X to develop + - delete the hotfix-vX.X.X branch diff --git a/Gopkg.lock b/Gopkg.lock index 849bf143d..c3a540858 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,58 +2,76 @@ [[projects]] - branch = "master" + digest = "1:09a7f74eb6bb3c0f14d8926610c87f569c5cff68e978d30e9a3540aeb626fdf0" name = "github.com/bartekn/go-bip39" packages = ["."] + pruneopts = "UT" revision = "a05967ea095d81c8fe4833776774cfaff8e5036c" [[projects]] branch = "master" + digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d" name = "github.com/beorn7/perks" packages = ["quantile"] + pruneopts = "UT" revision = "3a771d992973f24aa725d07868b467d1ddfceafb" [[projects]] + digest = "1:1343a2963481a305ca4d051e84bc2abd16b601ee22ed324f8d605de1adb291b0" name = "github.com/bgentry/speakeasy" packages = ["."] + pruneopts = "UT" revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd" version = "v0.1.0" [[projects]] branch = "master" + digest = "1:70f6b224a59b2fa453debffa85c77f71063d8754b90c8c4fbad5794e2c382b0f" name = "github.com/brejski/hid" packages = ["."] + pruneopts = "UT" revision = "06112dcfcc50a7e0e4fd06e17f9791e788fdaafc" [[projects]] branch = "master" + digest = "1:2c00f064ba355903866cbfbf3f7f4c0fe64af6638cc7d1b8bdcf3181bc67f1d8" name = "github.com/btcsuite/btcd" packages = ["btcec"] - revision = "9a2f9524024889e129a5422aca2cff73cb3eabf6" + pruneopts = "UT" + revision = "f899737d7f2764dc13e4d01ff00108ec58f766a9" [[projects]] + digest = "1:386de157f7d19259a7f9c81f26ce011223ce0f090353c1152ffdf730d7d10ac2" name = "github.com/btcsuite/btcutil" packages = ["bech32"] + pruneopts = "UT" revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4" [[projects]] + digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" name = "github.com/davecgh/go-spew" packages = ["spew"] + pruneopts = "UT" revision = "346938d642f2ec3594ed81d874461961cd0faa76" version = "v1.1.0" [[projects]] + digest = "1:c7644c73a3d23741fdba8a99b1464e021a224b7e205be497271a8003a15ca41b" name = "github.com/ebuchman/fail-test" packages = ["."] + pruneopts = "UT" revision = "95f809107225be108efcf10a3509e4ea6ceef3c4" [[projects]] + digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd" name = "github.com/fsnotify/fsnotify" packages = ["."] + pruneopts = "UT" revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" version = "v1.4.7" [[projects]] + digest = "1:fdf5169073fb0ad6dc12a70c249145e30f4058647bea25f0abd48b6d9f228a11" name = "github.com/go-kit/kit" packages = [ "log", @@ -62,24 +80,30 @@ "metrics", "metrics/discard", "metrics/internal/lv", - "metrics/prometheus" + "metrics/prometheus", ] + pruneopts = "UT" revision = "4dc7be5d2d12881735283bcab7352178e190fc71" version = "v0.6.0" [[projects]] + digest = "1:31a18dae27a29aa074515e43a443abfd2ba6deb6d69309d8d7ce789c45f34659" name = "github.com/go-logfmt/logfmt" packages = ["."] + pruneopts = "UT" revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5" version = "v0.3.0" [[projects]] + digest = "1:c4a2528ccbcabf90f9f3c464a5fc9e302d592861bbfd0b7135a7de8a943d0406" name = "github.com/go-stack/stack" packages = ["."] + pruneopts = "UT" revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc" version = "v1.7.0" [[projects]] + digest = "1:35621fe20f140f05a0c4ef662c26c0ab4ee50bca78aa30fe87d33120bd28165e" name = "github.com/gogo/protobuf" packages = [ "gogoproto", @@ -87,213 +111,272 @@ "proto", "protoc-gen-gogo/descriptor", "sortkeys", - "types" + "types", ] + pruneopts = "UT" revision = "636bf0302bc95575d69441b25a2603156ffdddf1" version = "v1.1.1" [[projects]] + digest = "1:17fe264ee908afc795734e8c4e63db2accabaf57326dbf21763a7d6b86096260" name = "github.com/golang/protobuf" packages = [ "proto", "ptypes", "ptypes/any", "ptypes/duration", - "ptypes/timestamp" + "ptypes/timestamp", ] + pruneopts = "UT" revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" version = "v1.1.0" [[projects]] branch = "master" + digest = "1:4a0c6bb4805508a6287675fac876be2ac1182539ca8a32468d8128882e9d5009" name = "github.com/golang/snappy" packages = ["."] + pruneopts = "UT" revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a" [[projects]] + digest = "1:c79fb010be38a59d657c48c6ba1d003a8aa651fa56b579d959d74573b7dff8e1" name = "github.com/gorilla/context" packages = ["."] + pruneopts = "UT" revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42" version = "v1.1.1" [[projects]] + digest = "1:e73f5b0152105f18bc131fba127d9949305c8693f8a762588a82a48f61756f5f" name = "github.com/gorilla/mux" packages = ["."] + pruneopts = "UT" revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf" version = "v1.6.2" [[projects]] + digest = "1:43dd08a10854b2056e615d1b1d22ac94559d822e1f8b6fcc92c1a1057e85188e" name = "github.com/gorilla/websocket" packages = ["."] + pruneopts = "UT" revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" version = "v1.2.0" [[projects]] branch = "master" + digest = "1:a361611b8c8c75a1091f00027767f7779b29cb37c456a71b8f2604c88057ab40" name = "github.com/hashicorp/hcl" packages = [ ".", "hcl/ast", "hcl/parser", + "hcl/printer", "hcl/scanner", "hcl/strconv", "hcl/token", "json/parser", "json/scanner", - "json/token" + "json/token", ] + pruneopts = "UT" revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168" [[projects]] + digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" name = "github.com/inconshreveable/mousetrap" packages = ["."] + pruneopts = "UT" revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" version = "v1.0" [[projects]] branch = "master" + digest = "1:39b27d1381a30421f9813967a5866fba35dc1d4df43a6eefe3b7a5444cb07214" name = "github.com/jmhodges/levigo" packages = ["."] + pruneopts = "UT" revision = "c42d9e0ca023e2198120196f842701bb4c55d7b9" [[projects]] branch = "master" + digest = "1:a64e323dc06b73892e5bb5d040ced475c4645d456038333883f58934abbf6f72" name = "github.com/kr/logfmt" packages = ["."] + pruneopts = "UT" revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0" [[projects]] + digest = "1:c568d7727aa262c32bdf8a3f7db83614f7af0ed661474b24588de635c20024c7" name = "github.com/magiconair/properties" packages = ["."] + pruneopts = "UT" revision = "c2353362d570a7bfa228149c62842019201cfb71" version = "v1.8.0" [[projects]] + digest = "1:d4d17353dbd05cb52a2a52b7fe1771883b682806f68db442b436294926bbfafb" name = "github.com/mattn/go-isatty" packages = ["."] + pruneopts = "UT" revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" version = "v0.0.3" [[projects]] + digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc" name = "github.com/matttproud/golang_protobuf_extensions" packages = ["pbutil"] + pruneopts = "UT" revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" version = "v1.0.1" [[projects]] branch = "master" + digest = "1:5ab79470a1d0fb19b041a624415612f8236b3c06070161a910562f2b2d064355" name = "github.com/mitchellh/mapstructure" packages = ["."] + pruneopts = "UT" revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac" [[projects]] + digest = "1:95741de3af260a92cc5c7f3f3061e85273f5a81b5db20d4bd68da74bd521675e" name = "github.com/pelletier/go-toml" packages = ["."] + pruneopts = "UT" revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" version = "v1.2.0" [[projects]] + digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" name = "github.com/pkg/errors" packages = ["."] + pruneopts = "UT" revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" [[projects]] + digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" name = "github.com/pmezard/go-difflib" packages = ["difflib"] + pruneopts = "UT" revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" [[projects]] + digest = "1:c1a04665f9613e082e1209cf288bf64f4068dcd6c87a64bf1c4ff006ad422ba0" name = "github.com/prometheus/client_golang" packages = [ "prometheus", - "prometheus/promhttp" + "prometheus/promhttp", ] + pruneopts = "UT" revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632" [[projects]] branch = "master" + digest = "1:2d5cd61daa5565187e1d96bae64dbbc6080dacf741448e9629c64fd93203b0d4" name = "github.com/prometheus/client_model" packages = ["go"] - revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" + pruneopts = "UT" + revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" [[projects]] branch = "master" + digest = "1:63b68062b8968092eb86bedc4e68894bd096ea6b24920faca8b9dcf451f54bb5" name = "github.com/prometheus/common" packages = [ "expfmt", "internal/bitbucket.org/ww/goautoneg", - "model" + "model", ] - revision = "7600349dcfe1abd18d72d3a1770870d9800a7801" + pruneopts = "UT" + revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" [[projects]] branch = "master" + digest = "1:8c49953a1414305f2ff5465147ee576dd705487c35b15918fcd4efdc0cb7a290" name = "github.com/prometheus/procfs" packages = [ ".", "internal/util", "nfs", - "xfs" + "xfs", ] - revision = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a" + pruneopts = "UT" + revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92" [[projects]] + digest = "1:c4556a44e350b50a490544d9b06e9fba9c286c21d6c0e47f54f3a9214597298c" name = "github.com/rcrowley/go-metrics" packages = ["."] + pruneopts = "UT" revision = "e2704e165165ec55d062f5919b4b29494e9fa790" [[projects]] + digest = "1:bd1ae00087d17c5a748660b8e89e1043e1e5479d0fea743352cda2f8dd8c4f84" name = "github.com/spf13/afero" packages = [ ".", - "mem" + "mem", ] + pruneopts = "UT" revision = "787d034dfe70e44075ccc060d346146ef53270ad" version = "v1.1.1" [[projects]] + digest = "1:516e71bed754268937f57d4ecb190e01958452336fa73dbac880894164e91c1f" name = "github.com/spf13/cast" packages = ["."] + pruneopts = "UT" revision = "8965335b8c7107321228e3e3702cab9832751bac" version = "v1.2.0" [[projects]] + digest = "1:7ffc0983035bc7e297da3688d9fe19d60a420e9c38bef23f845c53788ed6a05e" name = "github.com/spf13/cobra" packages = ["."] + pruneopts = "UT" revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" version = "v0.0.1" [[projects]] branch = "master" + digest = "1:8a020f916b23ff574845789daee6818daf8d25a4852419aae3f0b12378ba432a" name = "github.com/spf13/jwalterweatherman" packages = ["."] - revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394" + pruneopts = "UT" + revision = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2" [[projects]] + digest = "1:dab83a1bbc7ad3d7a6ba1a1cc1760f25ac38cdf7d96a5cdd55cd915a4f5ceaf9" name = "github.com/spf13/pflag" packages = ["."] - revision = "583c0c0531f06d5278b7d917446061adc344b5cd" - version = "v1.0.1" + pruneopts = "UT" + revision = "9a97c102cda95a86cec2345a6f09f55a939babf5" + version = "v1.0.2" [[projects]] + digest = "1:f8e1a678a2571e265f4bf91a3e5e32aa6b1474a55cb0ea849750cc177b664d96" name = "github.com/spf13/viper" packages = ["."] + pruneopts = "UT" revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" version = "v1.0.0" [[projects]] + digest = "1:7e8d267900c7fa7f35129a2a37596e38ed0f11ca746d6d9ba727980ee138f9f6" name = "github.com/stretchr/testify" packages = [ "assert", - "require" + "require", ] + pruneopts = "UT" revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" version = "v1.2.1" [[projects]] branch = "master" + digest = "1:f2ffd421680b0a3f7887501b3c6974bcf19217ecd301d0e2c9b681940ec363d5" name = "github.com/syndtr/goleveldb" packages = [ "leveldb", @@ -307,33 +390,41 @@ "leveldb/opt", "leveldb/storage", "leveldb/table", - "leveldb/util" + "leveldb/util", ] - revision = "c4c61651e9e37fa117f53c5a906d3b63090d8445" + pruneopts = "UT" + revision = "ae2bd5eed72d46b28834ec3f60db3a3ebedd8dbd" [[projects]] branch = "master" + digest = "1:087aaa7920e5d0bf79586feb57ce01c35c830396ab4392798112e8aae8c47722" name = "github.com/tendermint/ed25519" packages = [ ".", "edwards25519", - "extra25519" + "extra25519", ] + pruneopts = "UT" revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057" [[projects]] + digest = "1:e0a2a4be1e20c305badc2b0a7a9ab7fef6da500763bec23ab81df3b5f9eec9ee" name = "github.com/tendermint/go-amino" packages = ["."] - revision = "2106ca61d91029c931fd54968c2bb02dc96b1412" - version = "0.10.1" + pruneopts = "UT" + revision = "a8328986c1608950fa5d3d1c0472cccc4f8fc02c" + version = "v0.12.0-rc0" [[projects]] + digest = "1:d4a15d404afbf591e8be16fcda7f5ac87948d5c7531f9d909fd84cc730ab16e2" name = "github.com/tendermint/iavl" packages = ["."] + pruneopts = "UT" revision = "35f66e53d9b01e83b30de68b931f54b2477a94c9" version = "v0.9.2" [[projects]] + digest = "1:26146cdb2811ce481e72138439b9b1aa17a64d54364f96bb92f97a9ef8ba4f01" name = "github.com/tendermint/tendermint" packages = [ "abci/client", @@ -393,22 +484,29 @@ "state/txindex/kv", "state/txindex/null", "types", - "version" + "version", ] - revision = "d542d2c3945116697f60451e6a407082c41c3cc9" - version = "v0.22.8-rc0" + pruneopts = "UT" + revision = "013b9cef642f875634c614019ab13b17570778ad" + version = "v0.23.0" [[projects]] + digest = "1:4dcb0dd65feecb068ce23a234d1a07c7868a1e39f52a6defcae0bb371d03abf6" name = "github.com/zondax/ledger-goclient" packages = ["."] - revision = "39ba4728c137c75718a21f9b4b3280fa31b9139b" + pruneopts = "UT" + revision = "4296ee5701e945f9b3a7dbe51f402e0b9be57259" [[projects]] branch = "master" + digest = "1:7a71fffde456d746c52f9cd09c50b034533a3180fb1f6320abb149f2ccc579e5" name = "golang.org/x/crypto" packages = [ "blowfish", + "chacha20poly1305", "curve25519", + "hkdf", + "internal/chacha20", "internal/subtle", "nacl/box", "nacl/secretbox", @@ -417,11 +515,13 @@ "pbkdf2", "poly1305", "ripemd160", - "salsa20/salsa" + "salsa20/salsa", ] - revision = "c126467f60eb25f8f27e5a981f32a87e3965053f" + pruneopts = "UT" + revision = "de0752318171da717af4ce24d0a2e8626afaeb11" [[projects]] + digest = "1:d36f55a999540d29b6ea3c2ea29d71c76b1d9853fdcd3e5c5cb4836f2ba118f1" name = "golang.org/x/net" packages = [ "context", @@ -431,17 +531,24 @@ "idna", "internal/timeseries", "netutil", - "trace" + "trace", ] + pruneopts = "UT" revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f" [[projects]] branch = "master" + digest = "1:a989b95f72fce8876213e8e20492525b4cf69a9e7fee7f1d9897983ee0d547e9" name = "golang.org/x/sys" - packages = ["unix"] - revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4" + packages = [ + "cpu", + "unix", + ] + pruneopts = "UT" + revision = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded" [[projects]] + digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" name = "golang.org/x/text" packages = [ "collate", @@ -457,18 +564,22 @@ "unicode/bidi", "unicode/cldr", "unicode/norm", - "unicode/rangetable" + "unicode/rangetable", ] + pruneopts = "UT" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" version = "v0.3.0" [[projects]] branch = "master" + digest = "1:077c1c599507b3b3e9156d17d36e1e61928ee9b53a5b420f10f28ebd4a0b275c" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] - revision = "02b4e95473316948020af0b7a4f0f22c73929b0e" + pruneopts = "UT" + revision = "d0a8f471bba2dbb160885b0000d814ee5d559bad" [[projects]] + digest = "1:2dab32a43451e320e49608ff4542fdfc653c95dcc35d0065ec9c6c3dd540ed74" name = "google.golang.org/grpc" packages = [ ".", @@ -495,20 +606,69 @@ "stats", "status", "tap", - "transport" + "transport", ] + pruneopts = "UT" revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8" version = "v1.13.0" [[projects]] + digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" name = "gopkg.in/yaml.v2" packages = ["."] + pruneopts = "UT" revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" version = "v2.2.1" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "93154e6c678a7bfa273eccf7222531922d644999974efe347893bdd8ba24b14b" + input-imports = [ + "github.com/bartekn/go-bip39", + "github.com/bgentry/speakeasy", + "github.com/btcsuite/btcd/btcec", + "github.com/golang/protobuf/proto", + "github.com/gorilla/mux", + "github.com/mattn/go-isatty", + "github.com/pkg/errors", + "github.com/spf13/cobra", + "github.com/spf13/pflag", + "github.com/spf13/viper", + "github.com/stretchr/testify/assert", + "github.com/stretchr/testify/require", + "github.com/tendermint/go-amino", + "github.com/tendermint/iavl", + "github.com/tendermint/tendermint/abci/server", + "github.com/tendermint/tendermint/abci/types", + "github.com/tendermint/tendermint/cmd/tendermint/commands", + "github.com/tendermint/tendermint/config", + "github.com/tendermint/tendermint/crypto", + "github.com/tendermint/tendermint/crypto/armor", + "github.com/tendermint/tendermint/crypto/ed25519", + "github.com/tendermint/tendermint/crypto/encoding/amino", + "github.com/tendermint/tendermint/crypto/merkle", + "github.com/tendermint/tendermint/crypto/secp256k1", + "github.com/tendermint/tendermint/crypto/tmhash", + "github.com/tendermint/tendermint/crypto/xsalsa20symmetric", + "github.com/tendermint/tendermint/libs/bech32", + "github.com/tendermint/tendermint/libs/cli", + "github.com/tendermint/tendermint/libs/cli/flags", + "github.com/tendermint/tendermint/libs/common", + "github.com/tendermint/tendermint/libs/db", + "github.com/tendermint/tendermint/libs/log", + "github.com/tendermint/tendermint/node", + "github.com/tendermint/tendermint/p2p", + "github.com/tendermint/tendermint/privval", + "github.com/tendermint/tendermint/proxy", + "github.com/tendermint/tendermint/rpc/client", + "github.com/tendermint/tendermint/rpc/core/types", + "github.com/tendermint/tendermint/rpc/lib/client", + "github.com/tendermint/tendermint/rpc/lib/server", + "github.com/tendermint/tendermint/types", + "github.com/tendermint/tendermint/version", + "github.com/zondax/ledger-goclient", + "golang.org/x/crypto/blowfish", + "golang.org/x/crypto/ripemd160", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index d5d461ff6..acc3e282a 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -10,11 +10,6 @@ # name = "github.com/user/project" # version = "1.0.0" # -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# # [[override]] # name = "github.com/x/y" # version = "2.4.0" @@ -54,7 +49,7 @@ [[override]] name = "github.com/tendermint/go-amino" - version = "=0.10.1" + version = "=v0.12.0-rc0" [[override]] name = "github.com/tendermint/iavl" @@ -62,15 +57,15 @@ [[override]] name = "github.com/tendermint/tendermint" - version = "=v0.22.8" + version = "=v0.23.0" [[constraint]] name = "github.com/bartekn/go-bip39" - branch = "master" + revision = "a05967ea095d81c8fe4833776774cfaff8e5036c" [[constraint]] name = "github.com/zondax/ledger-goclient" - revision = "39ba4728c137c75718a21f9b4b3280fa31b9139b" + revision = "4296ee5701e945f9b3a7dbe51f402e0b9be57259" [prune] go-tests = true diff --git a/Makefile b/Makefile index 6f440e020..5a8dd82fe 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -PACKAGES=$(shell go list ./... | grep -v '/vendor/') -PACKAGES_NOCLITEST=$(shell go list ./... | grep -v '/vendor/' | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test) +PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation') +PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation') COMMIT_HASH := $(shell git rev-parse --short HEAD) BUILD_TAGS = netgo ledger BUILD_FLAGS = -tags "${BUILD_TAGS}" -ldflags "-X github.com/cosmos/cosmos-sdk/version.GitCommit=${COMMIT_HASH}" GCC := $(shell command -v gcc 2> /dev/null) LEDGER_ENABLED ?= true -all: get_tools get_vendor_deps install install_examples test_lint test +all: get_tools get_vendor_deps install install_examples install_cosmos-sdk-cli test_lint test ######################################## ### CI @@ -15,7 +15,7 @@ ci: get_tools get_vendor_deps install test_cover test_lint test ######################################## ### Build/Install -check-ledger: +check-ledger: ifeq ($(LEDGER_ENABLED),true) ifndef GCC $(error "gcc not installed for ledger support, please install") @@ -37,6 +37,13 @@ endif build-linux: LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build +build_cosmos-sdk-cli: +ifeq ($(OS),Windows_NT) + go build $(BUILD_FLAGS) -o build/cosmos-sdk-cli.exe ./cmd/cosmos-sdk-cli +else + go build $(BUILD_FLAGS) -o build/cosmos-sdk-cli ./cmd/cosmos-sdk-cli +endif + build_examples: ifeq ($(OS),Windows_NT) go build $(BUILD_FLAGS) -o build/basecoind.exe ./examples/basecoin/cmd/basecoind @@ -60,6 +67,9 @@ install_examples: go install $(BUILD_FLAGS) ./examples/democoin/cmd/democoind go install $(BUILD_FLAGS) ./examples/democoin/cmd/democli +install_cosmos-sdk-cli: + go install $(BUILD_FLAGS) ./cmd/cosmos-sdk-cli + install_debug: go install $(BUILD_FLAGS) ./cmd/gaia/cmd/gaiadebug @@ -73,14 +83,22 @@ dist: check_tools: cd tools && $(MAKE) check_tools +check_dev_tools: + cd tools && $(MAKE) check_dev_tools + update_tools: cd tools && $(MAKE) update_tools +update_dev_tools: + cd tools && $(MAKE) update_dev_tools + get_tools: cd tools && $(MAKE) get_tools +get_dev_tools: + cd tools && $(MAKE) get_dev_tools + get_vendor_deps: - @rm -rf vendor/ @echo "--> Running dep ensure" @dep ensure -v @@ -104,13 +122,29 @@ godocs: test: test_unit test_cli: - @go test -count 1 -p 1 `go list github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test` + @go test -count 1 -p 1 `go list github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test` -tags=cli_test test_unit: - @go test $(PACKAGES_NOCLITEST) + @go test $(PACKAGES_NOSIMULATION) test_race: - @go test -race $(PACKAGES_NOCLITEST) + @go test -race $(PACKAGES_NOSIMULATION) + +test_sim_modules: + @echo "Running individual module simulations..." + @go test $(PACKAGES_SIMTEST) + +test_sim_gaia_nondeterminism: + @echo "Running nondeterminism test..." + @go test ./cmd/gaia/app -run TestAppStateDeterminism -SimulationEnabled=true -v -timeout 10m + +test_sim_gaia_fast: + @echo "Running quick Gaia simulation. This may take several minutes..." + @go test ./cmd/gaia/app -run TestFullGaiaSimulation -SimulationEnabled=true -SimulationNumBlocks=200 -timeout 24h + +test_sim_gaia_slow: + @echo "Running full Gaia simulation. This may take awhile!" + @go test ./cmd/gaia/app -run TestFullGaiaSimulation -SimulationEnabled=true -SimulationNumBlocks=1000 -SimulationVerbose=true -v -timeout 24h test_cover: @bash tests/test_cover.sh @@ -119,13 +153,15 @@ test_lint: gometalinter.v2 --config=tools/gometalinter.json ./... !(gometalinter.v2 --disable-all --enable='errcheck' --vendor ./... | grep -v "client/") find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s + dep status >> /dev/null + !(grep -n branch Gopkg.toml) format: find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -w -s find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs misspell -w benchmark: - @go test -bench=. $(PACKAGES_NOCLITEST) + @go test -bench=. $(PACKAGES_NOSIMULATION) ######################################## @@ -161,38 +197,17 @@ build-docker-gaiadnode: # Run a 4-node testnet locally localnet-start: localnet-stop @if ! [ -f build/node0/gaiad/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/gaiad:Z tendermint/gaiadnode testnet --v 4 --o . --starting-ip-address 192.168.10.2 ; fi - docker-compose up + docker-compose up -d # Stop testnet localnet-stop: docker-compose down -######################################## -### Remote validator nodes using terraform and ansible - -TESTNET_NAME?=remotenet -SERVERS?=4 -BINARY=$(CURDIR)/build/gaiad -remotenet-start: - @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi - @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi - @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi - cd networks/remote/terraform && terraform init && terraform apply -var DO_API_TOKEN="$(DO_API_TOKEN)" -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" -var TESTNET_NAME="$(TESTNET_NAME)" -var SERVERS="$(SERVERS)" - cd networks/remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l "$(TESTNET_NAME)" -e BINARY=$(BINARY) -e TESTNET_NAME="$(TESTNET_NAME)" setup-validators.yml - cd networks/remote/ansible && ansible-playbook -i inventory/digital_ocean.py -l "$(TESTNET_NAME)" start.yml - -remotenet-stop: - @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi - cd networks/remote/terraform && terraform destroy -var DO_API_TOKEN="$(DO_API_TOKEN)" -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" - -remotenet-status: - cd networks/remote/ansible && ansible-playbook -i inventory/digital_ocean.py -l "$(TESTNET_NAME)" status.yml - # To avoid unintended conflicts with file names, always add to .PHONY # unless there is a reason not to. # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html -.PHONY: build build_examples install install_examples install_debug dist \ -check_tools get_tools get_vendor_deps draw_deps test test_cli test_unit \ +.PHONY: build build_cosmos-sdk-cli build_examples install install_examples install_cosmos-sdk-cli install_debug dist \ +check_tools check_dev_tools get_tools get_dev_tools get_vendor_deps draw_deps test test_cli test_unit \ test_cover test_lint benchmark devdoc_init devdoc devdoc_save devdoc_update \ -build-linux build-docker-gaiadnode localnet-start localnet-stop remotenet-start \ -remotenet-stop remotenet-status format check-ledger +build-linux build-docker-gaiadnode localnet-start localnet-stop \ +format check-ledger test_sim_modules test_sim_gaia_fast test_sim_gaia_slow update_tools update_dev_tools diff --git a/PENDING.md b/PENDING.md index a8824c98d..9ade31c8b 100644 --- a/PENDING.md +++ b/PENDING.md @@ -1,41 +1,53 @@ ## PENDING BREAKING CHANGES -* [baseapp] Msgs are no longer run on CheckTx, removed `ctx.IsCheckTx()` -* [x/gov] CLI flag changed from `proposalID` to `proposal-id` -* [x/stake] Inflation doesn't use rationals in calculation (performance boost) -* [baseapp] NewBaseApp constructor now takes sdk.TxDecoder as argument instead of wire.Codec -* [x/auth] Default TxDecoder can be found in `x/auth` rather than baseapp -* \#1606 The following CLI commands have been switched to use `--from` - * `gaiacli stake create-validator --address-validator` - * `gaiacli stake edit-validator --address-validator` - * `gaiacli stake delegate --address-delegator` - * `gaiacli stake unbond begin --address-delegator` - * `gaiacli stake unbond complete --address-delegator` - * `gaiacli stake redelegate begin --address-delegator` - * `gaiacli stake redelegate complete --address-delegator` - * `gaiacli stake unrevoke [validator-address]` - * `gaiacli gov submit-proposal --proposer` - * `gaiacli gov deposit --depositer` - * `gaiacli gov vote --voter` -* [x/gov] Added tags sub-package, changed tags to use dash-case + +* Gaia REST API (`gaiacli advanced rest-server`) + +* Gaia CLI (`gaiacli`) + +* Gaia + * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013) + +* SDK + +* Tendermint + FEATURES -* [lcd] Can now query governance proposals by ProposalStatus -* [x/mock/simulation] Randomized simulation framework - * Modules specify invariants and operations, preferably in an x/[module]/simulation package - * Modules can test random combinations of their own operations - * Applications can integrate operations and invariants from modules together for an integrated simulation -* [baseapp] Initialize validator set on ResponseInitChain -* [cosmos-sdk-cli] Added support for cosmos-sdk-cli tool under cosmos-sdk/cmd - * This allows SDK users to initialize a new project repository. -* [tests] Remotenet commands for AWS (awsnet) + +* Gaia REST API (`gaiacli advanced rest-server`) + +* Gaia CLI (`gaiacli`) + +* Gaia + +* SDK + +* Tendermint + IMPROVEMENTS -* [baseapp] Allow any alphanumeric character in route -* [tools] Remove `rm -rf vendor/` from `make get_vendor_deps` -* [x/auth] Recover ErrorOutOfGas panic in order to set sdk.Result attributes correctly -* [tests] Add tests to example apps in docs -* [x/gov] Votes on a proposal can now be queried -* [x/bank] Unit tests are now table-driven -* [tests] Fixes ansible scripts to work with AWS too + +* Gaia REST API (`gaiacli advanced rest-server`) + +* Gaia CLI (`gaiacli`) + +* Gaia + +* SDK + +* Tendermint + + +BUG FIXES + +* Gaia REST API (`gaiacli advanced rest-server`) + +* Gaia CLI (`gaiacli`) + +* Gaia + +* SDK + +* Tendermint diff --git a/README.md b/README.md index 6dfbf01d9..75761f5f4 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,9 @@ See the See the [Cosmos Docs](https://cosmos.network/docs/) -- [Getting started with the - SDK](https://cosmos.network/docs/sdk/core/intro.html) +- [Getting started with the SDK](https://cosmos.network/docs/sdk/core/intro.html) - [SDK Examples](/examples) -- [Join the - testnet](https://cosmos.network/docs/getting-started/full-node.html#run-a-full-node) +- [Join the testnet](https://cosmos.network/docs/getting-started/full-node.html#run-a-full-node) ## Disambiguation diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 40b3c2bc1..cf63f1f4d 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -18,7 +18,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/wire" - "github.com/cosmos/cosmos-sdk/x/auth" ) // Key to store the header in the DB itself. @@ -44,14 +43,12 @@ type BaseApp struct { // initialized on creation Logger log.Logger name string // application name from abci.Info - cdc *wire.Codec // Amino codec db dbm.DB // common DB backend cms sdk.CommitMultiStore // Main (uncached) state router Router // handle any kind of message codespacer *sdk.Codespacer // handle module codespacing + txDecoder sdk.TxDecoder // unmarshal []byte into sdk.Tx - // must be set - txDecoder sdk.TxDecoder // unmarshal []byte into sdk.Tx anteHandler sdk.AnteHandler // ante handler for fee and auth // may be nil @@ -69,6 +66,9 @@ type BaseApp struct { checkState *state // for CheckTx deliverState *state // for DeliverTx signedValidators []abci.SigningValidator // absent validators from begin block + + // flag for sealing + sealed bool } var _ abci.Application = (*BaseApp)(nil) @@ -80,17 +80,17 @@ var _ abci.Application = (*BaseApp)(nil) // (e.g. functional options). // // NOTE: The db is used to store the version number for now. +// Accepts a user-defined txDecoder // Accepts variable number of option functions, which act on the BaseApp to set configuration choices -func NewBaseApp(name string, cdc *wire.Codec, logger log.Logger, db dbm.DB, options ...func(*BaseApp)) *BaseApp { +func NewBaseApp(name string, logger log.Logger, db dbm.DB, txDecoder sdk.TxDecoder, options ...func(*BaseApp)) *BaseApp { app := &BaseApp{ Logger: logger, name: name, - cdc: cdc, db: db, cms: store.NewCommitMultiStore(db), router: NewRouter(), codespacer: sdk.NewCodespacer(), - txDecoder: defaultTxDecoder(cdc), + txDecoder: txDecoder, } // Register the undefined & root codespaces, which should not be used by @@ -135,56 +135,6 @@ func (app *BaseApp) MountStore(key sdk.StoreKey, typ sdk.StoreType) { app.cms.MountStoreWithDB(key, typ, nil) } -// Set the txDecoder function -func (app *BaseApp) SetTxDecoder(txDecoder sdk.TxDecoder) { - app.txDecoder = txDecoder -} - -// default custom logic for transaction decoding -// TODO: remove auth and wire dependencies from baseapp -// - move this to auth.DefaultTxDecoder -// - set the default here to JSON decode like docs/examples/app1 (it will fail -// for multiple messages ;)) -// - pass a TxDecoder into NewBaseApp, instead of a codec. -func defaultTxDecoder(cdc *wire.Codec) sdk.TxDecoder { - return func(txBytes []byte) (sdk.Tx, sdk.Error) { - var tx = auth.StdTx{} - - if len(txBytes) == 0 { - return nil, sdk.ErrTxDecode("txBytes are empty") - } - - // StdTx.Msg is an interface. The concrete types - // are registered by MakeTxCodec - err := cdc.UnmarshalBinary(txBytes, &tx) - if err != nil { - return nil, sdk.ErrTxDecode("").TraceSDK(err.Error()) - } - return tx, nil - } -} - -// nolint - Set functions -func (app *BaseApp) SetInitChainer(initChainer sdk.InitChainer) { - app.initChainer = initChainer -} -func (app *BaseApp) SetBeginBlocker(beginBlocker sdk.BeginBlocker) { - app.beginBlocker = beginBlocker -} -func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) { - app.endBlocker = endBlocker -} -func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) { - app.anteHandler = ah -} -func (app *BaseApp) SetAddrPeerFilter(pf sdk.PeerFilter) { - app.addrPeerFilter = pf -} -func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) { - app.pubkeyPeerFilter = pf -} -func (app *BaseApp) Router() Router { return app.router } - // load latest application version func (app *BaseApp) LoadLatestVersion(mainKey sdk.StoreKey) error { err := app.cms.LoadLatestVersion() @@ -215,13 +165,16 @@ func (app *BaseApp) LastBlockHeight() int64 { // initializes the remaining logic from app.cms func (app *BaseApp) initFromStore(mainKey sdk.StoreKey) error { - // main store should exist. // TODO: we don't actually need the main store here main := app.cms.GetKVStore(mainKey) if main == nil { return errors.New("baseapp expects MultiStore with 'main' KVStore") } + // Needed for `gaiad export`, which inits from store but never calls initchain + app.setCheckState(abci.Header{}) + + app.Seal() return nil } @@ -290,7 +243,7 @@ func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitC if app.initChainer == nil { return } - app.initChainer(app.deliverState.ctx, req) // no error + res = app.initChainer(app.deliverState.ctx, req) // NOTE: we don't commit, but BeginBlock for block 1 // starts from this deliverState @@ -364,7 +317,9 @@ func handleQueryApp(app *BaseApp, path []string, req abci.RequestQuery) (res abc default: result = sdk.ErrUnknownRequest(fmt.Sprintf("Unknown query: %s", path)).Result() } - value := app.cdc.MustMarshalBinary(result) + + // Encode with json + value := wire.Cdc.MustMarshalBinary(result) return abci.ResponseQuery{ Code: uint32(sdk.ABCICodeOK), Value: value, @@ -424,7 +379,7 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg } else { // In the first block, app.deliverState.ctx will already be initialized // by InitChain. Context is now updated with Header information. - app.deliverState.ctx = app.deliverState.ctx.WithBlockHeader(req.Header) + app.deliverState.ctx = app.deliverState.ctx.WithBlockHeader(req.Header).WithBlockHeight(req.Header.Height) } if app.beginBlocker != nil { @@ -432,11 +387,16 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg } // set the signed validators for addition to context in deliverTx - app.signedValidators = req.Validators + // TODO: communicate this result to the address to pubkey map in slashing + app.signedValidators = req.LastCommitInfo.GetValidators() return } -// Implements ABCI +// CheckTx implements ABCI +// CheckTx runs the "basic checks" to see whether or not a transaction can possibly be executed, +// first decoding, then the ante handler (which checks signatures/fees/ValidateBasic), +// then finally the route match to see whether a handler exists. CheckTx does not run the actual +// Msg handler function(s). func (app *BaseApp) CheckTx(txBytes []byte) (res abci.ResponseCheckTx) { // Decode the Tx. var result sdk.Result @@ -453,11 +413,7 @@ func (app *BaseApp) CheckTx(txBytes []byte) (res abci.ResponseCheckTx) { Log: result.Log, GasWanted: result.GasWanted, GasUsed: result.GasUsed, - Fee: cmn.KI64Pair{ - []byte(result.FeeDenom), - result.FeeAmount, - }, - Tags: result.Tags, + Tags: result.Tags, } } @@ -514,16 +470,11 @@ func (app *BaseApp) getContextForAnte(mode runTxMode, txBytes []byte) (ctx sdk.C ctx = ctx.WithSigningValidators(app.signedValidators) } - // Simulate a DeliverTx for gas calculation - if mode == runTxModeSimulate { - ctx = ctx.WithIsCheckTx(false) - } - return } // Iterates through msgs and executes them -func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg) (result sdk.Result) { +func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (result sdk.Result) { // accumulate results logs := make([]string, 0, len(msgs)) var data []byte // NOTE: we just append them all (?!) @@ -537,7 +488,11 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg) (result sdk.Result) return sdk.ErrUnknownRequest("Unrecognized Msg type: " + msgType).Result() } - msgResult := handler(ctx, msg) + var msgResult sdk.Result + // Skip actual execution for CheckTx + if mode != runTxModeCheck { + msgResult = handler(ctx, msg) + } // NOTE: GasWanted is determined by ante handler and // GasUsed by the GasMeter @@ -615,9 +570,9 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte, tx sdk.Tx) (result sdk // run the ante handler if app.anteHandler != nil { - newCtx, anteResult, abort := app.anteHandler(ctx, tx) + newCtx, result, abort := app.anteHandler(ctx, tx) if abort { - return anteResult + return result } if !newCtx.IsZero() { ctx = newCtx @@ -636,7 +591,7 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte, tx sdk.Tx) (result sdk } ctx = ctx.WithMultiStore(msCache) - result = app.runMsgs(ctx, msgs) + result = app.runMsgs(ctx, msgs, mode) result.GasWanted = gasWanted // only update state if all messages pass and we're not in a simulation diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 00897392e..269424e58 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -18,6 +18,12 @@ import ( "github.com/cosmos/cosmos-sdk/wire" ) +var ( + // make some cap keys + capKey1 = sdk.NewKVStoreKey("key1") + capKey2 = sdk.NewKVStoreKey("key2") +) + //------------------------------------------------------------------------------------------ // Helpers for setup. Most tests should be able to use setupBaseApp @@ -25,12 +31,12 @@ func defaultLogger() log.Logger { return log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app") } -func newBaseApp(name string) *BaseApp { +func newBaseApp(name string, options ...func(*BaseApp)) *BaseApp { logger := defaultLogger() db := dbm.NewMemDB() codec := wire.NewCodec() registerTestCodec(codec) - return NewBaseApp(name, codec, logger, db) + return NewBaseApp(name, logger, db, testTxDecoder(codec), options...) } func registerTestCodec(cdc *wire.Codec) { @@ -45,16 +51,10 @@ func registerTestCodec(cdc *wire.Codec) { } // simple one store baseapp -func setupBaseApp(t *testing.T) (*BaseApp, *sdk.KVStoreKey, *sdk.KVStoreKey) { - app := newBaseApp(t.Name()) +func setupBaseApp(t *testing.T, options ...func(*BaseApp)) *BaseApp { + app := newBaseApp(t.Name(), options...) require.Equal(t, t.Name(), app.Name()) - app.SetTxDecoder(testTxDecoder(app.cdc)) - - // make some cap keys - capKey1 := sdk.NewKVStoreKey("key1") - capKey2 := sdk.NewKVStoreKey("key2") - // no stores are mounted require.Panics(t, func() { app.LoadLatestVersion(capKey1) }) @@ -63,14 +63,14 @@ func setupBaseApp(t *testing.T) (*BaseApp, *sdk.KVStoreKey, *sdk.KVStoreKey) { // stores are mounted err := app.LoadLatestVersion(capKey1) require.Nil(t, err) - return app, capKey1, capKey2 + return app } //------------------------------------------------------------------------------------------ // test mounting and loading stores func TestMountStores(t *testing.T) { - app, capKey1, capKey2 := setupBaseApp(t) + app := setupBaseApp(t) // check both stores store1 := app.cms.GetCommitKVStore(capKey1) @@ -85,7 +85,7 @@ func TestLoadVersion(t *testing.T) { logger := defaultLogger() db := dbm.NewMemDB() name := t.Name() - app := NewBaseApp(name, nil, logger, db) + app := NewBaseApp(name, logger, db, nil) // make a cap key and mount the store capKey := sdk.NewKVStoreKey("main") @@ -114,7 +114,7 @@ func TestLoadVersion(t *testing.T) { commitID2 := sdk.CommitID{2, res.Data} // reload with LoadLatestVersion - app = NewBaseApp(name, nil, logger, db) + app = NewBaseApp(name, logger, db, nil) app.MountStoresIAVL(capKey) err = app.LoadLatestVersion(capKey) require.Nil(t, err) @@ -122,7 +122,7 @@ func TestLoadVersion(t *testing.T) { // reload with LoadVersion, see if you can commit the same block and get // the same result - app = NewBaseApp(name, nil, logger, db) + app = NewBaseApp(name, logger, db, nil) app.MountStoresIAVL(capKey) err = app.LoadVersion(1, capKey) require.Nil(t, err) @@ -142,9 +142,7 @@ func testLoadVersionHelper(t *testing.T, app *BaseApp, expectedHeight int64, exp func TestOptionFunction(t *testing.T) { logger := defaultLogger() db := dbm.NewMemDB() - codec := wire.NewCodec() - registerTestCodec(codec) - bap := NewBaseApp("starting name", codec, logger, db, testChangeNameHelper("new name")) + bap := NewBaseApp("starting name", logger, db, nil, testChangeNameHelper("new name")) require.Equal(t, bap.name, "new name", "BaseApp should have had name changed via option function") } @@ -216,12 +214,10 @@ func TestInitChainer(t *testing.T) { // we can reload the same app later db := dbm.NewMemDB() logger := defaultLogger() - app := NewBaseApp(name, nil, logger, db) + app := NewBaseApp(name, logger, db, nil) capKey := sdk.NewKVStoreKey("main") capKey2 := sdk.NewKVStoreKey("key2") app.MountStoresIAVL(capKey, capKey2) - err := app.LoadLatestVersion(capKey) // needed to make stores non-nil - require.Nil(t, err) // set a value in the store on init chain key, value := []byte("hello"), []byte("goodbye") @@ -243,6 +239,11 @@ func TestInitChainer(t *testing.T) { // set initChainer and try again - should see the value app.SetInitChainer(initChainer) + + // stores are mounted and private members are set - sealing baseapp + err := app.LoadLatestVersion(capKey) // needed to make stores non-nil + require.Nil(t, err) + app.InitChain(abci.RequestInitChain{AppStateBytes: []byte("{}"), ChainId: "test-chain-id"}) // must have valid JSON genesis file, even if empty // assert that chainID is set correctly in InitChain @@ -257,11 +258,11 @@ func TestInitChainer(t *testing.T) { require.Equal(t, value, res.Value) // reload app - app = NewBaseApp(name, nil, logger, db) + app = NewBaseApp(name, logger, db, nil) + app.SetInitChainer(initChainer) app.MountStoresIAVL(capKey, capKey2) err = app.LoadLatestVersion(capKey) // needed to make stores non-nil require.Nil(t, err) - app.SetInitChainer(initChainer) // ensure we can still query after reloading res = app.Query(query) @@ -290,7 +291,7 @@ func (tx txTest) GetMsgs() []sdk.Msg { return tx.Msgs } const ( typeMsgCounter = "msgCounter" - typeMsgCounter2 = "msgCounterTwo" // NOTE: no numerics (?) + typeMsgCounter2 = "msgCounter2" ) // ValidateBasic() fails on negative counters. @@ -430,29 +431,35 @@ func incrementingCounter(t *testing.T, store sdk.KVStore, counterKey []byte, cou // on the store within a block, and that the CheckTx state // gets reset to the latest committed state during Commit func TestCheckTx(t *testing.T) { - app, capKey, _ := setupBaseApp(t) - // This ante handler reads the key and checks that the value matches the current counter. // This ensures changes to the kvstore persist across successive CheckTx. counterKey := []byte("counter-key") - app.SetAnteHandler(anteHandlerTxTest(t, capKey, counterKey)) + + anteOpt := func(bapp *BaseApp) { bapp.SetAnteHandler(anteHandlerTxTest(t, capKey1, counterKey)) } + routerOpt := func(bapp *BaseApp) { + // TODO: can remove this once CheckTx doesnt process msgs. + bapp.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { return sdk.Result{} }) + } + + app := setupBaseApp(t, anteOpt, routerOpt) nTxs := int64(5) - // TODO: can remove this once CheckTx doesnt process msgs. - app.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { return sdk.Result{} }) - app.InitChain(abci.RequestInitChain{}) + // Create same codec used in txDecoder + codec := wire.NewCodec() + registerTestCodec(codec) + for i := int64(0); i < nTxs; i++ { tx := newTxCounter(i, 0) - txBytes, err := app.cdc.MarshalBinary(tx) + txBytes, err := codec.MarshalBinary(tx) require.NoError(t, err) r := app.CheckTx(txBytes) assert.True(t, r.IsOK(), fmt.Sprintf("%v", r)) } - checkStateStore := app.checkState.ctx.KVStore(capKey) + checkStateStore := app.checkState.ctx.KVStore(capKey1) storedCounter := getIntFromStore(checkStateStore, counterKey) // Ensure AnteHandler ran @@ -463,7 +470,7 @@ func TestCheckTx(t *testing.T) { app.EndBlock(abci.RequestEndBlock{}) app.Commit() - checkStateStore = app.checkState.ctx.KVStore(capKey) + checkStateStore = app.checkState.ctx.KVStore(capKey1) storedBytes := checkStateStore.Get(counterKey) require.Nil(t, storedBytes) } @@ -471,15 +478,19 @@ func TestCheckTx(t *testing.T) { // Test that successive DeliverTx can see each others' effects // on the store, both within and across blocks. func TestDeliverTx(t *testing.T) { - app, capKey, _ := setupBaseApp(t) - // test increments in the ante anteKey := []byte("ante-key") - app.SetAnteHandler(anteHandlerTxTest(t, capKey, anteKey)) + anteOpt := func(bapp *BaseApp) { bapp.SetAnteHandler(anteHandlerTxTest(t, capKey1, anteKey)) } // test increments in the handler deliverKey := []byte("deliver-key") - app.Router().AddRoute(typeMsgCounter, handlerMsgCounter(t, capKey, deliverKey)) + routerOpt := func(bapp *BaseApp) { bapp.Router().AddRoute(typeMsgCounter, handlerMsgCounter(t, capKey1, deliverKey)) } + + app := setupBaseApp(t, anteOpt, routerOpt) + + // Create same codec used in txDecoder + codec := wire.NewCodec() + registerTestCodec(codec) nBlocks := 3 txPerHeight := 5 @@ -488,7 +499,7 @@ func TestDeliverTx(t *testing.T) { for i := 0; i < txPerHeight; i++ { counter := int64(blockN*txPerHeight + i) tx := newTxCounter(counter, counter) - txBytes, err := app.cdc.MarshalBinary(tx) + txBytes, err := codec.MarshalBinary(tx) require.NoError(t, err) res := app.DeliverTx(txBytes) require.True(t, res.IsOK(), fmt.Sprintf("%v", res)) @@ -506,29 +517,35 @@ func TestMultiMsgCheckTx(t *testing.T) { // One call to DeliverTx should process all the messages, in order. func TestMultiMsgDeliverTx(t *testing.T) { - app, capKey, _ := setupBaseApp(t) - // increment the tx counter anteKey := []byte("ante-key") - app.SetAnteHandler(anteHandlerTxTest(t, capKey, anteKey)) + anteOpt := func(bapp *BaseApp) { bapp.SetAnteHandler(anteHandlerTxTest(t, capKey1, anteKey)) } // increment the msg counter deliverKey := []byte("deliver-key") deliverKey2 := []byte("deliver-key2") - app.Router().AddRoute(typeMsgCounter, handlerMsgCounter(t, capKey, deliverKey)) - app.Router().AddRoute(typeMsgCounter2, handlerMsgCounter(t, capKey, deliverKey2)) + routerOpt := func(bapp *BaseApp) { + bapp.Router().AddRoute(typeMsgCounter, handlerMsgCounter(t, capKey1, deliverKey)) + bapp.Router().AddRoute(typeMsgCounter2, handlerMsgCounter(t, capKey1, deliverKey2)) + } + + app := setupBaseApp(t, anteOpt, routerOpt) + + // Create same codec used in txDecoder + codec := wire.NewCodec() + registerTestCodec(codec) // run a multi-msg tx // with all msgs the same type { app.BeginBlock(abci.RequestBeginBlock{}) tx := newTxCounter(0, 0, 1, 2) - txBytes, err := app.cdc.MarshalBinary(tx) + txBytes, err := codec.MarshalBinary(tx) require.NoError(t, err) res := app.DeliverTx(txBytes) require.True(t, res.IsOK(), fmt.Sprintf("%v", res)) - store := app.deliverState.ctx.KVStore(capKey) + store := app.deliverState.ctx.KVStore(capKey1) // tx counter only incremented once txCounter := getIntFromStore(store, anteKey) @@ -544,12 +561,12 @@ func TestMultiMsgDeliverTx(t *testing.T) { tx := newTxCounter(1, 3) tx.Msgs = append(tx.Msgs, msgCounter2{0}) tx.Msgs = append(tx.Msgs, msgCounter2{1}) - txBytes, err := app.cdc.MarshalBinary(tx) + txBytes, err := codec.MarshalBinary(tx) require.NoError(t, err) res := app.DeliverTx(txBytes) require.True(t, res.IsOK(), fmt.Sprintf("%v", res)) - store := app.deliverState.ctx.KVStore(capKey) + store := app.deliverState.ctx.KVStore(capKey1) // tx counter only incremented once txCounter := getIntFromStore(store, anteKey) @@ -575,20 +592,30 @@ func TestConcurrentCheckDeliver(t *testing.T) { // Simulate() and Query("/app/simulate", txBytes) should give // the same results. func TestSimulateTx(t *testing.T) { - app, _, _ := setupBaseApp(t) - gasConsumed := int64(5) - app.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { - newCtx = ctx.WithGasMeter(sdk.NewGasMeter(gasConsumed)) - return - }) - app.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { - ctx.GasMeter().ConsumeGas(gasConsumed, "test") - return sdk.Result{GasUsed: ctx.GasMeter().GasConsumed()} - }) + anteOpt := func(bapp *BaseApp) { + bapp.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { + newCtx = ctx.WithGasMeter(sdk.NewGasMeter(gasConsumed)) + return + }) + } + + routerOpt := func(bapp *BaseApp) { + bapp.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { + ctx.GasMeter().ConsumeGas(gasConsumed, "test") + return sdk.Result{GasUsed: ctx.GasMeter().GasConsumed()} + }) + } + + app := setupBaseApp(t, anteOpt, routerOpt) + app.InitChain(abci.RequestInitChain{}) + // Create same codec used in txDecoder + codec := wire.NewCodec() + registerTestCodec(codec) + nBlocks := 3 for blockN := 0; blockN < nBlocks; blockN++ { count := int64(blockN + 1) @@ -607,7 +634,7 @@ func TestSimulateTx(t *testing.T) { require.Equal(t, int64(gasConsumed), result.GasUsed) // simulate by calling Query with encoded tx - txBytes, err := app.cdc.MarshalBinary(tx) + txBytes, err := codec.MarshalBinary(tx) require.Nil(t, err) query := abci.RequestQuery{ Path: "/app/simulate", @@ -617,7 +644,8 @@ func TestSimulateTx(t *testing.T) { require.True(t, queryResult.IsOK(), queryResult.Log) var res sdk.Result - app.cdc.MustUnmarshalBinary(queryResult.Value, &res) + wire.Cdc.MustUnmarshalBinary(queryResult.Value, &res) + require.Nil(t, err, "Result unmarshalling failed") require.True(t, res.IsOK(), res.Log) require.Equal(t, gasConsumed, res.GasUsed, res.Log) app.EndBlock(abci.RequestEndBlock{}) @@ -630,10 +658,14 @@ func TestSimulateTx(t *testing.T) { // TODO: add more func TestRunInvalidTransaction(t *testing.T) { - app, _, _ := setupBaseApp(t) - app.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { return }) - app.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) (res sdk.Result) { return }) + anteOpt := func(bapp *BaseApp) { + bapp.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { return }) + } + routerOpt := func(bapp *BaseApp) { + bapp.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) (res sdk.Result) { return }) + } + app := setupBaseApp(t, anteOpt, routerOpt) app.BeginBlock(abci.RequestBeginBlock{}) // Transaction with no messages @@ -700,43 +732,49 @@ func TestRunInvalidTransaction(t *testing.T) { // Test that transactions exceeding gas limits fail func TestTxGasLimits(t *testing.T) { - app, _, _ := setupBaseApp(t) - gasGranted := int64(10) - app.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { - newCtx = ctx.WithGasMeter(sdk.NewGasMeter(gasGranted)) + anteOpt := func(bapp *BaseApp) { + bapp.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { + newCtx = ctx.WithGasMeter(sdk.NewGasMeter(gasGranted)) - // NOTE/TODO/XXX: - // AnteHandlers must have their own defer/recover in order - // for the BaseApp to know how much gas was used used! - // This is because the GasMeter is created in the AnteHandler, - // but if it panics the context won't be set properly in runTx's recover ... - defer func() { - if r := recover(); r != nil { - switch rType := r.(type) { - case sdk.ErrorOutOfGas: - log := fmt.Sprintf("out of gas in location: %v", rType.Descriptor) - res = sdk.ErrOutOfGas(log).Result() - res.GasWanted = gasGranted - res.GasUsed = newCtx.GasMeter().GasConsumed() - default: - panic(r) + // NOTE/TODO/XXX: + // AnteHandlers must have their own defer/recover in order + // for the BaseApp to know how much gas was used used! + // This is because the GasMeter is created in the AnteHandler, + // but if it panics the context won't be set properly in runTx's recover ... + defer func() { + if r := recover(); r != nil { + switch rType := r.(type) { + case sdk.ErrorOutOfGas: + log := fmt.Sprintf("out of gas in location: %v", rType.Descriptor) + res = sdk.ErrOutOfGas(log).Result() + res.GasWanted = gasGranted + res.GasUsed = newCtx.GasMeter().GasConsumed() + default: + panic(r) + } } - } - }() + }() - count := tx.(*txTest).Counter - newCtx.GasMeter().ConsumeGas(count, "counter-ante") - res = sdk.Result{ - GasWanted: gasGranted, - } - return - }) - app.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { - count := msg.(msgCounter).Counter - ctx.GasMeter().ConsumeGas(count, "counter-handler") - return sdk.Result{} - }) + count := tx.(*txTest).Counter + newCtx.GasMeter().ConsumeGas(count, "counter-ante") + res = sdk.Result{ + GasWanted: gasGranted, + } + return + }) + + } + + routerOpt := func(bapp *BaseApp) { + bapp.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { + count := msg.(msgCounter).Counter + ctx.GasMeter().ConsumeGas(count, "counter-handler") + return sdk.Result{} + }) + } + + app := setupBaseApp(t, anteOpt, routerOpt) app.BeginBlock(abci.RequestBeginBlock{}) @@ -785,20 +823,25 @@ func TestTxGasLimits(t *testing.T) { // Test that we can only query from the latest committed state. func TestQuery(t *testing.T) { - app, capKey, _ := setupBaseApp(t) - key, value := []byte("hello"), []byte("goodbye") - app.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { - store := ctx.KVStore(capKey) - store.Set(key, value) - return - }) + anteOpt := func(bapp *BaseApp) { + bapp.SetAnteHandler(func(ctx sdk.Context, tx sdk.Tx) (newCtx sdk.Context, res sdk.Result, abort bool) { + store := ctx.KVStore(capKey1) + store.Set(key, value) + return + }) + } + + routerOpt := func(bapp *BaseApp) { + bapp.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { + store := ctx.KVStore(capKey1) + store.Set(key, value) + return sdk.Result{} + }) + } + + app := setupBaseApp(t, anteOpt, routerOpt) - app.Router().AddRoute(typeMsgCounter, func(ctx sdk.Context, msg sdk.Msg) sdk.Result { - store := ctx.KVStore(capKey) - store.Set(key, value) - return sdk.Result{} - }) app.InitChain(abci.RequestInitChain{}) // NOTE: "/store/key1" tells us KVStore @@ -835,17 +878,21 @@ func TestQuery(t *testing.T) { // Test p2p filter queries func TestP2PQuery(t *testing.T) { - app, _, _ := setupBaseApp(t) + addrPeerFilterOpt := func(bapp *BaseApp) { + bapp.SetAddrPeerFilter(func(addrport string) abci.ResponseQuery { + require.Equal(t, "1.1.1.1:8000", addrport) + return abci.ResponseQuery{Code: uint32(3)} + }) + } - app.SetAddrPeerFilter(func(addrport string) abci.ResponseQuery { - require.Equal(t, "1.1.1.1:8000", addrport) - return abci.ResponseQuery{Code: uint32(3)} - }) + pubkeyPeerFilterOpt := func(bapp *BaseApp) { + bapp.SetPubKeyPeerFilter(func(pubkey string) abci.ResponseQuery { + require.Equal(t, "testpubkey", pubkey) + return abci.ResponseQuery{Code: uint32(4)} + }) + } - app.SetPubKeyPeerFilter(func(pubkey string) abci.ResponseQuery { - require.Equal(t, "testpubkey", pubkey) - return abci.ResponseQuery{Code: uint32(4)} - }) + app := setupBaseApp(t, addrPeerFilterOpt, pubkeyPeerFilterOpt) addrQuery := abci.RequestQuery{ Path: "/p2p/filter/addr/1.1.1.1:8000", diff --git a/baseapp/router.go b/baseapp/router.go index abbbf9e12..4be3aec74 100644 --- a/baseapp/router.go +++ b/baseapp/router.go @@ -31,12 +31,12 @@ func NewRouter() *router { } } -var isAlpha = regexp.MustCompile(`^[a-zA-Z]+$`).MatchString +var isAlphaNumeric = regexp.MustCompile(`^[a-zA-Z0-9]+$`).MatchString // AddRoute - TODO add description func (rtr *router) AddRoute(r string, h sdk.Handler) Router { - if !isAlpha(r) { - panic("route expressions can only contain alphabet characters") + if !isAlphaNumeric(r) { + panic("route expressions can only contain alphanumeric characters") } rtr.routes = append(rtr.routes, route{r, h}) diff --git a/baseapp/setters.go b/baseapp/setters.go new file mode 100644 index 000000000..86a647d32 --- /dev/null +++ b/baseapp/setters.go @@ -0,0 +1,83 @@ +package baseapp + +import ( + dbm "github.com/tendermint/tendermint/libs/db" + + "github.com/cosmos/cosmos-sdk/store" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// nolint - Setter functions +func (app *BaseApp) SetName(name string) { + if app.sealed { + panic("SetName() on sealed BaseApp") + } + app.name = name +} +func (app *BaseApp) SetDB(db dbm.DB) { + if app.sealed { + panic("SetDB() on sealed BaseApp") + } + app.db = db +} +func (app *BaseApp) SetCMS(cms store.CommitMultiStore) { + if app.sealed { + panic("SetEndBlocker() on sealed BaseApp") + } + app.cms = cms +} +func (app *BaseApp) SetTxDecoder(txDecoder sdk.TxDecoder) { + if app.sealed { + panic("SetTxDecoder() on sealed BaseApp") + } + app.txDecoder = txDecoder +} +func (app *BaseApp) SetInitChainer(initChainer sdk.InitChainer) { + if app.sealed { + panic("SetInitChainer() on sealed BaseApp") + } + app.initChainer = initChainer +} +func (app *BaseApp) SetBeginBlocker(beginBlocker sdk.BeginBlocker) { + if app.sealed { + panic("SetBeginBlocker() on sealed BaseApp") + } + app.beginBlocker = beginBlocker +} +func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) { + if app.sealed { + panic("SetEndBlocker() on sealed BaseApp") + } + app.endBlocker = endBlocker +} +func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) { + if app.sealed { + panic("SetAnteHandler() on sealed BaseApp") + } + app.anteHandler = ah +} +func (app *BaseApp) SetAddrPeerFilter(pf sdk.PeerFilter) { + if app.sealed { + panic("SetAddrPeerFilter() on sealed BaseApp") + } + app.addrPeerFilter = pf +} +func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) { + if app.sealed { + panic("SetPubKeyPeerFilter() on sealed BaseApp") + } + app.pubkeyPeerFilter = pf +} +func (app *BaseApp) Router() Router { + if app.sealed { + panic("Router() on sealed BaseApp") + } + return app.router +} +func (app *BaseApp) Seal() { app.sealed = true } +func (app *BaseApp) IsSealed() bool { return app.sealed } +func (app *BaseApp) enforceSeal() { + if !app.sealed { + panic("enforceSeal() on BaseApp but not sealed") + } +} diff --git a/client/context/context.go b/client/context/context.go new file mode 100644 index 000000000..1b0443b0c --- /dev/null +++ b/client/context/context.go @@ -0,0 +1,115 @@ +package context + +import ( + "io" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/wire" + "github.com/cosmos/cosmos-sdk/x/auth" + + "github.com/spf13/viper" + + rpcclient "github.com/tendermint/tendermint/rpc/client" +) + +const ctxAccStoreName = "acc" + +// CLIContext implements a typical CLI context created in SDK modules for +// transaction handling and queries. +type CLIContext struct { + Codec *wire.Codec + AccDecoder auth.AccountDecoder + Client rpcclient.Client + Logger io.Writer + Height int64 + NodeURI string + FromAddressName string + AccountStore string + TrustNode bool + UseLedger bool + Async bool + JSON bool + PrintResponse bool +} + +// NewCLIContext returns a new initialized CLIContext with parameters from the +// command line using Viper. +func NewCLIContext() CLIContext { + var rpc rpcclient.Client + + nodeURI := viper.GetString(client.FlagNode) + if nodeURI != "" { + rpc = rpcclient.NewHTTP(nodeURI, "/websocket") + } + + return CLIContext{ + Client: rpc, + NodeURI: nodeURI, + AccountStore: ctxAccStoreName, + FromAddressName: viper.GetString(client.FlagFrom), + Height: viper.GetInt64(client.FlagHeight), + TrustNode: viper.GetBool(client.FlagTrustNode), + UseLedger: viper.GetBool(client.FlagUseLedger), + Async: viper.GetBool(client.FlagAsync), + JSON: viper.GetBool(client.FlagJson), + PrintResponse: viper.GetBool(client.FlagPrintResponse), + } +} + +// WithCodec returns a copy of the context with an updated codec. +func (ctx CLIContext) WithCodec(cdc *wire.Codec) CLIContext { + ctx.Codec = cdc + return ctx +} + +// WithAccountDecoder returns a copy of the context with an updated account +// decoder. +func (ctx CLIContext) WithAccountDecoder(decoder auth.AccountDecoder) CLIContext { + ctx.AccDecoder = decoder + return ctx +} + +// WithLogger returns a copy of the context with an updated logger. +func (ctx CLIContext) WithLogger(w io.Writer) CLIContext { + ctx.Logger = w + return ctx +} + +// WithAccountStore returns a copy of the context with an updated AccountStore. +func (ctx CLIContext) WithAccountStore(accountStore string) CLIContext { + ctx.AccountStore = accountStore + return ctx +} + +// WithFromAddressName returns a copy of the context with an updated from +// address. +func (ctx CLIContext) WithFromAddressName(addrName string) CLIContext { + ctx.FromAddressName = addrName + return ctx +} + +// WithTrustNode returns a copy of the context with an updated TrustNode flag. +func (ctx CLIContext) WithTrustNode(trustNode bool) CLIContext { + ctx.TrustNode = trustNode + return ctx +} + +// WithNodeURI returns a copy of the context with an updated node URI. +func (ctx CLIContext) WithNodeURI(nodeURI string) CLIContext { + ctx.NodeURI = nodeURI + ctx.Client = rpcclient.NewHTTP(nodeURI, "/websocket") + return ctx +} + +// WithClient returns a copy of the context with an updated RPC client +// instance. +func (ctx CLIContext) WithClient(client rpcclient.Client) CLIContext { + ctx.Client = client + return ctx +} + +// WithUseLedger returns a copy of the context with an updated UseLedger flag. +func (ctx CLIContext) WithUseLedger(useLedger bool) CLIContext { + ctx.UseLedger = useLedger + return ctx +} diff --git a/client/context/errors.go b/client/context/errors.go new file mode 100644 index 000000000..9c611494a --- /dev/null +++ b/client/context/errors.go @@ -0,0 +1,13 @@ +package context + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/pkg/errors" +) + +// ErrInvalidAccount returns a standardized error reflecting that a given +// account address does not exist. +func ErrInvalidAccount(addr sdk.AccAddress) error { + return errors.Errorf(`No account with address %s was found in the state. +Are you sure there has been a transaction involving it?`, addr) +} diff --git a/client/context/helpers.go b/client/context/helpers.go deleted file mode 100644 index 7742dfe03..000000000 --- a/client/context/helpers.go +++ /dev/null @@ -1,347 +0,0 @@ -package context - -import ( - "fmt" - - "github.com/tendermint/tendermint/libs/common" - - "github.com/pkg/errors" - - "github.com/cosmos/cosmos-sdk/wire" - "github.com/cosmos/cosmos-sdk/x/auth" - cmn "github.com/tendermint/tendermint/libs/common" - rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/keys" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// Broadcast the transaction bytes to Tendermint -func (ctx CoreContext) BroadcastTx(tx []byte) (*ctypes.ResultBroadcastTxCommit, error) { - - node, err := ctx.GetNode() - if err != nil { - return nil, err - } - - res, err := node.BroadcastTxCommit(tx) - if err != nil { - return res, err - } - - if res.CheckTx.Code != uint32(0) { - return res, errors.Errorf("checkTx failed: (%d) %s", - res.CheckTx.Code, - res.CheckTx.Log) - } - if res.DeliverTx.Code != uint32(0) { - return res, errors.Errorf("deliverTx failed: (%d) %s", - res.DeliverTx.Code, - res.DeliverTx.Log) - } - return res, err -} - -// Broadcast the transaction bytes to Tendermint -func (ctx CoreContext) BroadcastTxAsync(tx []byte) (*ctypes.ResultBroadcastTx, error) { - - node, err := ctx.GetNode() - if err != nil { - return nil, err - } - - res, err := node.BroadcastTxAsync(tx) - if err != nil { - return res, err - } - - return res, err -} - -// Query information about the connected node -func (ctx CoreContext) Query(path string) (res []byte, err error) { - return ctx.query(path, nil) -} - -// QueryStore from Tendermint with the provided key and storename -func (ctx CoreContext) QueryStore(key cmn.HexBytes, storeName string) (res []byte, err error) { - return ctx.queryStore(key, storeName, "key") -} - -// Query from Tendermint with the provided storename and subspace -func (ctx CoreContext) QuerySubspace(cdc *wire.Codec, subspace []byte, storeName string) (res []sdk.KVPair, err error) { - resRaw, err := ctx.queryStore(subspace, storeName, "subspace") - if err != nil { - return res, err - } - cdc.MustUnmarshalBinary(resRaw, &res) - return -} - -// Query from Tendermint with the provided storename and path -func (ctx CoreContext) query(path string, key common.HexBytes) (res []byte, err error) { - node, err := ctx.GetNode() - if err != nil { - return res, err - } - - opts := rpcclient.ABCIQueryOptions{ - Height: ctx.Height, - Trusted: ctx.TrustNode, - } - result, err := node.ABCIQueryWithOptions(path, key, opts) - if err != nil { - return res, err - } - resp := result.Response - if resp.Code != uint32(0) { - return res, errors.Errorf("query failed: (%d) %s", resp.Code, resp.Log) - } - return resp.Value, nil -} - -// Query from Tendermint with the provided storename and path -func (ctx CoreContext) queryStore(key cmn.HexBytes, storeName, endPath string) (res []byte, err error) { - path := fmt.Sprintf("/store/%s/%s", storeName, endPath) - return ctx.query(path, key) -} - -// Get the from address from the name flag -func (ctx CoreContext) GetFromAddress() (from sdk.AccAddress, err error) { - - keybase, err := keys.GetKeyBase() - if err != nil { - return nil, err - } - - name := ctx.FromAddressName - if name == "" { - return nil, errors.Errorf("must provide a from address name") - } - - info, err := keybase.Get(name) - if err != nil { - return nil, errors.Errorf("no key for: %s", name) - } - - return sdk.AccAddress(info.GetPubKey().Address()), nil -} - -// sign and build the transaction from the msg -func (ctx CoreContext) SignAndBuild(name, passphrase string, msgs []sdk.Msg, cdc *wire.Codec) ([]byte, error) { - - // build the Sign Messsage from the Standard Message - chainID := ctx.ChainID - if chainID == "" { - return nil, errors.Errorf("chain ID required but not specified") - } - accnum := ctx.AccountNumber - sequence := ctx.Sequence - memo := ctx.Memo - - fee := sdk.Coin{} - if ctx.Fee != "" { - parsedFee, err := sdk.ParseCoin(ctx.Fee) - if err != nil { - return nil, err - } - fee = parsedFee - } - - signMsg := auth.StdSignMsg{ - ChainID: chainID, - AccountNumber: accnum, - Sequence: sequence, - Msgs: msgs, - Memo: memo, - Fee: auth.NewStdFee(ctx.Gas, fee), // TODO run simulate to estimate gas? - } - - keybase, err := keys.GetKeyBase() - if err != nil { - return nil, err - } - - // sign and build - bz := signMsg.Bytes() - - sig, pubkey, err := keybase.Sign(name, passphrase, bz) - if err != nil { - return nil, err - } - sigs := []auth.StdSignature{{ - PubKey: pubkey, - Signature: sig, - AccountNumber: accnum, - Sequence: sequence, - }} - - // marshal bytes - tx := auth.NewStdTx(signMsg.Msgs, signMsg.Fee, sigs, memo) - - return cdc.MarshalBinary(tx) -} - -// sign and build the transaction from the msg -func (ctx CoreContext) ensureSignBuild(name string, msgs []sdk.Msg, cdc *wire.Codec) (tyBytes []byte, err error) { - err = EnsureAccountExists(ctx, name) - if err != nil { - return nil, err - } - - ctx, err = EnsureAccountNumber(ctx) - if err != nil { - return nil, err - } - // default to next sequence number if none provided - ctx, err = EnsureSequence(ctx) - if err != nil { - return nil, err - } - - var txBytes []byte - - keybase, err := keys.GetKeyBase() - if err != nil { - return nil, err - } - - info, err := keybase.Get(name) - if err != nil { - return nil, err - } - var passphrase string - // Only need a passphrase for locally-stored keys - if info.GetType() == "local" { - passphrase, err = ctx.GetPassphraseFromStdin(name) - if err != nil { - return nil, fmt.Errorf("Error fetching passphrase: %v", err) - } - } - txBytes, err = ctx.SignAndBuild(name, passphrase, msgs, cdc) - if err != nil { - return nil, fmt.Errorf("Error signing transaction: %v", err) - } - - return txBytes, err -} - -// sign and build the transaction from the msg -func (ctx CoreContext) EnsureSignBuildBroadcast(name string, msgs []sdk.Msg, cdc *wire.Codec) (err error) { - - txBytes, err := ctx.ensureSignBuild(name, msgs, cdc) - if err != nil { - return err - } - - if ctx.Async { - res, err := ctx.BroadcastTxAsync(txBytes) - if err != nil { - return err - } - if ctx.JSON { - type toJSON struct { - TxHash string - } - valueToJSON := toJSON{res.Hash.String()} - JSON, err := cdc.MarshalJSON(valueToJSON) - if err != nil { - return err - } - fmt.Println(string(JSON)) - } else { - fmt.Println("Async tx sent. tx hash: ", res.Hash.String()) - } - return nil - } - res, err := ctx.BroadcastTx(txBytes) - if err != nil { - return err - } - if ctx.JSON { - // Since JSON is intended for automated scripts, always include response in JSON mode - type toJSON struct { - Height int64 - TxHash string - Response string - } - valueToJSON := toJSON{res.Height, res.Hash.String(), fmt.Sprintf("%+v", res.DeliverTx)} - JSON, err := cdc.MarshalJSON(valueToJSON) - if err != nil { - return err - } - fmt.Println(string(JSON)) - return nil - } - if ctx.PrintResponse { - fmt.Printf("Committed at block %d. Hash: %s Response:%+v \n", res.Height, res.Hash.String(), res.DeliverTx) - } else { - fmt.Printf("Committed at block %d. Hash: %s \n", res.Height, res.Hash.String()) - } - return nil -} - -// get the next sequence for the account address -func (ctx CoreContext) GetAccountNumber(address []byte) (int64, error) { - if ctx.Decoder == nil { - return 0, errors.New("accountDecoder required but not provided") - } - - res, err := ctx.QueryStore(auth.AddressStoreKey(address), ctx.AccountStore) - if err != nil { - return 0, err - } - - if len(res) == 0 { - fmt.Printf("No account found. Returning 0.\n") - return 0, err - } - - account, err := ctx.Decoder(res) - if err != nil { - panic(err) - } - - return account.GetAccountNumber(), nil -} - -// get the next sequence for the account address -func (ctx CoreContext) NextSequence(address []byte) (int64, error) { - if ctx.Decoder == nil { - return 0, errors.New("accountDecoder required but not provided") - } - - res, err := ctx.QueryStore(auth.AddressStoreKey(address), ctx.AccountStore) - if err != nil { - return 0, err - } - - if len(res) == 0 { - fmt.Printf("No account found, defaulting to sequence 0\n") - return 0, err - } - - account, err := ctx.Decoder(res) - if err != nil { - panic(err) - } - - return account.GetSequence(), nil -} - -// get passphrase from std input -func (ctx CoreContext) GetPassphraseFromStdin(name string) (pass string, err error) { - buf := client.BufferStdin() - prompt := fmt.Sprintf("Password to sign with '%s':", name) - return client.GetPassword(prompt, buf) -} - -// GetNode prepares a simple rpc.Client -func (ctx CoreContext) GetNode() (rpcclient.Client, error) { - if ctx.Client == nil { - return nil, errors.New("must define node URI") - } - return ctx.Client, nil -} diff --git a/client/context/query.go b/client/context/query.go new file mode 100644 index 000000000..081f723b5 --- /dev/null +++ b/client/context/query.go @@ -0,0 +1,311 @@ +package context + +import ( + "fmt" + "io" + + "github.com/cosmos/cosmos-sdk/client/keys" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth" + + "github.com/pkg/errors" + + "github.com/tendermint/tendermint/libs/common" + cmn "github.com/tendermint/tendermint/libs/common" + rpcclient "github.com/tendermint/tendermint/rpc/client" + ctypes "github.com/tendermint/tendermint/rpc/core/types" +) + +// GetNode returns an RPC client. If the context's client is not defined, an +// error is returned. +func (ctx CLIContext) GetNode() (rpcclient.Client, error) { + if ctx.Client == nil { + return nil, errors.New("no RPC client defined") + } + + return ctx.Client, nil +} + +// Query performs a query for information about the connected node. +func (ctx CLIContext) Query(path string) (res []byte, err error) { + return ctx.query(path, nil) +} + +// QueryStore performs a query from a Tendermint node with the provided key and +// store name. +func (ctx CLIContext) QueryStore(key cmn.HexBytes, storeName string) (res []byte, err error) { + return ctx.queryStore(key, storeName, "key") +} + +// QuerySubspace performs a query from a Tendermint node with the provided +// store name and subspace. +func (ctx CLIContext) QuerySubspace(subspace []byte, storeName string) (res []sdk.KVPair, err error) { + resRaw, err := ctx.queryStore(subspace, storeName, "subspace") + if err != nil { + return res, err + } + + ctx.Codec.MustUnmarshalBinary(resRaw, &res) + return +} + +// GetAccount queries for an account given an address and a block height. An +// error is returned if the query or decoding fails. +func (ctx CLIContext) GetAccount(address []byte) (auth.Account, error) { + if ctx.AccDecoder == nil { + return nil, errors.New("account decoder required but not provided") + } + + res, err := ctx.QueryStore(auth.AddressStoreKey(address), ctx.AccountStore) + if err != nil { + return nil, err + } else if len(res) == 0 { + return nil, err + } + + account, err := ctx.AccDecoder(res) + if err != nil { + return nil, err + } + + return account, nil +} + +// GetFromAddress returns the from address from the context's name. +func (ctx CLIContext) GetFromAddress() (from sdk.AccAddress, err error) { + if ctx.FromAddressName == "" { + return nil, errors.Errorf("must provide a from address name") + } + + keybase, err := keys.GetKeyBase() + if err != nil { + return nil, err + } + + info, err := keybase.Get(ctx.FromAddressName) + if err != nil { + return nil, errors.Errorf("no key for: %s", ctx.FromAddressName) + } + + return sdk.AccAddress(info.GetPubKey().Address()), nil +} + +// GetAccountNumber returns the next account number for the given account +// address. +func (ctx CLIContext) GetAccountNumber(address []byte) (int64, error) { + account, err := ctx.GetAccount(address) + if err != nil { + return 0, err + } + + return account.GetAccountNumber(), nil +} + +// GetAccountSequence returns the sequence number for the given account +// address. +func (ctx CLIContext) GetAccountSequence(address []byte) (int64, error) { + account, err := ctx.GetAccount(address) + if err != nil { + return 0, err + } + + return account.GetSequence(), nil +} + +// BroadcastTx broadcasts transaction bytes to a Tendermint node. +func (ctx CLIContext) BroadcastTx(tx []byte) (*ctypes.ResultBroadcastTxCommit, error) { + node, err := ctx.GetNode() + if err != nil { + return nil, err + } + + res, err := node.BroadcastTxCommit(tx) + if err != nil { + return res, err + } + + if !res.CheckTx.IsOK() { + return res, errors.Errorf("checkTx failed: (%d) %s", + res.CheckTx.Code, + res.CheckTx.Log) + } + + if !res.DeliverTx.IsOK() { + return res, errors.Errorf("deliverTx failed: (%d) %s", + res.DeliverTx.Code, + res.DeliverTx.Log) + } + + return res, err +} + +// BroadcastTxAsync broadcasts transaction bytes to a Tendermint node +// asynchronously. +func (ctx CLIContext) BroadcastTxAsync(tx []byte) (*ctypes.ResultBroadcastTx, error) { + node, err := ctx.GetNode() + if err != nil { + return nil, err + } + + res, err := node.BroadcastTxAsync(tx) + if err != nil { + return res, err + } + + return res, err +} + +// EnsureAccountExists ensures that an account exists for a given context. An +// error is returned if it does not. +func (ctx CLIContext) EnsureAccountExists() error { + addr, err := ctx.GetFromAddress() + if err != nil { + return err + } + + accountBytes, err := ctx.QueryStore(auth.AddressStoreKey(addr), ctx.AccountStore) + if err != nil { + return err + } + + if len(accountBytes) == 0 { + return ErrInvalidAccount(addr) + } + + return nil +} + +// EnsureAccountExistsFromAddr ensures that an account exists for a given +// address. Instead of using the context's from name, a direct address is +// given. An error is returned if it does not. +func (ctx CLIContext) EnsureAccountExistsFromAddr(addr sdk.AccAddress) error { + accountBytes, err := ctx.QueryStore(auth.AddressStoreKey(addr), ctx.AccountStore) + if err != nil { + return err + } + + if len(accountBytes) == 0 { + return ErrInvalidAccount(addr) + } + + return nil +} + +// EnsureBroadcastTx broadcasts a transactions either synchronously or +// asynchronously based on the context parameters. The result of the broadcast +// is parsed into an intermediate structure which is logged if the context has +// a logger defined. +func (ctx CLIContext) EnsureBroadcastTx(txBytes []byte) error { + if ctx.Async { + return ctx.ensureBroadcastTxAsync(txBytes) + } + + return ctx.ensureBroadcastTx(txBytes) +} + +func (ctx CLIContext) ensureBroadcastTxAsync(txBytes []byte) error { + res, err := ctx.BroadcastTxAsync(txBytes) + if err != nil { + return err + } + + if ctx.JSON { + type toJSON struct { + TxHash string + } + + if ctx.Logger != nil { + resJSON := toJSON{res.Hash.String()} + bz, err := ctx.Codec.MarshalJSON(resJSON) + if err != nil { + return err + } + + ctx.Logger.Write(bz) + io.WriteString(ctx.Logger, "\n") + } + } else { + if ctx.Logger != nil { + io.WriteString(ctx.Logger, fmt.Sprintf("Async tx sent (tx hash: %s)\n", res.Hash)) + } + } + + return nil +} + +func (ctx CLIContext) ensureBroadcastTx(txBytes []byte) error { + res, err := ctx.BroadcastTx(txBytes) + if err != nil { + return err + } + + if ctx.JSON { + // since JSON is intended for automated scripts, always include + // response in JSON mode. + type toJSON struct { + Height int64 + TxHash string + Response string + } + + if ctx.Logger != nil { + resJSON := toJSON{res.Height, res.Hash.String(), fmt.Sprintf("%+v", res.DeliverTx)} + bz, err := ctx.Codec.MarshalJSON(resJSON) + if err != nil { + return err + } + + ctx.Logger.Write(bz) + io.WriteString(ctx.Logger, "\n") + } + + return nil + } + + if ctx.Logger != nil { + resStr := fmt.Sprintf("Committed at block %d (tx hash: %s)\n", res.Height, res.Hash.String()) + + if ctx.PrintResponse { + resStr = fmt.Sprintf("Committed at block %d (tx hash: %s, response: %+v)\n", + res.Height, res.Hash.String(), res.DeliverTx, + ) + } + + io.WriteString(ctx.Logger, resStr) + } + + return nil +} + +// query performs a query from a Tendermint node with the provided store name +// and path. +func (ctx CLIContext) query(path string, key common.HexBytes) (res []byte, err error) { + node, err := ctx.GetNode() + if err != nil { + return res, err + } + + opts := rpcclient.ABCIQueryOptions{ + Height: ctx.Height, + Trusted: ctx.TrustNode, + } + + result, err := node.ABCIQueryWithOptions(path, key, opts) + if err != nil { + return res, err + } + + resp := result.Response + if !resp.IsOK() { + return res, errors.Errorf("query failed: (%d) %s", resp.Code, resp.Log) + } + + return resp.Value, nil +} + +// queryStore performs a query from a Tendermint node with the provided a store +// name and path. +func (ctx CLIContext) queryStore(key cmn.HexBytes, storeName, endPath string) ([]byte, error) { + path := fmt.Sprintf("/store/%s/%s", storeName, endPath) + return ctx.query(path, key) +} diff --git a/client/context/types.go b/client/context/types.go deleted file mode 100644 index 03dd6b9d0..000000000 --- a/client/context/types.go +++ /dev/null @@ -1,113 +0,0 @@ -package context - -import ( - rpcclient "github.com/tendermint/tendermint/rpc/client" - - "github.com/cosmos/cosmos-sdk/x/auth" -) - -// typical context created in sdk modules for transactions/queries -type CoreContext struct { - ChainID string - Height int64 - Gas int64 - Fee string - TrustNode bool - NodeURI string - FromAddressName string - AccountNumber int64 - Sequence int64 - Memo string - Client rpcclient.Client - Decoder auth.AccountDecoder - AccountStore string - UseLedger bool - Async bool - JSON bool - PrintResponse bool -} - -// WithChainID - return a copy of the context with an updated chainID -func (c CoreContext) WithChainID(chainID string) CoreContext { - c.ChainID = chainID - return c -} - -// WithHeight - return a copy of the context with an updated height -func (c CoreContext) WithHeight(height int64) CoreContext { - c.Height = height - return c -} - -// WithGas - return a copy of the context with an updated gas -func (c CoreContext) WithGas(gas int64) CoreContext { - c.Gas = gas - return c -} - -// WithFee - return a copy of the context with an updated fee -func (c CoreContext) WithFee(fee string) CoreContext { - c.Fee = fee - return c -} - -// WithTrustNode - return a copy of the context with an updated TrustNode flag -func (c CoreContext) WithTrustNode(trustNode bool) CoreContext { - c.TrustNode = trustNode - return c -} - -// WithNodeURI - return a copy of the context with an updated node URI -func (c CoreContext) WithNodeURI(nodeURI string) CoreContext { - c.NodeURI = nodeURI - c.Client = rpcclient.NewHTTP(nodeURI, "/websocket") - return c -} - -// WithFromAddressName - return a copy of the context with an updated from address -func (c CoreContext) WithFromAddressName(fromAddressName string) CoreContext { - c.FromAddressName = fromAddressName - return c -} - -// WithSequence - return a copy of the context with an account number -func (c CoreContext) WithAccountNumber(accnum int64) CoreContext { - c.AccountNumber = accnum - return c -} - -// WithSequence - return a copy of the context with an updated sequence number -func (c CoreContext) WithSequence(sequence int64) CoreContext { - c.Sequence = sequence - return c -} - -// WithMemo - return a copy of the context with an updated memo -func (c CoreContext) WithMemo(memo string) CoreContext { - c.Memo = memo - return c -} - -// WithClient - return a copy of the context with an updated RPC client instance -func (c CoreContext) WithClient(client rpcclient.Client) CoreContext { - c.Client = client - return c -} - -// WithDecoder - return a copy of the context with an updated Decoder -func (c CoreContext) WithDecoder(decoder auth.AccountDecoder) CoreContext { - c.Decoder = decoder - return c -} - -// WithAccountStore - return a copy of the context with an updated AccountStore -func (c CoreContext) WithAccountStore(accountStore string) CoreContext { - c.AccountStore = accountStore - return c -} - -// WithUseLedger - return a copy of the context with an updated UseLedger -func (c CoreContext) WithUseLedger(useLedger bool) CoreContext { - c.UseLedger = useLedger - return c -} diff --git a/client/context/viper.go b/client/context/viper.go deleted file mode 100644 index 6c7646079..000000000 --- a/client/context/viper.go +++ /dev/null @@ -1,141 +0,0 @@ -package context - -import ( - "fmt" - - "github.com/pkg/errors" - "github.com/spf13/viper" - - tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" - rpcclient "github.com/tendermint/tendermint/rpc/client" - tmtypes "github.com/tendermint/tendermint/types" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/keys" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/auth" -) - -// NewCoreContextFromViper - return a new context with parameters from the command line -func NewCoreContextFromViper() CoreContext { - nodeURI := viper.GetString(client.FlagNode) - var rpc rpcclient.Client - if nodeURI != "" { - rpc = rpcclient.NewHTTP(nodeURI, "/websocket") - } - chainID := viper.GetString(client.FlagChainID) - // if chain ID is not specified manually, read default chain ID - if chainID == "" { - def, err := defaultChainID() - if err != nil { - chainID = def - } - } - // TODO: Remove the following deprecation code after Gaia-7000 is launched - keyName := viper.GetString(client.FlagName) - if keyName != "" { - fmt.Println("** Note --name is deprecated and will be removed next release. Please use --from instead **") - } else { - keyName = viper.GetString(client.FlagFrom) - } - return CoreContext{ - ChainID: chainID, - Height: viper.GetInt64(client.FlagHeight), - Gas: viper.GetInt64(client.FlagGas), - Fee: viper.GetString(client.FlagFee), - TrustNode: viper.GetBool(client.FlagTrustNode), - FromAddressName: keyName, - NodeURI: nodeURI, - AccountNumber: viper.GetInt64(client.FlagAccountNumber), - Sequence: viper.GetInt64(client.FlagSequence), - Memo: viper.GetString(client.FlagMemo), - Client: rpc, - Decoder: nil, - AccountStore: "acc", - UseLedger: viper.GetBool(client.FlagUseLedger), - Async: viper.GetBool(client.FlagAsync), - JSON: viper.GetBool(client.FlagJson), - PrintResponse: viper.GetBool(client.FlagPrintResponse), - } -} - -// read chain ID from genesis file, if present -func defaultChainID() (string, error) { - cfg, err := tcmd.ParseConfig() - if err != nil { - return "", err - } - doc, err := tmtypes.GenesisDocFromFile(cfg.GenesisFile()) - if err != nil { - return "", err - } - return doc.ChainID, nil -} - -// EnsureAccountExists - Make sure account exists -func EnsureAccountExists(ctx CoreContext, name string) error { - keybase, err := keys.GetKeyBase() - if err != nil { - return err - } - - if name == "" { - return errors.Errorf("must provide a from address name") - } - - info, err := keybase.Get(name) - if err != nil { - return errors.Errorf("no key for: %s", name) - } - - accAddr := sdk.AccAddress(info.GetPubKey().Address()) - - Acc, err := ctx.QueryStore(auth.AddressStoreKey(accAddr), ctx.AccountStore) - if err != nil { - return err - } - - // Check if account was found - if Acc == nil { - return errors.Errorf("No account with address %s was found in the state.\nAre you sure there has been a transaction involving it?", accAddr) - } - return nil -} - -// EnsureAccount - automatically set account number if none provided -func EnsureAccountNumber(ctx CoreContext) (CoreContext, error) { - // Should be viper.IsSet, but this does not work - https://github.com/spf13/viper/pull/331 - if viper.GetInt64(client.FlagAccountNumber) != 0 { - return ctx, nil - } - from, err := ctx.GetFromAddress() - if err != nil { - return ctx, err - } - accnum, err := ctx.GetAccountNumber(from) - if err != nil { - return ctx, err - } - fmt.Printf("Defaulting to account number: %d\n", accnum) - ctx = ctx.WithAccountNumber(accnum) - return ctx, nil -} - -// EnsureSequence - automatically set sequence number if none provided -func EnsureSequence(ctx CoreContext) (CoreContext, error) { - // Should be viper.IsSet, but this does not work - https://github.com/spf13/viper/pull/331 - if viper.GetInt64(client.FlagSequence) != 0 { - return ctx, nil - } - from, err := ctx.GetFromAddress() - if err != nil { - return ctx, err - } - seq, err := ctx.NextSequence(from) - if err != nil { - return ctx, err - } - fmt.Printf("Defaulting to next sequence number: %d\n", seq) - ctx = ctx.WithSequence(seq) - return ctx, nil -} diff --git a/client/flags.go b/client/flags.go index b96012da7..8616f9e78 100644 --- a/client/flags.go +++ b/client/flags.go @@ -42,7 +42,6 @@ func GetCommands(cmds ...*cobra.Command) []*cobra.Command { func PostCommands(cmds ...*cobra.Command) []*cobra.Command { for _, c := range cmds { c.Flags().String(FlagFrom, "", "Name of private key with which to sign") - c.Flags().String(FlagName, "", "DEPRECATED - Name of private key with which to sign") c.Flags().Int64(FlagAccountNumber, 0, "AccountNumber number to sign the tx") c.Flags().Int64(FlagSequence, 0, "Sequence number to sign the tx") c.Flags().String(FlagMemo, "", "Memo to send along with transaction") diff --git a/client/input.go b/client/input.go index 03140a33c..e7d13f3bf 100644 --- a/client/input.go +++ b/client/input.go @@ -28,12 +28,17 @@ func GetPassword(prompt string, buf *bufio.Reader) (pass string, err error) { } else { pass, err = readLineFromBuf(buf) } + if err != nil { return "", err } + if len(pass) < MinPassLength { - return "", errors.Errorf("password must be at least %d characters", MinPassLength) + // Return the given password to the upstream client so it can handle a + // non-STDIN failure gracefully. + return pass, errors.Errorf("password must be at least %d characters", MinPassLength) } + return pass, nil } diff --git a/client/keys/utils.go b/client/keys/utils.go index 5462597ba..907f9eda8 100644 --- a/client/keys/utils.go +++ b/client/keys/utils.go @@ -29,6 +29,55 @@ func GetKeyBase() (keys.Keybase, error) { return GetKeyBaseFromDir(rootDir) } +// GetKeyInfo returns key info for a given name. An error is returned if the +// keybase cannot be retrieved or getting the info fails. +func GetKeyInfo(name string) (keys.Info, error) { + keybase, err := GetKeyBase() + if err != nil { + return nil, err + } + + return keybase.Get(name) +} + +// GetPassphrase returns a passphrase for a given name. It will first retrieve +// the key info for that name if the type is local, it'll fetch input from +// STDIN. Otherwise, an empty passphrase is returned. An error is returned if +// the key info cannot be fetched or reading from STDIN fails. +func GetPassphrase(name string) (string, error) { + var passphrase string + + keyInfo, err := GetKeyInfo(name) + if err != nil { + return passphrase, err + } + + // we only need a passphrase for locally stored keys + // TODO: (ref: #864) address security concerns + if keyInfo.GetType() == keys.TypeLocal { + passphrase, err = ReadPassphraseFromStdin(name) + if err != nil { + return passphrase, err + } + } + + return passphrase, nil +} + +// ReadPassphraseFromStdin attempts to read a passphrase from STDIN return an +// error upon failure. +func ReadPassphraseFromStdin(name string) (string, error) { + buf := client.BufferStdin() + prompt := fmt.Sprintf("Password to sign with '%s':", name) + + passphrase, err := client.GetPassword(prompt, buf) + if err != nil { + return passphrase, fmt.Errorf("Error reading passphrase: %v", err) + } + + return passphrase, nil +} + // initialize a keybase based on the configuration func GetKeyBaseFromDir(rootDir string) (keys.Keybase, error) { if keybase == nil { @@ -77,7 +126,7 @@ func Bech32KeyOutput(info keys.Info) (KeyOutput, error) { } return KeyOutput{ Name: info.GetName(), - Type: info.GetType(), + Type: info.GetType().String(), Address: account, PubKey: bechPubKey, }, nil diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go new file mode 100644 index 000000000..cbc1a2c20 --- /dev/null +++ b/client/lcd/lcd_test.go @@ -0,0 +1,1131 @@ +package lcd + +import ( + "encoding/hex" + "fmt" + "net/http" + "regexp" + "testing" + "time" + + "github.com/cosmos/cosmos-sdk/client/tx" + + "github.com/spf13/viper" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + cryptoKeys "github.com/cosmos/cosmos-sdk/crypto/keys" + p2p "github.com/tendermint/tendermint/p2p" + ctypes "github.com/tendermint/tendermint/rpc/core/types" + + client "github.com/cosmos/cosmos-sdk/client" + keys "github.com/cosmos/cosmos-sdk/client/keys" + rpc "github.com/cosmos/cosmos-sdk/client/rpc" + tests "github.com/cosmos/cosmos-sdk/tests" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/gov" + "github.com/cosmos/cosmos-sdk/x/slashing" + "github.com/cosmos/cosmos-sdk/x/stake" + "github.com/cosmos/cosmos-sdk/x/stake/client/rest" +) + +func init() { + cryptoKeys.BcryptSecurityParameter = 1 +} + +func TestKeys(t *testing.T) { + name, password := "test", "1234567890" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + // get seed + // TODO Do we really need this endpoint? + res, body := Request(t, port, "GET", "/keys/seed", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + reg, err := regexp.Compile(`([a-z]+ ){12}`) + require.Nil(t, err) + match := reg.MatchString(seed) + require.True(t, match, "Returned seed has wrong format", seed) + + newName := "test_newname" + newPassword := "0987654321" + + // add key + jsonStr := []byte(fmt.Sprintf(`{"name":"%s", "password":"%s", "seed":"%s"}`, newName, newPassword, seed)) + res, body = Request(t, port, "POST", "/keys", jsonStr) + + require.Equal(t, http.StatusOK, res.StatusCode, body) + var resp keys.KeyOutput + err = wire.Cdc.UnmarshalJSON([]byte(body), &resp) + require.Nil(t, err, body) + + addr2Bech32 := resp.Address.String() + _, err = sdk.AccAddressFromBech32(addr2Bech32) + require.NoError(t, err, "Failed to return a correct bech32 address") + + // test if created account is the correct account + expectedInfo, _ := GetKeyBase(t).CreateKey(newName, seed, newPassword) + expectedAccount := sdk.AccAddress(expectedInfo.GetPubKey().Address().Bytes()) + assert.Equal(t, expectedAccount.String(), addr2Bech32) + + // existing keys + res, body = Request(t, port, "GET", "/keys", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var m [2]keys.KeyOutput + err = cdc.UnmarshalJSON([]byte(body), &m) + require.Nil(t, err) + + addrBech32 := addr.String() + + require.Equal(t, name, m[0].Name, "Did not serve keys name correctly") + require.Equal(t, addrBech32, m[0].Address.String(), "Did not serve keys Address correctly") + require.Equal(t, newName, m[1].Name, "Did not serve keys name correctly") + require.Equal(t, addr2Bech32, m[1].Address.String(), "Did not serve keys Address correctly") + + // select key + keyEndpoint := fmt.Sprintf("/keys/%s", newName) + res, body = Request(t, port, "GET", keyEndpoint, nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var m2 keys.KeyOutput + err = cdc.UnmarshalJSON([]byte(body), &m2) + require.Nil(t, err) + + require.Equal(t, newName, m2.Name, "Did not serve keys name correctly") + require.Equal(t, addr2Bech32, m2.Address.String(), "Did not serve keys Address correctly") + + // update key + jsonStr = []byte(fmt.Sprintf(`{ + "old_password":"%s", + "new_password":"12345678901" + }`, newPassword)) + + res, body = Request(t, port, "PUT", keyEndpoint, jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + // here it should say unauthorized as we changed the password before + res, body = Request(t, port, "PUT", keyEndpoint, jsonStr) + require.Equal(t, http.StatusUnauthorized, res.StatusCode, body) + + // delete key + jsonStr = []byte(`{"password":"12345678901"}`) + res, body = Request(t, port, "DELETE", keyEndpoint, jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) +} + +func TestVersion(t *testing.T) { + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) + defer cleanup() + + // node info + res, body := Request(t, port, "GET", "/version", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + reg, err := regexp.Compile(`\d+\.\d+\.\d+(-dev)?`) + require.Nil(t, err) + match := reg.MatchString(body) + require.True(t, match, body) + + // node info + res, body = Request(t, port, "GET", "/node_version", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + reg, err = regexp.Compile(`\d+\.\d+\.\d+(-dev)?`) + require.Nil(t, err) + match = reg.MatchString(body) + require.True(t, match, body) +} + +func TestNodeStatus(t *testing.T) { + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) + defer cleanup() + + // node info + res, body := Request(t, port, "GET", "/node_info", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var nodeInfo p2p.NodeInfo + err := cdc.UnmarshalJSON([]byte(body), &nodeInfo) + require.Nil(t, err, "Couldn't parse node info") + + require.NotEqual(t, p2p.NodeInfo{}, nodeInfo, "res: %v", res) + + // syncing + res, body = Request(t, port, "GET", "/syncing", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + // we expect that there is no other node running so the syncing state is "false" + require.Equal(t, "false", body) +} + +func TestBlock(t *testing.T) { + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) + defer cleanup() + + var resultBlock ctypes.ResultBlock + + res, body := Request(t, port, "GET", "/blocks/latest", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err := cdc.UnmarshalJSON([]byte(body), &resultBlock) + require.Nil(t, err, "Couldn't parse block") + + require.NotEqual(t, ctypes.ResultBlock{}, resultBlock) + + // -- + + res, body = Request(t, port, "GET", "/blocks/1", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err = wire.Cdc.UnmarshalJSON([]byte(body), &resultBlock) + require.Nil(t, err, "Couldn't parse block") + + require.NotEqual(t, ctypes.ResultBlock{}, resultBlock) + + // -- + + res, body = Request(t, port, "GET", "/blocks/1000000000", nil) + require.Equal(t, http.StatusNotFound, res.StatusCode, body) +} + +func TestValidators(t *testing.T) { + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) + defer cleanup() + + var resultVals rpc.ResultValidatorsOutput + + res, body := Request(t, port, "GET", "/validatorsets/latest", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err := cdc.UnmarshalJSON([]byte(body), &resultVals) + require.Nil(t, err, "Couldn't parse validatorset") + + require.NotEqual(t, rpc.ResultValidatorsOutput{}, resultVals) + + require.Contains(t, resultVals.Validators[0].Address.String(), "cosmosvaladdr") + require.Contains(t, resultVals.Validators[0].PubKey, "cosmosvalpub") + + // -- + + res, body = Request(t, port, "GET", "/validatorsets/1", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err = cdc.UnmarshalJSON([]byte(body), &resultVals) + require.Nil(t, err, "Couldn't parse validatorset") + + require.NotEqual(t, rpc.ResultValidatorsOutput{}, resultVals) + + // -- + + res, body = Request(t, port, "GET", "/validatorsets/1000000000", nil) + require.Equal(t, http.StatusNotFound, res.StatusCode, body) +} + +func TestCoinSend(t *testing.T) { + name, password := "test", "1234567890" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + bz, err := hex.DecodeString("8FA6AB57AD6870F6B5B2E57735F38F2F30E73CB6") + require.NoError(t, err) + someFakeAddr := sdk.AccAddress(bz) + + // query empty + res, body := Request(t, port, "GET", fmt.Sprintf("/accounts/%s", someFakeAddr), nil) + require.Equal(t, http.StatusNoContent, res.StatusCode, body) + + acc := getAccount(t, port, addr) + initialBalance := acc.GetCoins() + + // create TX + receiveAddr, resultTx := doSend(t, port, seed, name, password, addr) + tests.WaitForHeight(resultTx.Height+1, port) + + // check if tx was committed + require.Equal(t, uint32(0), resultTx.CheckTx.Code) + require.Equal(t, uint32(0), resultTx.DeliverTx.Code) + + // query sender + acc = getAccount(t, port, addr) + coins := acc.GetCoins() + mycoins := coins[0] + + require.Equal(t, "steak", mycoins.Denom) + require.Equal(t, initialBalance[0].Amount.SubRaw(1), mycoins.Amount) + + // query receiver + acc = getAccount(t, port, receiveAddr) + coins = acc.GetCoins() + mycoins = coins[0] + + require.Equal(t, "steak", mycoins.Denom) + require.Equal(t, int64(1), mycoins.Amount.Int64()) +} + +func TestIBCTransfer(t *testing.T) { + name, password := "test", "1234567890" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + acc := getAccount(t, port, addr) + initialBalance := acc.GetCoins() + + // create TX + resultTx := doIBCTransfer(t, port, seed, name, password, addr) + + tests.WaitForHeight(resultTx.Height+1, port) + + // check if tx was committed + require.Equal(t, uint32(0), resultTx.CheckTx.Code) + require.Equal(t, uint32(0), resultTx.DeliverTx.Code) + + // query sender + acc = getAccount(t, port, addr) + coins := acc.GetCoins() + mycoins := coins[0] + + require.Equal(t, "steak", mycoins.Denom) + require.Equal(t, initialBalance[0].Amount.SubRaw(1), mycoins.Amount) + + // TODO: query ibc egress packet state +} + +func TestTxs(t *testing.T) { + name, password := "test", "1234567890" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + // query wrong + res, body := Request(t, port, "GET", "/txs", nil) + require.Equal(t, http.StatusBadRequest, res.StatusCode, body) + + // query empty + res, body = Request(t, port, "GET", fmt.Sprintf("/txs?tag=sender_bech32='%s'", "cosmosaccaddr1jawd35d9aq4u76sr3fjalmcqc8hqygs9gtnmv3"), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + require.Equal(t, "[]", body) + + // create TX + receiveAddr, resultTx := doSend(t, port, seed, name, password, addr) + + tests.WaitForHeight(resultTx.Height+1, port) + + // check if tx is findable + res, body = Request(t, port, "GET", fmt.Sprintf("/txs/%s", resultTx.Hash), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var indexedTxs []tx.Info + + // check if tx is queryable + res, body = Request(t, port, "GET", fmt.Sprintf("/txs?tag=tx.hash='%s'", resultTx.Hash), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + require.NotEqual(t, "[]", body) + + err := cdc.UnmarshalJSON([]byte(body), &indexedTxs) + require.NoError(t, err) + require.Equal(t, 1, len(indexedTxs)) + + // XXX should this move into some other testfile for txs in general? + // test if created TX hash is the correct hash + require.Equal(t, resultTx.Hash, indexedTxs[0].Hash) + + // query sender + // also tests url decoding + res, body = Request(t, port, "GET", fmt.Sprintf("/txs?tag=sender_bech32=%%27%s%%27", addr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err = cdc.UnmarshalJSON([]byte(body), &indexedTxs) + require.NoError(t, err) + require.Equal(t, 1, len(indexedTxs), "%v", indexedTxs) // there are 2 txs created with doSend + require.Equal(t, resultTx.Height, indexedTxs[0].Height) + + // query recipient + res, body = Request(t, port, "GET", fmt.Sprintf("/txs?tag=recipient_bech32='%s'", receiveAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err = cdc.UnmarshalJSON([]byte(body), &indexedTxs) + require.NoError(t, err) + require.Equal(t, 1, len(indexedTxs)) + require.Equal(t, resultTx.Height, indexedTxs[0].Height) +} + +func TestValidatorsQuery(t *testing.T) { + cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) + defer cleanup() + require.Equal(t, 1, len(pks)) + + validators := getValidators(t, port) + require.Equal(t, len(validators), 1) + + // make sure all the validators were found (order unknown because sorted by owner addr) + foundVal := false + pkBech := sdk.MustBech32ifyValPub(pks[0]) + if validators[0].PubKey == pkBech { + foundVal = true + } + require.True(t, foundVal, "pkBech %v, owner %v", pkBech, validators[0].Owner) +} + +func TestValidatorQuery(t *testing.T) { + cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) + defer cleanup() + require.Equal(t, 1, len(pks)) + + validator1Owner := sdk.AccAddress(pks[0].Address()) + + validator := getValidator(t, port, validator1Owner) + bech32ValAddress, err := sdk.Bech32ifyValPub(pks[0]) + require.NoError(t, err) + assert.Equal(t, validator.PubKey, bech32ValAddress, "The returned validator does not hold the correct data") +} + +func TestBonding(t *testing.T) { + name, password, denom := "test", "1234567890", "steak" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + validator1Owner := sdk.AccAddress(pks[0].Address()) + + // create bond TX + resultTx := doDelegate(t, port, seed, name, password, addr, validator1Owner) + tests.WaitForHeight(resultTx.Height+1, port) + + // check if tx was committed + require.Equal(t, uint32(0), resultTx.CheckTx.Code) + require.Equal(t, uint32(0), resultTx.DeliverTx.Code) + + // query sender + acc := getAccount(t, port, addr) + coins := acc.GetCoins() + + require.Equal(t, int64(40), coins.AmountOf(denom).Int64()) + + // query validator + bond := getDelegation(t, port, addr, validator1Owner) + require.Equal(t, "60.0000000000", bond.Shares) + + ////////////////////// + // testing unbonding + + // create unbond TX + resultTx = doBeginUnbonding(t, port, seed, name, password, addr, validator1Owner) + tests.WaitForHeight(resultTx.Height+1, port) + + // query validator + bond = getDelegation(t, port, addr, validator1Owner) + require.Equal(t, "30.0000000000", bond.Shares) + + // check if tx was committed + require.Equal(t, uint32(0), resultTx.CheckTx.Code) + require.Equal(t, uint32(0), resultTx.DeliverTx.Code) + + // should the sender should have not received any coins as the unbonding has only just begun + // query sender + acc = getAccount(t, port, addr) + coins = acc.GetCoins() + require.Equal(t, int64(40), coins.AmountOf("steak").Int64()) + + // query unbonding delegation + validatorAddr := sdk.AccAddress(pks[0].Address()) + unbondings := getUndelegations(t, port, addr, validatorAddr) + assert.Len(t, unbondings, 1, "Unbondings holds all unbonding-delegations") + assert.Equal(t, "30", unbondings[0].Balance.Amount.String()) + + // query summary + summary := getDelegationSummary(t, port, addr) + + assert.Len(t, summary.Delegations, 1, "Delegation summary holds all delegations") + assert.Equal(t, "30.0000000000", summary.Delegations[0].Shares) + assert.Len(t, summary.UnbondingDelegations, 1, "Delegation summary holds all unbonding-delegations") + assert.Equal(t, "30", summary.UnbondingDelegations[0].Balance.Amount.String()) + + // TODO add redelegation, need more complex capabilities such to mock context and + // TODO check summary for redelegation + // assert.Len(t, summary.Redelegations, 1, "Delegation summary holds all redelegations") + + // query txs + txs := getBondingTxs(t, port, addr, "") + assert.Len(t, txs, 2, "All Txs found") + + txs = getBondingTxs(t, port, addr, "bond") + assert.Len(t, txs, 1, "All bonding txs found") + + txs = getBondingTxs(t, port, addr, "unbond") + assert.Len(t, txs, 1, "All unbonding txs found") +} + +func TestSubmitProposal(t *testing.T) { + name, password := "test", "1234567890" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + // create SubmitProposal TX + resultTx := doSubmitProposal(t, port, seed, name, password, addr) + tests.WaitForHeight(resultTx.Height+1, port) + + // check if tx was committed + require.Equal(t, uint32(0), resultTx.CheckTx.Code) + require.Equal(t, uint32(0), resultTx.DeliverTx.Code) + + var proposalID int64 + cdc.UnmarshalBinaryBare(resultTx.DeliverTx.GetData(), &proposalID) + + // query proposal + proposal := getProposal(t, port, proposalID) + require.Equal(t, "Test", proposal.GetTitle()) +} + +func TestDeposit(t *testing.T) { + name, password := "test", "1234567890" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + // create SubmitProposal TX + resultTx := doSubmitProposal(t, port, seed, name, password, addr) + tests.WaitForHeight(resultTx.Height+1, port) + + // check if tx was committed + require.Equal(t, uint32(0), resultTx.CheckTx.Code) + require.Equal(t, uint32(0), resultTx.DeliverTx.Code) + + var proposalID int64 + cdc.UnmarshalBinaryBare(resultTx.DeliverTx.GetData(), &proposalID) + + // query proposal + proposal := getProposal(t, port, proposalID) + require.Equal(t, "Test", proposal.GetTitle()) + + // create SubmitProposal TX + resultTx = doDeposit(t, port, seed, name, password, addr, proposalID) + tests.WaitForHeight(resultTx.Height+1, port) + + // query proposal + proposal = getProposal(t, port, proposalID) + require.True(t, proposal.GetTotalDeposit().IsEqual(sdk.Coins{sdk.NewInt64Coin("steak", 10)})) + + // query deposit + deposit := getDeposit(t, port, proposalID, addr) + require.True(t, deposit.Amount.IsEqual(sdk.Coins{sdk.NewInt64Coin("steak", 10)})) +} + +func TestVote(t *testing.T) { + name, password := "test", "1234567890" + addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + // create SubmitProposal TX + resultTx := doSubmitProposal(t, port, seed, name, password, addr) + tests.WaitForHeight(resultTx.Height+1, port) + + // check if tx was committed + require.Equal(t, uint32(0), resultTx.CheckTx.Code) + require.Equal(t, uint32(0), resultTx.DeliverTx.Code) + + var proposalID int64 + cdc.UnmarshalBinaryBare(resultTx.DeliverTx.GetData(), &proposalID) + + // query proposal + proposal := getProposal(t, port, proposalID) + require.Equal(t, "Test", proposal.GetTitle()) + + // create SubmitProposal TX + resultTx = doDeposit(t, port, seed, name, password, addr, proposalID) + tests.WaitForHeight(resultTx.Height+1, port) + + // query proposal + proposal = getProposal(t, port, proposalID) + require.Equal(t, gov.StatusVotingPeriod, proposal.GetStatus()) + + // create SubmitProposal TX + resultTx = doVote(t, port, seed, name, password, addr, proposalID) + tests.WaitForHeight(resultTx.Height+1, port) + + vote := getVote(t, port, proposalID, addr) + require.Equal(t, proposalID, vote.ProposalID) + require.Equal(t, gov.OptionYes, vote.Option) +} + +func TestUnrevoke(t *testing.T) { + _, password := "test", "1234567890" + addr, _ := CreateAddr(t, "test", password, GetKeyBase(t)) + cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) + defer cleanup() + + // XXX: any less than this and it fails + tests.WaitForHeight(3, port) + pkString, _ := sdk.Bech32ifyValPub(pks[0]) + signingInfo := getSigningInfo(t, port, pkString) + tests.WaitForHeight(4, port) + require.Equal(t, true, signingInfo.IndexOffset > 0) + require.Equal(t, time.Unix(0, 0).UTC(), signingInfo.JailedUntil) + require.Equal(t, true, signingInfo.SignedBlocksCounter > 0) +} + +func TestProposalsQuery(t *testing.T) { + name, password1 := "test", "1234567890" + name2, password2 := "test2", "1234567890" + addr, seed := CreateAddr(t, "test", password1, GetKeyBase(t)) + addr2, seed2 := CreateAddr(t, "test2", password2, GetKeyBase(t)) + cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr, addr2}) + defer cleanup() + + // Addr1 proposes (and deposits) proposals #1 and #2 + resultTx := doSubmitProposal(t, port, seed, name, password1, addr) + var proposalID1 int64 + cdc.UnmarshalBinaryBare(resultTx.DeliverTx.GetData(), &proposalID1) + tests.WaitForHeight(resultTx.Height+1, port) + resultTx = doSubmitProposal(t, port, seed, name, password1, addr) + var proposalID2 int64 + cdc.UnmarshalBinaryBare(resultTx.DeliverTx.GetData(), &proposalID2) + tests.WaitForHeight(resultTx.Height+1, port) + + // Addr2 proposes (and deposits) proposals #3 + resultTx = doSubmitProposal(t, port, seed2, name2, password2, addr2) + var proposalID3 int64 + cdc.UnmarshalBinaryBare(resultTx.DeliverTx.GetData(), &proposalID3) + tests.WaitForHeight(resultTx.Height+1, port) + + // Addr2 deposits on proposals #2 & #3 + resultTx = doDeposit(t, port, seed2, name2, password2, addr2, proposalID2) + tests.WaitForHeight(resultTx.Height+1, port) + resultTx = doDeposit(t, port, seed2, name2, password2, addr2, proposalID3) + tests.WaitForHeight(resultTx.Height+1, port) + + // Only proposals #1 should be in Deposit Period + proposals := getProposalsFilterStatus(t, port, gov.StatusDepositPeriod) + require.Len(t, proposals, 1) + require.Equal(t, proposalID1, proposals[0].GetProposalID()) + // Only proposals #2 and #3 should be in Voting Period + proposals = getProposalsFilterStatus(t, port, gov.StatusVotingPeriod) + require.Len(t, proposals, 2) + require.Equal(t, proposalID2, proposals[0].GetProposalID()) + require.Equal(t, proposalID3, proposals[1].GetProposalID()) + + // Addr1 votes on proposals #2 & #3 + resultTx = doVote(t, port, seed, name, password1, addr, proposalID2) + tests.WaitForHeight(resultTx.Height+1, port) + resultTx = doVote(t, port, seed, name, password1, addr, proposalID3) + tests.WaitForHeight(resultTx.Height+1, port) + + // Addr2 votes on proposal #3 + resultTx = doVote(t, port, seed2, name2, password2, addr2, proposalID3) + tests.WaitForHeight(resultTx.Height+1, port) + + // Test query all proposals + proposals = getProposalsAll(t, port) + require.Equal(t, proposalID1, (proposals[0]).GetProposalID()) + require.Equal(t, proposalID2, (proposals[1]).GetProposalID()) + require.Equal(t, proposalID3, (proposals[2]).GetProposalID()) + + // Test query deposited by addr1 + proposals = getProposalsFilterDepositer(t, port, addr) + require.Equal(t, proposalID1, (proposals[0]).GetProposalID()) + + // Test query deposited by addr2 + proposals = getProposalsFilterDepositer(t, port, addr2) + require.Equal(t, proposalID2, (proposals[0]).GetProposalID()) + require.Equal(t, proposalID3, (proposals[1]).GetProposalID()) + + // Test query voted by addr1 + proposals = getProposalsFilterVoter(t, port, addr) + require.Equal(t, proposalID2, (proposals[0]).GetProposalID()) + require.Equal(t, proposalID3, (proposals[1]).GetProposalID()) + + // Test query voted by addr2 + proposals = getProposalsFilterVoter(t, port, addr2) + require.Equal(t, proposalID3, (proposals[0]).GetProposalID()) + + // Test query voted and deposited by addr1 + proposals = getProposalsFilterVoterDepositer(t, port, addr, addr) + require.Equal(t, proposalID2, (proposals[0]).GetProposalID()) + + // Test query votes on Proposal 2 + votes := getVotes(t, port, proposalID2) + require.Len(t, votes, 1) + require.Equal(t, addr, votes[0].Voter) + + // Test query votes on Proposal 3 + votes = getVotes(t, port, proposalID3) + require.Len(t, votes, 2) + require.True(t, addr.String() == votes[0].Voter.String() || addr.String() == votes[1].Voter.String()) + require.True(t, addr2.String() == votes[0].Voter.String() || addr2.String() == votes[1].Voter.String()) +} + +//_____________________________________________________________________________ +// get the account to get the sequence +func getAccount(t *testing.T, port string, addr sdk.AccAddress) auth.Account { + res, body := Request(t, port, "GET", fmt.Sprintf("/accounts/%s", addr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var acc auth.Account + err := cdc.UnmarshalJSON([]byte(body), &acc) + require.Nil(t, err) + return acc +} + +func doSend(t *testing.T, port, seed, name, password string, addr sdk.AccAddress) (receiveAddr sdk.AccAddress, resultTx ctypes.ResultBroadcastTxCommit) { + + // create receive address + kb := client.MockKeyBase() + receiveInfo, _, err := kb.CreateMnemonic("receive_address", cryptoKeys.English, "1234567890", cryptoKeys.SigningAlgo("secp256k1")) + require.Nil(t, err) + receiveAddr = sdk.AccAddress(receiveInfo.GetPubKey().Address()) + + acc := getAccount(t, port, addr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + chainID := viper.GetString(client.FlagChainID) + // send + coinbz, err := cdc.MarshalJSON(sdk.NewInt64Coin("steak", 1)) + if err != nil { + panic(err) + } + + jsonStr := []byte(fmt.Sprintf(`{ + "name":"%s", + "password":"%s", + "account_number":"%d", + "sequence":"%d", + "gas": "10000", + "amount":[%s], + "chain_id":"%s" + }`, name, password, accnum, sequence, coinbz, chainID)) + res, body := Request(t, port, "POST", fmt.Sprintf("/accounts/%s/send", receiveAddr), jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err = cdc.UnmarshalJSON([]byte(body), &resultTx) + require.Nil(t, err) + + return receiveAddr, resultTx +} + +func doIBCTransfer(t *testing.T, port, seed, name, password string, addr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) { + // create receive address + kb := client.MockKeyBase() + receiveInfo, _, err := kb.CreateMnemonic("receive_address", cryptoKeys.English, "1234567890", cryptoKeys.SigningAlgo("secp256k1")) + require.Nil(t, err) + receiveAddr := sdk.AccAddress(receiveInfo.GetPubKey().Address()) + + chainID := viper.GetString(client.FlagChainID) + + // get the account to get the sequence + acc := getAccount(t, port, addr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + + // send + jsonStr := []byte(fmt.Sprintf(`{ + "name":"%s", + "password": "%s", + "account_number":"%d", + "sequence": "%d", + "gas": "100000", + "src_chain_id": "%s", + "amount":[ + { + "denom": "%s", + "amount": "1" + } + ] + }`, name, password, accnum, sequence, chainID, "steak")) + + res, body := Request(t, port, "POST", fmt.Sprintf("/ibc/testchain/%s/send", receiveAddr), jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + err = cdc.UnmarshalJSON([]byte(body), &resultTx) + require.Nil(t, err) + + return resultTx +} + +func getSigningInfo(t *testing.T, port string, validatorPubKey string) slashing.ValidatorSigningInfo { + res, body := Request(t, port, "GET", fmt.Sprintf("/slashing/signing_info/%s", validatorPubKey), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var signingInfo slashing.ValidatorSigningInfo + err := cdc.UnmarshalJSON([]byte(body), &signingInfo) + require.Nil(t, err) + return signingInfo +} + +// ============= Stake Module ================ + +func getDelegation(t *testing.T, port string, delegatorAddr, validatorAddr sdk.AccAddress) rest.DelegationWithoutRat { + + // get the account to get the sequence + res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/delegations/%s", delegatorAddr, validatorAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var bond rest.DelegationWithoutRat + err := cdc.UnmarshalJSON([]byte(body), &bond) + require.Nil(t, err) + return bond +} + +func getUndelegations(t *testing.T, port string, delegatorAddr, validatorAddr sdk.AccAddress) []stake.UnbondingDelegation { + + // get the account to get the sequence + res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/unbonding_delegations/%s", delegatorAddr, validatorAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var unbondings []stake.UnbondingDelegation + err := cdc.UnmarshalJSON([]byte(body), &unbondings) + require.Nil(t, err) + return unbondings +} + +func getDelegationSummary(t *testing.T, port string, delegatorAddr sdk.AccAddress) rest.DelegationSummary { + + // get the account to get the sequence + res, body := Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s", delegatorAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var summary rest.DelegationSummary + err := cdc.UnmarshalJSON([]byte(body), &summary) + require.Nil(t, err) + return summary +} + +func getBondingTxs(t *testing.T, port string, delegatorAddr sdk.AccAddress, query string) []tx.Info { + + // get the account to get the sequence + var res *http.Response + var body string + if len(query) > 0 { + res, body = Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/txs?type=%s", delegatorAddr, query), nil) + } else { + res, body = Request(t, port, "GET", fmt.Sprintf("/stake/delegators/%s/txs", delegatorAddr), nil) + } + require.Equal(t, http.StatusOK, res.StatusCode, body) + var txs []tx.Info + err := cdc.UnmarshalJSON([]byte(body), &txs) + require.Nil(t, err) + return txs +} + +func doDelegate(t *testing.T, port, seed, name, password string, delegatorAddr, validatorAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) { + // get the account to get the sequence + acc := getAccount(t, port, delegatorAddr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + + chainID := viper.GetString(client.FlagChainID) + + // send + jsonStr := []byte(fmt.Sprintf(`{ + "name": "%s", + "password": "%s", + "account_number": "%d", + "sequence": "%d", + "gas": "10000", + "chain_id": "%s", + "delegations": [ + { + "delegator_addr": "%s", + "validator_addr": "%s", + "delegation": { "denom": "%s", "amount": "60" } + } + ], + "begin_unbondings": [], + "complete_unbondings": [], + "begin_redelegates": [], + "complete_redelegates": [] + }`, name, password, accnum, sequence, chainID, delegatorAddr, validatorAddr, "steak")) + res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delegatorAddr), jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var results []ctypes.ResultBroadcastTxCommit + err := cdc.UnmarshalJSON([]byte(body), &results) + require.Nil(t, err) + + return results[0] +} + +func doBeginUnbonding(t *testing.T, port, seed, name, password string, + delegatorAddr, validatorAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) { + + // get the account to get the sequence + acc := getAccount(t, port, delegatorAddr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + + chainID := viper.GetString(client.FlagChainID) + + // send + jsonStr := []byte(fmt.Sprintf(`{ + "name": "%s", + "password": "%s", + "account_number": "%d", + "sequence": "%d", + "gas": "20000", + "chain_id": "%s", + "delegations": [], + "begin_unbondings": [ + { + "delegator_addr": "%s", + "validator_addr": "%s", + "shares": "30" + } + ], + "complete_unbondings": [], + "begin_redelegates": [], + "complete_redelegates": [] + }`, name, password, accnum, sequence, chainID, delegatorAddr, validatorAddr)) + res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delegatorAddr), jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var results []ctypes.ResultBroadcastTxCommit + err := cdc.UnmarshalJSON([]byte(body), &results) + require.Nil(t, err) + + return results[0] +} + +func doBeginRedelegation(t *testing.T, port, seed, name, password string, + delegatorAddr, validatorSrcAddr, validatorDstAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) { + + // get the account to get the sequence + acc := getAccount(t, port, delegatorAddr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + + chainID := viper.GetString(client.FlagChainID) + + // send + jsonStr := []byte(fmt.Sprintf(`{ + "name": "%s", + "password": "%s", + "account_number": "%d", + "sequence": "%d", + "gas": "10000", + "chain_id": "%s", + "delegations": [], + "begin_unbondings": [], + "complete_unbondings": [], + "begin_redelegates": [ + { + "delegator_addr": "%s", + "validator_src_addr": "%s", + "validator_dst_addr": "%s", + "shares": "30" + } + ], + "complete_redelegates": [] + }`, name, password, accnum, sequence, chainID, delegatorAddr, validatorSrcAddr, validatorDstAddr)) + res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delegatorAddr), jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var results []ctypes.ResultBroadcastTxCommit + err := cdc.UnmarshalJSON([]byte(body), &results) + require.Nil(t, err) + + return results[0] +} + +func getValidators(t *testing.T, port string) []stake.BechValidator { + // get the account to get the sequence + res, body := Request(t, port, "GET", "/stake/validators", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var validators []stake.BechValidator + err := cdc.UnmarshalJSON([]byte(body), &validators) + require.Nil(t, err) + return validators +} + +func getValidator(t *testing.T, port string, validatorAddr sdk.AccAddress) stake.BechValidator { + // get the account to get the sequence + res, body := Request(t, port, "GET", fmt.Sprintf("/stake/validators/%s", validatorAddr.String()), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var validator stake.BechValidator + err := cdc.UnmarshalJSON([]byte(body), &validator) + require.Nil(t, err) + return validator +} + +// ============= Governance Module ================ + +func getProposal(t *testing.T, port string, proposalID int64) gov.Proposal { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals/%d", proposalID), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var proposal gov.Proposal + err := cdc.UnmarshalJSON([]byte(body), &proposal) + require.Nil(t, err) + return proposal +} + +func getDeposit(t *testing.T, port string, proposalID int64, depositerAddr sdk.AccAddress) gov.Deposit { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals/%d/deposits/%s", proposalID, depositerAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var deposit gov.Deposit + err := cdc.UnmarshalJSON([]byte(body), &deposit) + require.Nil(t, err) + return deposit +} + +func getVote(t *testing.T, port string, proposalID int64, voterAddr sdk.AccAddress) gov.Vote { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals/%d/votes/%s", proposalID, voterAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var vote gov.Vote + err := cdc.UnmarshalJSON([]byte(body), &vote) + require.Nil(t, err) + return vote +} + +func getVotes(t *testing.T, port string, proposalID int64) []gov.Vote { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals/%d/votes", proposalID), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + var votes []gov.Vote + err := cdc.UnmarshalJSON([]byte(body), &votes) + require.Nil(t, err) + return votes +} + +func getProposalsAll(t *testing.T, port string) []gov.Proposal { + res, body := Request(t, port, "GET", "/gov/proposals", nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var proposals []gov.Proposal + err := cdc.UnmarshalJSON([]byte(body), &proposals) + require.Nil(t, err) + return proposals +} + +func getProposalsFilterDepositer(t *testing.T, port string, depositerAddr sdk.AccAddress) []gov.Proposal { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals?depositer=%s", depositerAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var proposals []gov.Proposal + err := cdc.UnmarshalJSON([]byte(body), &proposals) + require.Nil(t, err) + return proposals +} + +func getProposalsFilterVoter(t *testing.T, port string, voterAddr sdk.AccAddress) []gov.Proposal { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals?voter=%s", voterAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var proposals []gov.Proposal + err := cdc.UnmarshalJSON([]byte(body), &proposals) + require.Nil(t, err) + return proposals +} + +func getProposalsFilterVoterDepositer(t *testing.T, port string, voterAddr, depositerAddr sdk.AccAddress) []gov.Proposal { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals?depositer=%s&voter=%s", depositerAddr, voterAddr), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var proposals []gov.Proposal + err := cdc.UnmarshalJSON([]byte(body), &proposals) + require.Nil(t, err) + return proposals +} + +func getProposalsFilterStatus(t *testing.T, port string, status gov.ProposalStatus) []gov.Proposal { + res, body := Request(t, port, "GET", fmt.Sprintf("/gov/proposals?status=%s", status), nil) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var proposals []gov.Proposal + err := cdc.UnmarshalJSON([]byte(body), &proposals) + require.Nil(t, err) + return proposals +} + +func doSubmitProposal(t *testing.T, port, seed, name, password string, proposerAddr sdk.AccAddress) (resultTx ctypes.ResultBroadcastTxCommit) { + // get the account to get the sequence + acc := getAccount(t, port, proposerAddr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + + chainID := viper.GetString(client.FlagChainID) + + // submitproposal + jsonStr := []byte(fmt.Sprintf(`{ + "title": "Test", + "description": "test", + "proposal_type": "Text", + "proposer": "%s", + "initial_deposit": [{ "denom": "steak", "amount": "5" }], + "base_req": { + "name": "%s", + "password": "%s", + "chain_id": "%s", + "account_number":"%d", + "sequence":"%d", + "gas":"100000" + } + }`, proposerAddr, name, password, chainID, accnum, sequence)) + res, body := Request(t, port, "POST", "/gov/proposals", jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var results ctypes.ResultBroadcastTxCommit + err := cdc.UnmarshalJSON([]byte(body), &results) + require.Nil(t, err) + + return results +} + +func doDeposit(t *testing.T, port, seed, name, password string, proposerAddr sdk.AccAddress, proposalID int64) (resultTx ctypes.ResultBroadcastTxCommit) { + // get the account to get the sequence + acc := getAccount(t, port, proposerAddr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + + chainID := viper.GetString(client.FlagChainID) + + // deposit on proposal + jsonStr := []byte(fmt.Sprintf(`{ + "depositer": "%s", + "amount": [{ "denom": "steak", "amount": "5" }], + "base_req": { + "name": "%s", + "password": "%s", + "chain_id": "%s", + "account_number":"%d", + "sequence": "%d", + "gas":"100000" + } + }`, proposerAddr, name, password, chainID, accnum, sequence)) + res, body := Request(t, port, "POST", fmt.Sprintf("/gov/proposals/%d/deposits", proposalID), jsonStr) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var results ctypes.ResultBroadcastTxCommit + err := cdc.UnmarshalJSON([]byte(body), &results) + require.Nil(t, err) + + return results +} + +func doVote(t *testing.T, port, seed, name, password string, proposerAddr sdk.AccAddress, proposalID int64) (resultTx ctypes.ResultBroadcastTxCommit) { + // get the account to get the sequence + acc := getAccount(t, port, proposerAddr) + accnum := acc.GetAccountNumber() + sequence := acc.GetSequence() + + chainID := viper.GetString(client.FlagChainID) + + // vote on proposal + jsonStr := []byte(fmt.Sprintf(`{ + "voter": "%s", + "option": "Yes", + "base_req": { + "name": "%s", + "password": "%s", + "chain_id": "%s", + "account_number": "%d", + "sequence": "%d", + "gas":"100000" + } + }`, proposerAddr, name, password, chainID, accnum, sequence)) + res, body := Request(t, port, "POST", fmt.Sprintf("/gov/proposals/%d/votes", proposalID), jsonStr) + fmt.Println(res) + require.Equal(t, http.StatusOK, res.StatusCode, body) + + var results ctypes.ResultBroadcastTxCommit + err := cdc.UnmarshalJSON([]byte(body), &results) + require.Nil(t, err) + + return results +} diff --git a/client/lcd/root.go b/client/lcd/root.go index 7406a3056..bfa62f1cf 100644 --- a/client/lcd/root.go +++ b/client/lcd/root.go @@ -78,21 +78,21 @@ func createHandler(cdc *wire.Codec) http.Handler { panic(err) } - ctx := context.NewCoreContextFromViper() + cliCtx := context.NewCLIContext().WithCodec(cdc).WithLogger(os.Stdout) // TODO: make more functional? aka r = keys.RegisterRoutes(r) r.HandleFunc("/version", CLIVersionRequestHandler).Methods("GET") - r.HandleFunc("/node_version", NodeVersionRequestHandler(ctx)).Methods("GET") + r.HandleFunc("/node_version", NodeVersionRequestHandler(cliCtx)).Methods("GET") keys.RegisterRoutes(r) - rpc.RegisterRoutes(ctx, r) - tx.RegisterRoutes(ctx, r, cdc) - auth.RegisterRoutes(ctx, r, cdc, "acc") - bank.RegisterRoutes(ctx, r, cdc, kb) - ibc.RegisterRoutes(ctx, r, cdc, kb) - stake.RegisterRoutes(ctx, r, cdc, kb) - slashing.RegisterRoutes(ctx, r, cdc, kb) - gov.RegisterRoutes(ctx, r, cdc) + rpc.RegisterRoutes(cliCtx, r) + tx.RegisterRoutes(cliCtx, r, cdc) + auth.RegisterRoutes(cliCtx, r, cdc, "acc") + bank.RegisterRoutes(cliCtx, r, cdc, kb) + ibc.RegisterRoutes(cliCtx, r, cdc, kb) + stake.RegisterRoutes(cliCtx, r, cdc, kb) + slashing.RegisterRoutes(cliCtx, r, cdc, kb) + gov.RegisterRoutes(cliCtx, r, cdc) return r } diff --git a/client/lcd/test_helpers.go b/client/lcd/test_helpers.go index 49ffc441b..ee46b267d 100644 --- a/client/lcd/test_helpers.go +++ b/client/lcd/test_helpers.go @@ -12,10 +12,19 @@ import ( "strings" "testing" + "github.com/cosmos/cosmos-sdk/client" + keys "github.com/cosmos/cosmos-sdk/client/keys" + gapp "github.com/cosmos/cosmos-sdk/cmd/gaia/app" + crkeys "github.com/cosmos/cosmos-sdk/crypto/keys" + "github.com/cosmos/cosmos-sdk/server" + "github.com/cosmos/cosmos-sdk/tests" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/spf13/viper" "github.com/stretchr/testify/require" - crkeys "github.com/cosmos/cosmos-sdk/crypto/keys" abci "github.com/tendermint/tendermint/abci/types" tmcfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/crypto" @@ -28,29 +37,21 @@ import ( "github.com/tendermint/tendermint/proxy" tmrpc "github.com/tendermint/tendermint/rpc/lib/server" tmtypes "github.com/tendermint/tendermint/types" - - "github.com/cosmos/cosmos-sdk/client" - keys "github.com/cosmos/cosmos-sdk/client/keys" - gapp "github.com/cosmos/cosmos-sdk/cmd/gaia/app" - "github.com/cosmos/cosmos-sdk/server" - "github.com/cosmos/cosmos-sdk/tests" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/wire" - "github.com/cosmos/cosmos-sdk/x/auth" ) -// f**ing long, but unique for each test +// makePathname creates a unique pathname for each test. It will panic if it +// cannot get the current working directory. func makePathname() string { - // get path p, err := os.Getwd() if err != nil { panic(err) } + sep := string(filepath.Separator) return strings.Replace(p, sep, "_", -1) } -// GetConfig returns a config for the test cases as a singleton +// GetConfig returns a Tendermint config for the test cases. func GetConfig() *tmcfg.Config { pathname := makePathname() config := tmcfg.ResetTestRoot(pathname) @@ -59,52 +60,73 @@ func GetConfig() *tmcfg.Config { if err != nil { panic(err) } + rcpAddr, _, err := server.FreeTCPAddr() if err != nil { panic(err) } + grpcAddr, _, err := server.FreeTCPAddr() + if err != nil { + panic(err) + } + config.P2P.ListenAddress = tmAddr config.RPC.ListenAddress = rcpAddr + config.RPC.GRPCListenAddress = grpcAddr + return config } -// get the lcd test keybase -// note can't use a memdb because the request is expecting to interact with the default location -func GetKB(t *testing.T) crkeys.Keybase { +// GetKeyBase returns the LCD test keybase. It also requires that a directory +// could be made and a keybase could be fetched. +// +// NOTE: memDB cannot be used because the request is expecting to interact with +// the default location. +func GetKeyBase(t *testing.T) crkeys.Keybase { dir, err := ioutil.TempDir("", "lcd_test") require.NoError(t, err) + viper.Set(cli.HomeFlag, dir) - keybase, err := keys.GetKeyBase() // dbm.NewMemDB()) // :( + + keybase, err := keys.GetKeyBase() require.NoError(t, err) + return keybase } -// add an address to the store return name and password -func CreateAddr(t *testing.T, name, password string, kb crkeys.Keybase) (addr sdk.AccAddress, seed string) { - var info crkeys.Info - var err error +// CreateAddr adds an address to the key store and returns an address and seed. +// It also requires that the key could be created. +func CreateAddr(t *testing.T, name, password string, kb crkeys.Keybase) (sdk.AccAddress, string) { + var ( + err error + info crkeys.Info + seed string + ) + info, seed, err = kb.CreateMnemonic(name, crkeys.English, password, crkeys.Secp256k1) require.NoError(t, err) - addr = sdk.AccAddress(info.GetPubKey().Address()) - return + + return sdk.AccAddress(info.GetPubKey().Address()), seed } -// strt TM and the LCD in process, listening on their respective sockets -// nValidators = number of validators -// initAddrs = accounts to initialize with some steaks -func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress) (cleanup func(), validatorsPKs []crypto.PubKey, port string) { - +// InitializeTestLCD starts Tendermint and the LCD in process, listening on +// their respective sockets where nValidators is the total number of validators +// and initAddrs are the accounts to initialize with some steak tokens. It +// returns a cleanup function, a set of validator public keys, and a port. +func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress) (func(), []crypto.PubKey, string) { config := GetConfig() config.Consensus.TimeoutCommit = 100 config.Consensus.SkipTimeoutCommit = false config.TxIndex.IndexAllTags = true logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) - logger = log.NewFilter(logger, log.AllowDebug()) + logger = log.NewFilter(logger, log.AllowError()) + privValidatorFile := config.PrivValidatorFile() privVal := pvm.LoadOrGenFilePV(privValidatorFile) privVal.Reset() + db := dbm.NewMemDB() app := gapp.NewGaiaApp(logger, db, nil) cdc = gapp.MakeCodec() @@ -113,10 +135,10 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress genDoc, err := tmtypes.GenesisDocFromFile(genesisFile) require.NoError(t, err) - // add more validators if nValidators < 1 { panic("InitializeTestLCD must use at least one validator") } + for i := 1; i < nValidators; i++ { genDoc.Validators = append(genDoc.Validators, tmtypes.GenesisValidator{ @@ -127,14 +149,18 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress ) } - // NOTE it's bad practice to reuse pk address for the owner address but doing in the - // test for simplicity + var validatorsPKs []crypto.PubKey + + // NOTE: It's bad practice to reuse public key address for the owner + // address but doing in the test for simplicity. var appGenTxs []json.RawMessage for _, gdValidator := range genDoc.Validators { pk := gdValidator.PubKey - validatorsPKs = append(validatorsPKs, pk) // append keys for output + validatorsPKs = append(validatorsPKs, pk) + appGenTx, _, _, err := gapp.GaiaAppGenTxNF(cdc, pk, sdk.AccAddress(pk.Address()), "test_val1") require.NoError(t, err) + appGenTxs = append(appGenTxs, appGenTx) } @@ -144,7 +170,7 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress // add some tokens to init accounts for _, addr := range initAddrs { accAuth := auth.NewBaseAccountWithAddress(addr) - accAuth.Coins = sdk.Coins{sdk.NewCoin("steak", 100)} + accAuth.Coins = sdk.Coins{sdk.NewInt64Coin("steak", 100)} acc := gapp.NewGenesisAccount(&accAuth) genesisState.Accounts = append(genesisState.Accounts, acc) genesisState.StakeData.Pool.LooseTokens = genesisState.StakeData.Pool.LooseTokens.Add(sdk.NewRat(100)) @@ -154,79 +180,88 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress require.NoError(t, err) genDoc.AppState = appState - // LCD listen address - var listenAddr string - listenAddr, port, err = server.FreeTCPAddr() + listenAddr, port, err := server.FreeTCPAddr() require.NoError(t, err) - // XXX: need to set this so LCD knows the tendermint node address! + // XXX: Need to set this so LCD knows the tendermint node address! viper.Set(client.FlagNode, config.RPC.ListenAddress) viper.Set(client.FlagChainID, genDoc.ChainID) node, err := startTM(config, logger, genDoc, privVal, app) require.NoError(t, err) + lcd, err := startLCD(logger, listenAddr, cdc) require.NoError(t, err) - //time.Sleep(time.Second) - //tests.WaitForHeight(2, port) tests.WaitForLCDStart(port) tests.WaitForHeight(1, port) - // for use in defer - cleanup = func() { + cleanup := func() { + logger.Debug("cleaning up LCD initialization") node.Stop() node.Wait() lcd.Close() } - return + return cleanup, validatorsPKs, port } -// Create & start in-process tendermint node with memdb -// and in-process abci application. -// TODO: need to clean up the WAL dir or enable it to be not persistent -func startTM(tmcfg *tmcfg.Config, logger log.Logger, genDoc *tmtypes.GenesisDoc, privVal tmtypes.PrivValidator, app abci.Application) (*nm.Node, error) { +// startTM creates and starts an in-process Tendermint node with memDB and +// in-process ABCI application. It returns the new node or any error that +// occurred. +// +// TODO: Clean up the WAL dir or enable it to be not persistent! +func startTM( + tmcfg *tmcfg.Config, logger log.Logger, genDoc *tmtypes.GenesisDoc, + privVal tmtypes.PrivValidator, app abci.Application, +) (*nm.Node, error) { genDocProvider := func() (*tmtypes.GenesisDoc, error) { return genDoc, nil } dbProvider := func(*nm.DBContext) (dbm.DB, error) { return dbm.NewMemDB(), nil } - n, err := nm.NewNode(tmcfg, + node, err := nm.NewNode( + tmcfg, privVal, proxy.NewLocalClientCreator(app), genDocProvider, dbProvider, - nm.DefaultMetricsProvider, - logger.With("module", "node")) + nm.DefaultMetricsProvider(tmcfg.Instrumentation), + logger.With("module", "node"), + ) if err != nil { return nil, err } - err = n.Start() + err = node.Start() if err != nil { return nil, err } - // wait for rpc tests.WaitForRPC(tmcfg.RPC.ListenAddress) - logger.Info("Tendermint running!") - return n, err + + return node, err } -// start the LCD. note this blocks! +// startLCD starts the LCD. +// +// NOTE: This causes the thread to block. func startLCD(logger log.Logger, listenAddr string, cdc *wire.Codec) (net.Listener, error) { - handler := createHandler(cdc) - return tmrpc.StartHTTPServer(listenAddr, handler, logger, tmrpc.Config{}) + return tmrpc.StartHTTPServer(listenAddr, createHandler(cdc), logger, tmrpc.Config{}) } -// make a test lcd test request +// Request makes a test LCD test request. It returns a response object and a +// stringified response body. func Request(t *testing.T, port, method, path string, payload []byte) (*http.Response, string) { - var res *http.Response - var err error + var ( + err error + res *http.Response + ) url := fmt.Sprintf("http://localhost:%v%v", port, path) + fmt.Println("REQUEST " + method + " " + url) + req, err := http.NewRequest(method, url, bytes.NewBuffer(payload)) require.Nil(t, err) + res, err = http.DefaultClient.Do(req) - // res, err = http.Post(url, "application/json", bytes.NewBuffer(payload)) require.Nil(t, err) output, err := ioutil.ReadAll(res.Body) diff --git a/client/lcd/version.go b/client/lcd/version.go index 4e328b7a0..377d7ca26 100644 --- a/client/lcd/version.go +++ b/client/lcd/version.go @@ -15,14 +15,15 @@ func CLIVersionRequestHandler(w http.ResponseWriter, r *http.Request) { } // connected node version REST handler endpoint -func NodeVersionRequestHandler(ctx context.CoreContext) http.HandlerFunc { +func NodeVersionRequestHandler(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - version, err := ctx.Query("/app/version") + version, err := cliCtx.Query("/app/version") if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("Could't query version. Error: %s", err.Error()))) return } + w.Write(version) } } diff --git a/client/rpc/block.go b/client/rpc/block.go index 3244e8d12..fb4376bc1 100644 --- a/client/rpc/block.go +++ b/client/rpc/block.go @@ -5,11 +5,11 @@ import ( "net/http" "strconv" - "github.com/gorilla/mux" - "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" + + "github.com/gorilla/mux" + "github.com/spf13/cobra" ) const ( @@ -31,9 +31,9 @@ func BlockCommand() *cobra.Command { return cmd } -func getBlock(ctx context.CoreContext, height *int64) ([]byte, error) { +func getBlock(cliCtx context.CLIContext, height *int64) ([]byte, error) { // get the node - node, err := ctx.GetNode() + node, err := cliCtx.GetNode() if err != nil { return nil, err } @@ -57,8 +57,8 @@ func getBlock(ctx context.CoreContext, height *int64) ([]byte, error) { } // get the current blockchain height -func GetChainHeight(ctx context.CoreContext) (int64, error) { - node, err := ctx.GetNode() +func GetChainHeight(cliCtx context.CLIContext) (int64, error) { + node, err := cliCtx.GetNode() if err != nil { return -1, err } @@ -86,7 +86,7 @@ func printBlock(cmd *cobra.Command, args []string) error { } } - output, err := getBlock(context.NewCoreContextFromViper(), height) + output, err := getBlock(context.NewCLIContext(), height) if err != nil { return err } @@ -97,7 +97,7 @@ func printBlock(cmd *cobra.Command, args []string) error { // REST // REST handler to get a block -func BlockRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { +func BlockRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) height, err := strconv.ParseInt(vars["height"], 10, 64) @@ -106,13 +106,13 @@ func BlockRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { w.Write([]byte("ERROR: Couldn't parse block height. Assumed format is '/block/{height}'.")) return } - chainHeight, err := GetChainHeight(ctx) + chainHeight, err := GetChainHeight(cliCtx) if height > chainHeight { w.WriteHeader(404) w.Write([]byte("ERROR: Requested block height is bigger then the chain length.")) return } - output, err := getBlock(ctx, &height) + output, err := getBlock(cliCtx, &height) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) @@ -123,15 +123,15 @@ func BlockRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { } // REST handler to get the latest block -func LatestBlockRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { +func LatestBlockRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - height, err := GetChainHeight(ctx) + height, err := GetChainHeight(cliCtx) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) return } - output, err := getBlock(ctx, &height) + output, err := getBlock(cliCtx, &height) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) diff --git a/client/rpc/root.go b/client/rpc/root.go index bb5a162a7..a8171a293 100644 --- a/client/rpc/root.go +++ b/client/rpc/root.go @@ -44,11 +44,11 @@ func initClientCommand() *cobra.Command { } // Register REST endpoints -func RegisterRoutes(ctx context.CoreContext, r *mux.Router) { - r.HandleFunc("/node_info", NodeInfoRequestHandlerFn(ctx)).Methods("GET") - r.HandleFunc("/syncing", NodeSyncingRequestHandlerFn(ctx)).Methods("GET") - r.HandleFunc("/blocks/latest", LatestBlockRequestHandlerFn(ctx)).Methods("GET") - r.HandleFunc("/blocks/{height}", BlockRequestHandlerFn(ctx)).Methods("GET") - r.HandleFunc("/validatorsets/latest", LatestValidatorSetRequestHandlerFn(ctx)).Methods("GET") - r.HandleFunc("/validatorsets/{height}", ValidatorSetRequestHandlerFn(ctx)).Methods("GET") +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router) { + r.HandleFunc("/node_info", NodeInfoRequestHandlerFn(cliCtx)).Methods("GET") + r.HandleFunc("/syncing", NodeSyncingRequestHandlerFn(cliCtx)).Methods("GET") + r.HandleFunc("/blocks/latest", LatestBlockRequestHandlerFn(cliCtx)).Methods("GET") + r.HandleFunc("/blocks/{height}", BlockRequestHandlerFn(cliCtx)).Methods("GET") + r.HandleFunc("/validatorsets/latest", LatestValidatorSetRequestHandlerFn(cliCtx)).Methods("GET") + r.HandleFunc("/validatorsets/{height}", ValidatorSetRequestHandlerFn(cliCtx)).Methods("GET") } diff --git a/client/rpc/status.go b/client/rpc/status.go index 0c1f41593..ea090d32f 100644 --- a/client/rpc/status.go +++ b/client/rpc/status.go @@ -18,23 +18,25 @@ func statusCommand() *cobra.Command { Short: "Query remote node for status", RunE: printNodeStatus, } + cmd.Flags().StringP(client.FlagNode, "n", "tcp://localhost:26657", "Node to connect to") return cmd } -func getNodeStatus(ctx context.CoreContext) (*ctypes.ResultStatus, error) { +func getNodeStatus(cliCtx context.CLIContext) (*ctypes.ResultStatus, error) { // get the node - node, err := ctx.GetNode() + node, err := cliCtx.GetNode() if err != nil { return &ctypes.ResultStatus{}, err } + return node.Status() } // CMD func printNodeStatus(cmd *cobra.Command, args []string) error { - status, err := getNodeStatus(context.NewCoreContextFromViper()) + status, err := getNodeStatus(context.NewCLIContext()) if err != nil { return err } @@ -52,9 +54,9 @@ func printNodeStatus(cmd *cobra.Command, args []string) error { // REST // REST handler for node info -func NodeInfoRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { +func NodeInfoRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - status, err := getNodeStatus(ctx) + status, err := getNodeStatus(cliCtx) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) @@ -68,14 +70,15 @@ func NodeInfoRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { w.Write([]byte(err.Error())) return } + w.Write(output) } } // REST handler for node syncing -func NodeSyncingRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { +func NodeSyncingRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - status, err := getNodeStatus(ctx) + status, err := getNodeStatus(cliCtx) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) @@ -88,6 +91,7 @@ func NodeSyncingRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { w.Write([]byte(err.Error())) return } + w.Write([]byte(strconv.FormatBool(syncing))) } } diff --git a/client/rpc/validators.go b/client/rpc/validators.go index b8a6c4cc2..d2daa4ec5 100644 --- a/client/rpc/validators.go +++ b/client/rpc/validators.go @@ -58,9 +58,9 @@ func bech32ValidatorOutput(validator *tmtypes.Validator) (ValidatorOutput, error }, nil } -func getValidators(ctx context.CoreContext, height *int64) ([]byte, error) { +func getValidators(cliCtx context.CLIContext, height *int64) ([]byte, error) { // get the node - node, err := ctx.GetNode() + node, err := cliCtx.GetNode() if err != nil { return nil, err } @@ -74,6 +74,7 @@ func getValidators(ctx context.CoreContext, height *int64) ([]byte, error) { BlockHeight: validatorsRes.BlockHeight, Validators: make([]ValidatorOutput, len(validatorsRes.Validators)), } + for i := 0; i < len(validatorsRes.Validators); i++ { outputValidatorsRes.Validators[i], err = bech32ValidatorOutput(validatorsRes.Validators[i]) if err != nil { @@ -85,6 +86,7 @@ func getValidators(ctx context.CoreContext, height *int64) ([]byte, error) { if err != nil { return nil, err } + return output, nil } @@ -104,7 +106,7 @@ func printValidators(cmd *cobra.Command, args []string) error { } } - output, err := getValidators(context.NewCoreContextFromViper(), height) + output, err := getValidators(context.NewCLIContext(), height) if err != nil { return err } @@ -116,22 +118,25 @@ func printValidators(cmd *cobra.Command, args []string) error { // REST // Validator Set at a height REST handler -func ValidatorSetRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { +func ValidatorSetRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) + height, err := strconv.ParseInt(vars["height"], 10, 64) if err != nil { w.WriteHeader(400) w.Write([]byte("ERROR: Couldn't parse block height. Assumed format is '/validatorsets/{height}'.")) return } - chainHeight, err := GetChainHeight(ctx) + + chainHeight, err := GetChainHeight(cliCtx) if height > chainHeight { w.WriteHeader(404) w.Write([]byte("ERROR: Requested block height is bigger then the chain length.")) return } - output, err := getValidators(ctx, &height) + + output, err := getValidators(cliCtx, &height) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) @@ -143,20 +148,22 @@ func ValidatorSetRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { } // Latest Validator Set REST handler -func LatestValidatorSetRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { +func LatestValidatorSetRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - height, err := GetChainHeight(ctx) + height, err := GetChainHeight(cliCtx) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) return } - output, err := getValidators(ctx, &height) + + output, err := getValidators(cliCtx, &height) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) return } + w.Write(output) } } diff --git a/client/tx/broadcast.go b/client/tx/broadcast.go index 21f576db4..89ad48f43 100644 --- a/client/tx/broadcast.go +++ b/client/tx/broadcast.go @@ -13,7 +13,7 @@ type BroadcastTxBody struct { } // BroadcastTx REST Handler -func BroadcastTxRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { +func BroadcastTxRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var m BroadcastTxBody @@ -25,7 +25,7 @@ func BroadcastTxRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return } - res, err := ctx.BroadcastTx([]byte(m.TxBytes)) + res, err := cliCtx.BroadcastTx([]byte(m.TxBytes)) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) diff --git a/client/tx/query.go b/client/tx/query.go index dfe626c38..f95776b10 100644 --- a/client/tx/query.go +++ b/client/tx/query.go @@ -21,24 +21,25 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth" ) -// Get the default command for a tx query +// QueryTxCmd implements the default command for a tx query. func QueryTxCmd(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "tx [hash]", Short: "Matches this txhash over all committed blocks", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - // find the key to look up the account hashHexStr := args[0] trustNode := viper.GetBool(client.FlagTrustNode) - output, err := queryTx(cdc, context.NewCoreContextFromViper(), hashHexStr, trustNode) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + output, err := queryTx(cdc, cliCtx, hashHexStr, trustNode) if err != nil { return err } - fmt.Println(string(output)) + fmt.Println(string(output)) return nil }, } @@ -50,14 +51,13 @@ func QueryTxCmd(cdc *wire.Codec) *cobra.Command { return cmd } -func queryTx(cdc *wire.Codec, ctx context.CoreContext, hashHexStr string, trustNode bool) ([]byte, error) { +func queryTx(cdc *wire.Codec, cliCtx context.CLIContext, hashHexStr string, trustNode bool) ([]byte, error) { hash, err := hex.DecodeString(hashHexStr) if err != nil { return nil, err } - // get the node - node, err := ctx.GetNode() + node, err := cliCtx.GetNode() if err != nil { return nil, err } @@ -66,6 +66,7 @@ func queryTx(cdc *wire.Codec, ctx context.CoreContext, hashHexStr string, trustN if err != nil { return nil, err } + info, err := formatTxResult(cdc, res) if err != nil { return nil, err @@ -74,24 +75,23 @@ func queryTx(cdc *wire.Codec, ctx context.CoreContext, hashHexStr string, trustN return wire.MarshalJSONIndent(cdc, info) } -func formatTxResult(cdc *wire.Codec, res *ctypes.ResultTx) (txInfo, error) { +func formatTxResult(cdc *wire.Codec, res *ctypes.ResultTx) (Info, error) { // TODO: verify the proof if requested tx, err := parseTx(cdc, res.Tx) if err != nil { - return txInfo{}, err + return Info{}, err } - info := txInfo{ + return Info{ Hash: res.Hash, Height: res.Height, Tx: tx, Result: res.TxResult, - } - return info, nil + }, nil } -// txInfo is used to prepare info to display -type txInfo struct { +// Info is used to prepare info to display +type Info struct { Hash common.HexBytes `json:"hash"` Height int64 `json:"height"` Tx sdk.Tx `json:"tx"` @@ -100,17 +100,19 @@ type txInfo struct { func parseTx(cdc *wire.Codec, txBytes []byte) (sdk.Tx, error) { var tx auth.StdTx + err := cdc.UnmarshalBinary(txBytes, &tx) if err != nil { return nil, err } + return tx, nil } // REST // transaction query REST handler -func QueryTxRequestHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { +func QueryTxRequestHandlerFn(cdc *wire.Codec, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) hashHexStr := vars["hash"] @@ -120,12 +122,13 @@ func QueryTxRequestHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.Hand trustNode = true } - output, err := queryTx(cdc, ctx, hashHexStr, trustNode) + output, err := queryTx(cdc, cliCtx, hashHexStr, trustNode) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) return } + w.Write(output) } } diff --git a/client/tx/root.go b/client/tx/root.go index 5def5a544..7e18d5aae 100644 --- a/client/tx/root.go +++ b/client/tx/root.go @@ -17,9 +17,9 @@ func AddCommands(cmd *cobra.Command, cdc *wire.Codec) { } // register REST routes -func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec) { - r.HandleFunc("/txs/{hash}", QueryTxRequestHandlerFn(cdc, ctx)).Methods("GET") - r.HandleFunc("/txs", SearchTxRequestHandlerFn(ctx, cdc)).Methods("GET") +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec) { + r.HandleFunc("/txs/{hash}", QueryTxRequestHandlerFn(cdc, cliCtx)).Methods("GET") + r.HandleFunc("/txs", SearchTxRequestHandlerFn(cliCtx, cdc)).Methods("GET") // r.HandleFunc("/txs/sign", SignTxRequstHandler).Methods("POST") // r.HandleFunc("/txs/broadcast", BroadcastTxRequestHandler).Methods("POST") } diff --git a/client/tx/search.go b/client/tx/search.go index 76c394f92..adad29d7d 100644 --- a/client/tx/search.go +++ b/client/tx/search.go @@ -7,15 +7,15 @@ import ( "net/url" "strings" - "github.com/spf13/cobra" - "github.com/spf13/viper" - - ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" + + "github.com/spf13/cobra" + "github.com/spf13/viper" + + ctypes "github.com/tendermint/tendermint/rpc/core/types" ) const ( @@ -31,14 +31,18 @@ func SearchTxCmd(cdc *wire.Codec) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { tags := viper.GetStringSlice(flagTags) - txs, err := searchTxs(context.NewCoreContextFromViper(), cdc, tags) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + txs, err := searchTxs(cliCtx, cdc, tags) if err != nil { return err } + output, err := cdc.MarshalJSON(txs) if err != nil { return err } + fmt.Println(string(output)) return nil }, @@ -53,19 +57,22 @@ func SearchTxCmd(cdc *wire.Codec) *cobra.Command { return cmd } -func searchTxs(ctx context.CoreContext, cdc *wire.Codec, tags []string) ([]txInfo, error) { +func searchTxs(cliCtx context.CLIContext, cdc *wire.Codec, tags []string) ([]Info, error) { if len(tags) == 0 { return nil, errors.New("must declare at least one tag to search") } + // XXX: implement ANY query := strings.Join(tags, " AND ") + // get the node - node, err := ctx.GetNode() + node, err := cliCtx.GetNode() if err != nil { return nil, err } prove := !viper.GetBool(client.FlagTrustNode) + // TODO: take these as args page := 0 perPage := 100 @@ -74,7 +81,7 @@ func searchTxs(ctx context.CoreContext, cdc *wire.Codec, tags []string) ([]txInf return nil, err } - info, err := formatTxResults(cdc, res.Txs) + info, err := FormatTxResults(cdc, res.Txs) if err != nil { return nil, err } @@ -82,9 +89,10 @@ func searchTxs(ctx context.CoreContext, cdc *wire.Codec, tags []string) ([]txInf return info, nil } -func formatTxResults(cdc *wire.Codec, res []*ctypes.ResultTx) ([]txInfo, error) { +// parse the indexed txs into an array of Info +func FormatTxResults(cdc *wire.Codec, res []*ctypes.ResultTx) ([]Info, error) { var err error - out := make([]txInfo, len(res)) + out := make([]Info, len(res)) for i := range res { out[i], err = formatTxResult(cdc, res[i]) if err != nil { @@ -98,7 +106,7 @@ func formatTxResults(cdc *wire.Codec, res []*ctypes.ResultTx) ([]txInfo, error) // REST // Search Tx REST Handler -func SearchTxRequestHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerFunc { +func SearchTxRequestHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { tag := r.FormValue("tag") if tag == "" { @@ -106,14 +114,17 @@ func SearchTxRequestHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.Han w.Write([]byte("You need to provide at least a tag as a key=value pair to search for. Postfix the key with _bech32 to search bech32-encoded addresses or public keys")) return } + keyValue := strings.Split(tag, "=") key := keyValue[0] + value, err := url.QueryUnescape(keyValue[1]) if err != nil { w.WriteHeader(400) w.Write([]byte("Could not decode address: " + err.Error())) return } + if strings.HasSuffix(key, "_bech32") { bech32address := strings.Trim(value, "'") prefix := strings.Split(bech32address, "1")[0] @@ -127,7 +138,7 @@ func SearchTxRequestHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.Han tag = strings.TrimRight(key, "_bech32") + "='" + sdk.AccAddress(bz).String() + "'" } - txs, err := searchTxs(ctx, cdc, []string{tag}) + txs, err := searchTxs(cliCtx, cdc, []string{tag}) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) diff --git a/client/tx/sign.go b/client/tx/sign.go index bedd202b4..786c7fa0b 100644 --- a/client/tx/sign.go +++ b/client/tx/sign.go @@ -8,7 +8,7 @@ import ( keys "github.com/cosmos/cosmos-sdk/crypto/keys" ) -// REST request body +// REST request body for signed txs // TODO does this need to be exposed? type SignTxBody struct { Name string `json:"name"` @@ -44,5 +44,5 @@ func SignTxRequstHandler(w http.ResponseWriter, r *http.Request) { return } - w.Write(sig.Bytes()) + w.Write(sig) } diff --git a/client/utils/utils.go b/client/utils/utils.go new file mode 100644 index 000000000..8a058b56f --- /dev/null +++ b/client/utils/utils.go @@ -0,0 +1,60 @@ +package utils + +import ( + "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/keys" + sdk "github.com/cosmos/cosmos-sdk/types" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" +) + +// SendTx implements a auxiliary handler that facilitates sending a series of +// messages in a signed transaction given a TxContext and a QueryContext. It +// ensures that the account exists, has a proper number and sequence set. In +// addition, it builds and signs a transaction with the supplied messages. +// Finally, it broadcasts the signed transaction to a node. +func SendTx(txCtx authctx.TxContext, cliCtx context.CLIContext, msgs []sdk.Msg) error { + if err := cliCtx.EnsureAccountExists(); err != nil { + return err + } + + from, err := cliCtx.GetFromAddress() + if err != nil { + return err + } + + // TODO: (ref #1903) Allow for user supplied account number without + // automatically doing a manual lookup. + if txCtx.AccountNumber == 0 { + accNum, err := cliCtx.GetAccountNumber(from) + if err != nil { + return err + } + + txCtx = txCtx.WithAccountNumber(accNum) + } + + // TODO: (ref #1903) Allow for user supplied account sequence without + // automatically doing a manual lookup. + if txCtx.Sequence == 0 { + accSeq, err := cliCtx.GetAccountSequence(from) + if err != nil { + return err + } + + txCtx = txCtx.WithSequence(accSeq) + } + + passphrase, err := keys.GetPassphrase(cliCtx.FromAddressName) + if err != nil { + return err + } + + // build and sign the transaction + txBytes, err := txCtx.BuildAndSign(cliCtx.FromAddressName, passphrase, msgs) + if err != nil { + return err + } + + // broadcast to a Tendermint node + return cliCtx.EnsureBroadcastTx(txBytes) +} diff --git a/cmd/cosmos-sdk-cli/cmd/init.go b/cmd/cosmos-sdk-cli/cmd/init.go new file mode 100644 index 000000000..8cebc48f2 --- /dev/null +++ b/cmd/cosmos-sdk-cli/cmd/init.go @@ -0,0 +1,158 @@ +package cmd + +import ( + "fmt" + "go/build" + "io/ioutil" + "os" + "strings" + + "path/filepath" + + "github.com/cosmos/cosmos-sdk/version" + "github.com/spf13/cobra" + tmversion "github.com/tendermint/tendermint/version" +) + +var remoteBasecoinPath = "github.com/cosmos/cosmos-sdk/examples/basecoin" + +// Replacer to replace all instances of basecoin/basecli/BasecoinApp to project specific names +// Gets initialized when initCmd is executing after getting the project name from user +var replacer *strings.Replacer + +// Remote path for the project. +var remoteProjectPath string + +func init() { + initCmd.Flags().StringVarP(&remoteProjectPath, "project-path", "p", "", "Remote project path. eg: github.com/your_user_name/project_name") + rootCmd.AddCommand(initCmd) +} + +var initCmd = &cobra.Command{ + Use: "init [ProjectName]", + Short: "Initialize your new cosmos zone", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + fmt.Print("Thanks for choosing Cosmos-SDK to build your project.\n\n") + projectName := args[0] + capitalizedProjectName := strings.Title(projectName) + shortProjectName := strings.ToLower(projectName) + remoteProjectPath = strings.ToLower(strings.TrimSpace(remoteProjectPath)) + if remoteProjectPath == "" { + remoteProjectPath = strings.ToLower(shortProjectName) + } + replacer = strings.NewReplacer("basecli", shortProjectName+"cli", + "basecoind", shortProjectName+"d", + "BasecoinApp", capitalizedProjectName+"App", + remoteBasecoinPath, remoteProjectPath, + "basecoin", shortProjectName, + "Basecoin", capitalizedProjectName) + return setupBasecoinWorkspace(shortProjectName, remoteProjectPath) + }, +} + +func resolveProjectPath(remoteProjectPath string) string { + gopath := os.Getenv("GOPATH") + if gopath == "" { + gopath = build.Default.GOPATH + // Use $HOME/go + } + return gopath + string(os.PathSeparator) + "src" + string(os.PathSeparator) + remoteProjectPath +} + +func copyBasecoinTemplate(projectName string, projectPath string, remoteProjectPath string) { + basecoinProjectPath := resolveProjectPath(remoteBasecoinPath) + filepath.Walk(basecoinProjectPath, func(path string, f os.FileInfo, err error) error { + if !f.IsDir() { + data, err := ioutil.ReadFile(path) + if err != nil { + return err + } + contents := string(data) + // Extract relative file path eg: app/app.go instead of /Users/..../github.com/cosmos/...examples/basecoin/app/app.go + relativeFilePath := path[len(basecoinProjectPath)+1:] + // Evaluating the filepath in the new project folder + projectFilePath := projectPath + string(os.PathSeparator) + relativeFilePath + projectFilePath = replacer.Replace(projectFilePath) + lengthOfRootDir := strings.LastIndex(projectFilePath, string(os.PathSeparator)) + // Extracting the path of root directory from the filepath + rootDir := projectFilePath[0:lengthOfRootDir] + // Creating the required directory first + os.MkdirAll(rootDir, os.ModePerm) + fmt.Println("Creating " + projectFilePath) + // Writing the contents to a file in the project folder + contents = replacer.Replace(contents) + ioutil.WriteFile(projectFilePath, []byte(contents), os.ModePerm) + } + return nil + }) +} + +func createGopkg(projectPath string) { + // Create gopkg.toml file + dependencies := map[string]string{ + "github.com/cosmos/cosmos-sdk": "=" + version.Version, + "github.com/stretchr/testify": "=1.2.1", + "github.com/spf13/cobra": "=0.0.1", + "github.com/spf13/viper": "=1.0.0", + } + overrides := map[string]string{ + "github.com/golang/protobuf": "1.1.0", + "github.com/tendermint/tendermint": tmversion.Version, + } + contents := "" + for dependency, version := range dependencies { + contents += "[[constraint]]\n\tname = \"" + dependency + "\"\n\tversion = \"" + version + "\"\n\n" + } + for dependency, version := range overrides { + contents += "[[override]]\n\tname = \"" + dependency + "\"\n\tversion = \"=" + version + "\"\n\n" + } + contents += "[prune]\n\tgo-tests = true\n\tunused-packages = true" + ioutil.WriteFile(projectPath+"/Gopkg.toml", []byte(contents), os.ModePerm) +} + +func createMakefile(projectPath string) { + // Create makefile + // TODO: Should we use tools/ directory as in Cosmos-SDK to get tools for linting etc. + makefileContents := `PACKAGES=$(shell go list ./... | grep -v '/vendor/') + +all: get_tools get_vendor_deps build test + +get_tools: + go get github.com/golang/dep/cmd/dep + +build: + go build -o bin/basecli cmd/basecli/main.go && go build -o bin/basecoind cmd/basecoind/main.go + +get_vendor_deps: + @rm -rf vendor/ + @dep ensure + +test: + @go test $(PACKAGES) + +benchmark: + @go test -bench=. $(PACKAGES) + +.PHONY: all build test benchmark` + + // Replacing instances of base* to project specific names + makefileContents = replacer.Replace(makefileContents) + + ioutil.WriteFile(projectPath+"/Makefile", []byte(makefileContents), os.ModePerm) + +} + +func setupBasecoinWorkspace(projectName string, remoteProjectPath string) error { + projectPath := resolveProjectPath(remoteProjectPath) + fmt.Println("Configuring your project in " + projectPath) + // Check if the projectPath already exists or not + if _, err := os.Stat(projectPath); !os.IsNotExist(err) { + return fmt.Errorf("Unable to initialize the project. %s already exists", projectPath) + } + copyBasecoinTemplate(projectName, projectPath, remoteProjectPath) + createGopkg(projectPath) + createMakefile(projectPath) + fmt.Printf("Initialized a new project at %s.\nHappy hacking!\n", projectPath) + return nil +} diff --git a/cmd/cosmos-sdk-cli/cmd/root.go b/cmd/cosmos-sdk-cli/cmd/root.go new file mode 100644 index 000000000..2eddd79b5 --- /dev/null +++ b/cmd/cosmos-sdk-cli/cmd/root.go @@ -0,0 +1,21 @@ +package cmd + +import ( + "fmt" + "os" + + "github.com/spf13/cobra" +) + +var rootCmd = &cobra.Command{ + Use: "cosmos-sdk-cli", + Short: "Tools to develop on cosmos-sdk", +} + +// Execute the command +func Execute() { + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } +} diff --git a/cmd/cosmos-sdk-cli/main.go b/cmd/cosmos-sdk-cli/main.go new file mode 100644 index 000000000..ee5ac0215 --- /dev/null +++ b/cmd/cosmos-sdk-cli/main.go @@ -0,0 +1,9 @@ +package main + +import ( + "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/cmd" +) + +func main() { + cmd.Execute() +} diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go index ac1d27d39..a96efa6b1 100644 --- a/cmd/gaia/app/app.go +++ b/cmd/gaia/app/app.go @@ -18,6 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank" "github.com/cosmos/cosmos-sdk/x/gov" "github.com/cosmos/cosmos-sdk/x/ibc" + "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/stake" ) @@ -45,6 +46,8 @@ type GaiaApp struct { keySlashing *sdk.KVStoreKey keyGov *sdk.KVStoreKey keyFeeCollection *sdk.KVStoreKey + keyParams *sdk.KVStoreKey + tkeyParams *sdk.TransientStoreKey // Manage getting and setting accounts accountMapper auth.AccountMapper @@ -54,13 +57,14 @@ type GaiaApp struct { stakeKeeper stake.Keeper slashingKeeper slashing.Keeper govKeeper gov.Keeper + paramsKeeper params.Keeper } // NewGaiaApp returns a reference to an initialized GaiaApp. func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptions ...func(*bam.BaseApp)) *GaiaApp { cdc := MakeCodec() - bApp := bam.NewBaseApp(appName, cdc, logger, db, baseAppOptions...) + bApp := bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) var app = &GaiaApp{ @@ -73,6 +77,8 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio keySlashing: sdk.NewKVStoreKey("slashing"), keyGov: sdk.NewKVStoreKey("gov"), keyFeeCollection: sdk.NewKVStoreKey("fee"), + keyParams: sdk.NewKVStoreKey("params"), + tkeyParams: sdk.NewTransientStoreKey("transient_params"), } // define the accountMapper @@ -85,10 +91,11 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio // add handlers app.coinKeeper = bank.NewKeeper(app.accountMapper) app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace)) + app.paramsKeeper = params.NewKeeper(app.cdc, app.keyParams) app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace)) - app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.RegisterCodespace(slashing.DefaultCodespace)) - app.govKeeper = gov.NewKeeper(app.cdc, app.keyGov, app.coinKeeper, app.stakeKeeper, app.RegisterCodespace(gov.DefaultCodespace)) + app.govKeeper = gov.NewKeeper(app.cdc, app.keyGov, app.paramsKeeper.Setter(), app.coinKeeper, app.stakeKeeper, app.RegisterCodespace(gov.DefaultCodespace)) app.feeCollectionKeeper = auth.NewFeeCollectionKeeper(app.cdc, app.keyFeeCollection) + app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.paramsKeeper.Getter(), app.RegisterCodespace(slashing.DefaultCodespace)) // register message routes app.Router(). @@ -103,7 +110,8 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio app.SetBeginBlocker(app.BeginBlocker) app.SetEndBlocker(app.EndBlocker) app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper)) - app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyIBC, app.keyStake, app.keySlashing, app.keyGov, app.keyFeeCollection) + app.MountStoresIAVL(app.keyMain, app.keyAccount, app.keyIBC, app.keyStake, app.keySlashing, app.keyGov, app.keyFeeCollection, app.keyParams) + app.MountStore(app.tkeyParams, sdk.StoreTypeTransient) err := app.LoadLatestVersion(app.keyMain) if err != nil { cmn.Exit(err.Error()) @@ -138,10 +146,10 @@ func (app *GaiaApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) ab // application updates every end block // nolint: unparam func (app *GaiaApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { + tags := gov.EndBlocker(ctx, app.govKeeper) validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper) - - tags, _ := gov.EndBlocker(ctx, app.govKeeper) - + // Add these new validators to the addr -> pubkey map. + app.slashingKeeper.AddValidators(ctx, validatorUpdates) return abci.ResponseEndBlock{ ValidatorUpdates: validatorUpdates, Tags: tags, @@ -168,15 +176,20 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci } // load the initial stake information - err = stake.InitGenesis(ctx, app.stakeKeeper, genesisState.StakeData) + validators, err := stake.InitGenesis(ctx, app.stakeKeeper, genesisState.StakeData) if err != nil { panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468 // return sdk.ErrGenesisParse("").TraceCause(err, "") } + // load the address to pubkey map + slashing.InitGenesis(ctx, app.slashingKeeper, genesisState.StakeData) + gov.InitGenesis(ctx, app.govKeeper, gov.DefaultGenesisState()) - return abci.ResponseInitChain{} + return abci.ResponseInitChain{ + Validators: validators, + } } // export the state of gaia for a genesis file diff --git a/cmd/gaia/app/app_test.go b/cmd/gaia/app/app_test.go index 759fc55a6..63d650cef 100644 --- a/cmd/gaia/app/app_test.go +++ b/cmd/gaia/app/app_test.go @@ -1,9 +1,15 @@ package app import ( + "os" + "testing" + "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/stake" + "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" abci "github.com/tendermint/tendermint/abci/types" ) @@ -31,3 +37,14 @@ func setGenesis(gapp *GaiaApp, accs ...*auth.BaseAccount) error { return nil } + +func TestGaiadExport(t *testing.T) { + db := db.NewMemDB() + gapp := NewGaiaApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil) + setGenesis(gapp) + + // Making a new app object with the db, so that initchain hasn't been called + newGapp := NewGaiaApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil) + _, _, err := newGapp.ExportAppStateAndValidators() + require.NoError(t, err, "ExportAppStateAndValidators should not have an error") +} diff --git a/cmd/gaia/app/genesis.go b/cmd/gaia/app/genesis.go index af547e844..1731fe2dc 100644 --- a/cmd/gaia/app/genesis.go +++ b/cmd/gaia/app/genesis.go @@ -3,19 +3,25 @@ package app import ( "encoding/json" "errors" + "fmt" - "github.com/spf13/pflag" - "github.com/tendermint/tendermint/crypto" - tmtypes "github.com/tendermint/tendermint/types" - + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/server/config" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/stake" + + "github.com/spf13/pflag" + + "github.com/tendermint/tendermint/crypto" + tmtypes "github.com/tendermint/tendermint/types" ) +// DefaultKeyPass contains the default key password for genesis transactions +const DefaultKeyPass = "12345678" + var ( // bonded tokens given to genesis validators/accounts freeFermionVal = int64(100) @@ -81,30 +87,49 @@ type GaiaGenTx struct { PubKey string `json:"pub_key"` } -// Generate a gaia genesis transaction with flags -func GaiaAppGenTx(cdc *wire.Codec, pk crypto.PubKey, genTxConfig config.GenTx) ( - appGenTx, cliPrint json.RawMessage, validator tmtypes.GenesisValidator, err error) { +// GaiaAppGenTx generates a Gaia genesis transaction. +func GaiaAppGenTx( + cdc *wire.Codec, pk crypto.PubKey, genTxConfig config.GenTx, +) (appGenTx, cliPrint json.RawMessage, validator tmtypes.GenesisValidator, err error) { if genTxConfig.Name == "" { return nil, nil, tmtypes.GenesisValidator{}, errors.New("Must specify --name (validator moniker)") } - var addr sdk.AccAddress - var secret string - addr, secret, err = server.GenerateSaveCoinKey(genTxConfig.CliRoot, genTxConfig.Name, "1234567890", genTxConfig.Overwrite) - if err != nil { - return + buf := client.BufferStdin() + prompt := fmt.Sprintf("Password for account '%s' (default %s):", genTxConfig.Name, DefaultKeyPass) + + keyPass, err := client.GetPassword(prompt, buf) + if err != nil && keyPass != "" { + // An error was returned that either failed to read the password from + // STDIN or the given password is not empty but failed to meet minimum + // length requirements. + return appGenTx, cliPrint, validator, err } - mm := map[string]string{"secret": secret} - var bz []byte - bz, err = cdc.MarshalJSON(mm) + + if keyPass == "" { + keyPass = DefaultKeyPass + } + + addr, secret, err := server.GenerateSaveCoinKey( + genTxConfig.CliRoot, + genTxConfig.Name, + keyPass, + genTxConfig.Overwrite, + ) if err != nil { - return + return appGenTx, cliPrint, validator, err + } + + mm := map[string]string{"secret": secret} + bz, err := cdc.MarshalJSON(mm) + if err != nil { + return appGenTx, cliPrint, validator, err } cliPrint = json.RawMessage(bz) - appGenTx, _, validator, err = GaiaAppGenTxNF(cdc, pk, addr, genTxConfig.Name) - return + + return appGenTx, cliPrint, validator, err } // Generate a gaia genesis transaction without flags diff --git a/cmd/gaia/app/sim_test.go b/cmd/gaia/app/sim_test.go new file mode 100644 index 000000000..8a81a1a92 --- /dev/null +++ b/cmd/gaia/app/sim_test.go @@ -0,0 +1,181 @@ +package app + +import ( + "encoding/json" + "flag" + "fmt" + "math/rand" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/tendermint/tendermint/crypto" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + banksim "github.com/cosmos/cosmos-sdk/x/bank/simulation" + govsim "github.com/cosmos/cosmos-sdk/x/gov/simulation" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + slashingsim "github.com/cosmos/cosmos-sdk/x/slashing/simulation" + stake "github.com/cosmos/cosmos-sdk/x/stake" + stakesim "github.com/cosmos/cosmos-sdk/x/stake/simulation" +) + +var ( + seed int64 + numBlocks int + blockSize int + enabled bool + verbose bool +) + +func init() { + flag.Int64Var(&seed, "SimulationSeed", 42, "Simulation random seed") + flag.IntVar(&numBlocks, "SimulationNumBlocks", 500, "Number of blocks") + flag.IntVar(&blockSize, "SimulationBlockSize", 200, "Operations per block") + flag.BoolVar(&enabled, "SimulationEnabled", false, "Enable the simulation") + flag.BoolVar(&verbose, "SimulationVerbose", false, "Verbose log output") +} + +func appStateFn(r *rand.Rand, keys []crypto.PrivKey, accs []sdk.AccAddress) json.RawMessage { + var genesisAccounts []GenesisAccount + + // Randomly generate some genesis accounts + for _, acc := range accs { + coins := sdk.Coins{sdk.Coin{"steak", sdk.NewInt(100)}} + genesisAccounts = append(genesisAccounts, GenesisAccount{ + Address: acc, + Coins: coins, + }) + } + + // Default genesis state + stakeGenesis := stake.DefaultGenesisState() + var validators []stake.Validator + var delegations []stake.Delegation + // XXX Try different numbers of initially bonded validators + numInitiallyBonded := int64(50) + for i := 0; i < int(numInitiallyBonded); i++ { + validator := stake.NewValidator(accs[i], keys[i].PubKey(), stake.Description{}) + validator.Tokens = sdk.NewRat(100) + validator.DelegatorShares = sdk.NewRat(100) + delegation := stake.Delegation{accs[i], accs[i], sdk.NewRat(100), 0} + validators = append(validators, validator) + delegations = append(delegations, delegation) + } + stakeGenesis.Pool.LooseTokens = sdk.NewRat(int64(100*250) + (numInitiallyBonded * 100)) + stakeGenesis.Validators = validators + stakeGenesis.Bonds = delegations + // No inflation, for now + stakeGenesis.Params.InflationMax = sdk.NewRat(0) + stakeGenesis.Params.InflationMin = sdk.NewRat(0) + genesis := GenesisState{ + Accounts: genesisAccounts, + StakeData: stakeGenesis, + } + + // Marshal genesis + appState, err := MakeCodec().MarshalJSON(genesis) + if err != nil { + panic(err) + } + + return appState +} + +func testAndRunTxs(app *GaiaApp) []simulation.TestAndRunTx { + return []simulation.TestAndRunTx{ + banksim.TestAndRunSingleInputMsgSend(app.accountMapper), + govsim.SimulateMsgSubmitProposal(app.govKeeper, app.stakeKeeper), + govsim.SimulateMsgDeposit(app.govKeeper, app.stakeKeeper), + govsim.SimulateMsgVote(app.govKeeper, app.stakeKeeper), + stakesim.SimulateMsgCreateValidator(app.accountMapper, app.stakeKeeper), + stakesim.SimulateMsgEditValidator(app.stakeKeeper), + stakesim.SimulateMsgDelegate(app.accountMapper, app.stakeKeeper), + stakesim.SimulateMsgBeginUnbonding(app.accountMapper, app.stakeKeeper), + stakesim.SimulateMsgCompleteUnbonding(app.stakeKeeper), + stakesim.SimulateMsgBeginRedelegate(app.accountMapper, app.stakeKeeper), + stakesim.SimulateMsgCompleteRedelegate(app.stakeKeeper), + slashingsim.SimulateMsgUnrevoke(app.slashingKeeper), + } +} + +func invariants(app *GaiaApp) []simulation.Invariant { + return []simulation.Invariant{ + func(t *testing.T, baseapp *baseapp.BaseApp, log string) { + banksim.NonnegativeBalanceInvariant(app.accountMapper)(t, baseapp, log) + govsim.AllInvariants()(t, baseapp, log) + stakesim.AllInvariants(app.coinKeeper, app.stakeKeeper, app.accountMapper)(t, baseapp, log) + slashingsim.AllInvariants()(t, baseapp, log) + }, + } +} + +func TestFullGaiaSimulation(t *testing.T) { + if !enabled { + t.Skip("Skipping Gaia simulation") + } + + // Setup Gaia application + var logger log.Logger + if verbose { + logger = log.TestingLogger() + } else { + logger = log.NewNopLogger() + } + db := dbm.NewMemDB() + app := NewGaiaApp(logger, db, nil) + require.Equal(t, "GaiaApp", app.Name()) + + // Run randomized simulation + simulation.SimulateFromSeed( + t, app.BaseApp, appStateFn, seed, + testAndRunTxs(app), + []simulation.RandSetup{}, + invariants(app), + numBlocks, + blockSize, + false, + ) + +} + +// TODO: Make another test for the fuzzer itself, which just has noOp txs +// and doesn't depend on gaia +func TestAppStateDeterminism(t *testing.T) { + if !enabled { + t.Skip("Skipping Gaia simulation") + } + + numSeeds := 5 + numTimesToRunPerSeed := 5 + appHashList := make([]json.RawMessage, numTimesToRunPerSeed) + + for i := 0; i < numSeeds; i++ { + seed := rand.Int63() + for j := 0; j < numTimesToRunPerSeed; j++ { + logger := log.NewNopLogger() + db := dbm.NewMemDB() + app := NewGaiaApp(logger, db, nil) + + // Run randomized simulation + simulation.SimulateFromSeed( + t, app.BaseApp, appStateFn, seed, + testAndRunTxs(app), + []simulation.RandSetup{}, + []simulation.Invariant{}, + 20, + 20, + true, + ) + appHash := app.LastCommitID().Hash + fmt.Printf(">>> APP HASH: %v, %X\n", appHash, appHash) + appHashList[j] = appHash + } + for k := 1; k < numTimesToRunPerSeed; k++ { + require.Equal(t, appHashList[0], appHashList[k]) + } + } +} diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go index fa2d459e2..8d652bc43 100644 --- a/cmd/gaia/cli_test/cli_test.go +++ b/cmd/gaia/cli_test/cli_test.go @@ -1,3 +1,5 @@ +// +build cli_test + package clitest import ( @@ -23,7 +25,6 @@ import ( ) var ( - pass = "1234567890" gaiadHome = "" gaiacliHome = "" ) @@ -33,11 +34,12 @@ func init() { } func TestGaiaCLISend(t *testing.T) { - tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome)) - executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), pass) - executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), pass) + tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome), "") + executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), app.DefaultKeyPass) + executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), app.DefaultKeyPass) + chainID := executeInit(t, fmt.Sprintf("gaiad init -o --name=foo --home=%s --home-client=%s", gaiadHome, gaiacliHome)) - executeWrite(t, fmt.Sprintf("gaiacli keys add --home=%s bar", gaiacliHome), pass) + executeWrite(t, fmt.Sprintf("gaiacli keys add --home=%s bar", gaiacliHome), app.DefaultKeyPass) // get a free port, also setup some common flags servAddr, port, err := server.FreeTCPAddr() @@ -57,7 +59,7 @@ func TestGaiaCLISend(t *testing.T) { fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", fooAddr, flags)) require.Equal(t, int64(50), fooAcc.GetCoins().AmountOf("steak").Int64()) - executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo", flags, barAddr), pass) + executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo", flags, barAddr), app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", barAddr, flags)) @@ -66,7 +68,7 @@ func TestGaiaCLISend(t *testing.T) { require.Equal(t, int64(40), fooAcc.GetCoins().AmountOf("steak").Int64()) // test autosequencing - executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo", flags, barAddr), pass) + executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo", flags, barAddr), app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", barAddr, flags)) @@ -75,7 +77,7 @@ func TestGaiaCLISend(t *testing.T) { require.Equal(t, int64(30), fooAcc.GetCoins().AmountOf("steak").Int64()) // test memo - executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo --memo 'testmemo'", flags, barAddr), pass) + executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo --memo 'testmemo'", flags, barAddr), app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", barAddr, flags)) @@ -85,11 +87,11 @@ func TestGaiaCLISend(t *testing.T) { } func TestGaiaCLICreateValidator(t *testing.T) { - tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome)) - executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), pass) - executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), pass) + tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome), "") + executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), app.DefaultKeyPass) + executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), app.DefaultKeyPass) chainID := executeInit(t, fmt.Sprintf("gaiad init -o --name=foo --home=%s --home-client=%s", gaiadHome, gaiacliHome)) - executeWrite(t, fmt.Sprintf("gaiacli keys add --home=%s bar", gaiacliHome), pass) + executeWrite(t, fmt.Sprintf("gaiacli keys add --home=%s bar", gaiacliHome), app.DefaultKeyPass) // get a free port, also setup some common flags servAddr, port, err := server.FreeTCPAddr() @@ -107,7 +109,7 @@ func TestGaiaCLICreateValidator(t *testing.T) { barAddr, barPubKey := executeGetAddrPK(t, fmt.Sprintf("gaiacli keys show bar --output=json --home=%s", gaiacliHome)) barCeshPubKey := sdk.MustBech32ifyValPub(barPubKey) - executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo", flags, barAddr), pass) + executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%s --from=foo", flags, barAddr), app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", barAddr, flags)) @@ -118,12 +120,11 @@ func TestGaiaCLICreateValidator(t *testing.T) { // create validator cvStr := fmt.Sprintf("gaiacli stake create-validator %v", flags) cvStr += fmt.Sprintf(" --from=%s", "bar") - cvStr += fmt.Sprintf(" --address-validator=%s", barAddr) cvStr += fmt.Sprintf(" --pubkey=%s", barCeshPubKey) cvStr += fmt.Sprintf(" --amount=%v", "2steak") cvStr += fmt.Sprintf(" --moniker=%v", "bar-vally") - executeWrite(t, cvStr, pass) + executeWrite(t, cvStr, app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", barAddr, flags)) @@ -137,10 +138,9 @@ func TestGaiaCLICreateValidator(t *testing.T) { unbondStr := fmt.Sprintf("gaiacli stake unbond begin %v", flags) unbondStr += fmt.Sprintf(" --from=%s", "bar") unbondStr += fmt.Sprintf(" --address-validator=%s", barAddr) - unbondStr += fmt.Sprintf(" --address-delegator=%s", barAddr) unbondStr += fmt.Sprintf(" --shares-amount=%v", "1") - success := executeWrite(t, unbondStr, pass) + success := executeWrite(t, unbondStr, app.DefaultKeyPass) require.True(t, success) tests.WaitForNextNBlocksTM(2, port) @@ -153,11 +153,11 @@ func TestGaiaCLICreateValidator(t *testing.T) { } func TestGaiaCLISubmitProposal(t *testing.T) { - tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome)) - executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), pass) - executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), pass) + tests.ExecuteT(t, fmt.Sprintf("gaiad --home=%s unsafe_reset_all", gaiadHome), "") + executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s foo", gaiacliHome), app.DefaultKeyPass) + executeWrite(t, fmt.Sprintf("gaiacli keys delete --home=%s bar", gaiacliHome), app.DefaultKeyPass) chainID := executeInit(t, fmt.Sprintf("gaiad init -o --name=foo --home=%s --home-client=%s", gaiadHome, gaiacliHome)) - executeWrite(t, fmt.Sprintf("gaiacli keys add --home=%s bar", gaiacliHome), pass) + executeWrite(t, fmt.Sprintf("gaiacli keys add --home=%s bar", gaiacliHome), app.DefaultKeyPass) // get a free port, also setup some common flags servAddr, port, err := server.FreeTCPAddr() @@ -176,36 +176,80 @@ func TestGaiaCLISubmitProposal(t *testing.T) { fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", fooAddr, flags)) require.Equal(t, int64(50), fooAcc.GetCoins().AmountOf("steak").Int64()) - executeWrite(t, fmt.Sprintf("gaiacli gov submit-proposal %v --proposer=%s --deposit=5steak --type=Text --title=Test --description=test --from=foo", flags, fooAddr), pass) + proposalsQuery := tests.ExecuteT(t, fmt.Sprintf("gaiacli gov query-proposals %v", flags), "") + require.Equal(t, "No matching proposals found", proposalsQuery) + + // submit a test proposal + spStr := fmt.Sprintf("gaiacli gov submit-proposal %v", flags) + spStr += fmt.Sprintf(" --from=%s", "foo") + spStr += fmt.Sprintf(" --deposit=%s", "5steak") + spStr += fmt.Sprintf(" --type=%s", "Text") + spStr += fmt.Sprintf(" --title=%s", "Test") + spStr += fmt.Sprintf(" --description=%s", "test") + + executeWrite(t, spStr, app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) fooAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", fooAddr, flags)) require.Equal(t, int64(45), fooAcc.GetCoins().AmountOf("steak").Int64()) - proposal1 := executeGetProposal(t, fmt.Sprintf("gaiacli gov query-proposal --proposalID=1 --output=json %v", flags)) + proposal1 := executeGetProposal(t, fmt.Sprintf("gaiacli gov query-proposal --proposal-id=1 --output=json %v", flags)) require.Equal(t, int64(1), proposal1.GetProposalID()) require.Equal(t, gov.StatusDepositPeriod, proposal1.GetStatus()) - executeWrite(t, fmt.Sprintf("gaiacli gov deposit %v --depositer=%s --deposit=10steak --proposalID=1 --from=foo", flags, fooAddr), pass) + proposalsQuery = tests.ExecuteT(t, fmt.Sprintf("gaiacli gov query-proposals %v", flags), "") + require.Equal(t, " 1 - Test", proposalsQuery) + + depositStr := fmt.Sprintf("gaiacli gov deposit %v", flags) + depositStr += fmt.Sprintf(" --from=%s", "foo") + depositStr += fmt.Sprintf(" --deposit=%s", "10steak") + depositStr += fmt.Sprintf(" --proposal-id=%s", "1") + + executeWrite(t, depositStr, app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) fooAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %s %v", fooAddr, flags)) require.Equal(t, int64(35), fooAcc.GetCoins().AmountOf("steak").Int64()) - proposal1 = executeGetProposal(t, fmt.Sprintf("gaiacli gov query-proposal --proposalID=1 --output=json %v", flags)) + proposal1 = executeGetProposal(t, fmt.Sprintf("gaiacli gov query-proposal --proposal-id=1 --output=json %v", flags)) require.Equal(t, int64(1), proposal1.GetProposalID()) require.Equal(t, gov.StatusVotingPeriod, proposal1.GetStatus()) - executeWrite(t, fmt.Sprintf("gaiacli gov vote %v --proposalID=1 --voter=%s --option=Yes --from=foo", flags, fooAddr), pass) + voteStr := fmt.Sprintf("gaiacli gov vote %v", flags) + voteStr += fmt.Sprintf(" --from=%s", "foo") + voteStr += fmt.Sprintf(" --proposal-id=%s", "1") + voteStr += fmt.Sprintf(" --option=%s", "Yes") + + executeWrite(t, voteStr, app.DefaultKeyPass) tests.WaitForNextNBlocksTM(2, port) - vote := executeGetVote(t, fmt.Sprintf("gaiacli gov query-vote --proposalID=1 --voter=%s --output=json %v", fooAddr, flags)) + vote := executeGetVote(t, fmt.Sprintf("gaiacli gov query-vote --proposal-id=1 --voter=%s --output=json %v", fooAddr, flags)) require.Equal(t, int64(1), vote.ProposalID) require.Equal(t, gov.OptionYes, vote.Option) - votes := executeGetVotes(t, fmt.Sprintf("gaiacli gov query-votes --proposalID=1 --output=json %v", flags)) + votes := executeGetVotes(t, fmt.Sprintf("gaiacli gov query-votes --proposal-id=1 --output=json %v", flags)) require.Len(t, votes, 1) require.Equal(t, int64(1), votes[0].ProposalID) require.Equal(t, gov.OptionYes, votes[0].Option) + + proposalsQuery = tests.ExecuteT(t, fmt.Sprintf("gaiacli gov query-proposals --status=DepositPeriod %v", flags), "") + require.Equal(t, "No matching proposals found", proposalsQuery) + + proposalsQuery = tests.ExecuteT(t, fmt.Sprintf("gaiacli gov query-proposals --status=VotingPeriod %v", flags), "") + require.Equal(t, " 1 - Test", proposalsQuery) + + // submit a second test proposal + spStr = fmt.Sprintf("gaiacli gov submit-proposal %v", flags) + spStr += fmt.Sprintf(" --from=%s", "foo") + spStr += fmt.Sprintf(" --deposit=%s", "5steak") + spStr += fmt.Sprintf(" --type=%s", "Text") + spStr += fmt.Sprintf(" --title=%s", "Apples") + spStr += fmt.Sprintf(" --description=%s", "test") + + executeWrite(t, spStr, app.DefaultKeyPass) + tests.WaitForNextNBlocksTM(2, port) + + proposalsQuery = tests.ExecuteT(t, fmt.Sprintf("gaiacli gov query-proposals --latest=1 %v", flags), "") + require.Equal(t, " 2 - Apples", proposalsQuery) } //___________________________________________________________________________________ @@ -247,7 +291,7 @@ func executeWrite(t *testing.T, cmdStr string, writes ...string) bool { } func executeInit(t *testing.T, cmdStr string) (chainID string) { - out := tests.ExecuteT(t, cmdStr) + out := tests.ExecuteT(t, cmdStr, app.DefaultKeyPass) var initRes map[string]json.RawMessage err := json.Unmarshal([]byte(out), &initRes) @@ -260,7 +304,7 @@ func executeInit(t *testing.T, cmdStr string) (chainID string) { } func executeGetAddrPK(t *testing.T, cmdStr string) (sdk.AccAddress, crypto.PubKey) { - out := tests.ExecuteT(t, cmdStr) + out := tests.ExecuteT(t, cmdStr, "") var ko keys.KeyOutput keys.UnmarshalJSON([]byte(out), &ko) @@ -271,7 +315,7 @@ func executeGetAddrPK(t *testing.T, cmdStr string) (sdk.AccAddress, crypto.PubKe } func executeGetAccount(t *testing.T, cmdStr string) auth.BaseAccount { - out := tests.ExecuteT(t, cmdStr) + out := tests.ExecuteT(t, cmdStr, "") var initRes map[string]json.RawMessage err := json.Unmarshal([]byte(out), &initRes) require.NoError(t, err, "out %v, err %v", out, err) @@ -285,7 +329,7 @@ func executeGetAccount(t *testing.T, cmdStr string) auth.BaseAccount { } func executeGetValidator(t *testing.T, cmdStr string) stake.Validator { - out := tests.ExecuteT(t, cmdStr) + out := tests.ExecuteT(t, cmdStr, "") var validator stake.Validator cdc := app.MakeCodec() err := cdc.UnmarshalJSON([]byte(out), &validator) @@ -294,7 +338,7 @@ func executeGetValidator(t *testing.T, cmdStr string) stake.Validator { } func executeGetProposal(t *testing.T, cmdStr string) gov.Proposal { - out := tests.ExecuteT(t, cmdStr) + out := tests.ExecuteT(t, cmdStr, "") var proposal gov.Proposal cdc := app.MakeCodec() err := cdc.UnmarshalJSON([]byte(out), &proposal) @@ -303,7 +347,7 @@ func executeGetProposal(t *testing.T, cmdStr string) gov.Proposal { } func executeGetVote(t *testing.T, cmdStr string) gov.Vote { - out := tests.ExecuteT(t, cmdStr) + out := tests.ExecuteT(t, cmdStr, "") var vote gov.Vote cdc := app.MakeCodec() err := cdc.UnmarshalJSON([]byte(out), &vote) @@ -312,7 +356,7 @@ func executeGetVote(t *testing.T, cmdStr string) gov.Vote { } func executeGetVotes(t *testing.T, cmdStr string) []gov.Vote { - out := tests.ExecuteT(t, cmdStr) + out := tests.ExecuteT(t, cmdStr, "") var votes []gov.Vote cdc := app.MakeCodec() err := cdc.UnmarshalJSON([]byte(out), &votes) diff --git a/cmd/gaia/cli_test/doc.go b/cmd/gaia/cli_test/doc.go new file mode 100644 index 000000000..bcf9c5e4d --- /dev/null +++ b/cmd/gaia/cli_test/doc.go @@ -0,0 +1,3 @@ +package clitest + +// package clitest runs integration tests which make use of CLI commands. diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go index 7c66cb9ef..02a96b614 100644 --- a/cmd/gaia/cmd/gaiacli/main.go +++ b/cmd/gaia/cmd/gaiacli/main.go @@ -88,6 +88,10 @@ func main() { stakecmd.GetCmdQueryValidators("stake", cdc), stakecmd.GetCmdQueryDelegation("stake", cdc), stakecmd.GetCmdQueryDelegations("stake", cdc), + stakecmd.GetCmdQueryUnbondingDelegation("stake", cdc), + stakecmd.GetCmdQueryUnbondingDelegations("stake", cdc), + stakecmd.GetCmdQueryRedelegation("stake", cdc), + stakecmd.GetCmdQueryRedelegations("stake", cdc), slashingcmd.GetCmdQuerySigningInfo("slashing", cdc), )...) stakeCmd.AddCommand( @@ -113,6 +117,7 @@ func main() { govcmd.GetCmdQueryProposal("gov", cdc), govcmd.GetCmdQueryVote("gov", cdc), govcmd.GetCmdQueryVotes("gov", cdc), + govcmd.GetCmdQueryProposals("gov", cdc), )...) govCmd.AddCommand( client.PostCommands( diff --git a/cmd/gaia/cmd/gaiadebug/hack.go b/cmd/gaia/cmd/gaiadebug/hack.go index 2e2b96205..cab9d0ab0 100644 --- a/cmd/gaia/cmd/gaiadebug/hack.go +++ b/cmd/gaia/cmd/gaiadebug/hack.go @@ -25,6 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/bank" "github.com/cosmos/cosmos-sdk/x/ibc" + "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/stake" @@ -134,6 +135,7 @@ type GaiaApp struct { keyIBC *sdk.KVStoreKey keyStake *sdk.KVStoreKey keySlashing *sdk.KVStoreKey + keyParams *sdk.KVStoreKey // Manage getting and setting accounts accountMapper auth.AccountMapper @@ -142,12 +144,13 @@ type GaiaApp struct { ibcMapper ibc.Mapper stakeKeeper stake.Keeper slashingKeeper slashing.Keeper + paramsKeeper params.Keeper } func NewGaiaApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.BaseApp)) *GaiaApp { cdc := MakeCodec() - bApp := bam.NewBaseApp(appName, cdc, logger, db, baseAppOptions...) + bApp := bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...) bApp.SetCommitMultiStoreTracer(os.Stdout) // create your application object @@ -159,6 +162,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.BaseAp keyIBC: sdk.NewKVStoreKey("ibc"), keyStake: sdk.NewKVStoreKey("stake"), keySlashing: sdk.NewKVStoreKey("slashing"), + keyParams: sdk.NewKVStoreKey("params"), } // define the accountMapper @@ -171,8 +175,9 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.BaseAp // add handlers app.coinKeeper = bank.NewKeeper(app.accountMapper) app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace)) + app.paramsKeeper = params.NewKeeper(app.cdc, app.keyParams) app.stakeKeeper = stake.NewKeeper(app.cdc, app.keyStake, app.coinKeeper, app.RegisterCodespace(stake.DefaultCodespace)) - app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.RegisterCodespace(slashing.DefaultCodespace)) + app.slashingKeeper = slashing.NewKeeper(app.cdc, app.keySlashing, app.stakeKeeper, app.paramsKeeper.Getter(), app.RegisterCodespace(slashing.DefaultCodespace)) // register message routes app.Router(). @@ -191,6 +196,8 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.BaseAp cmn.Exit(err.Error()) } + app.Seal() + return app } @@ -245,10 +252,12 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci } // load the initial stake information - err = stake.InitGenesis(ctx, app.stakeKeeper, genesisState.StakeData) + validators, err := stake.InitGenesis(ctx, app.stakeKeeper, genesisState.StakeData) if err != nil { panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468 // return sdk.ErrGenesisParse("").TraceCause(err, "") } - return abci.ResponseInitChain{} + return abci.ResponseInitChain{ + Validators: validators, + } } diff --git a/cmd/gaia/testnets/README.md b/cmd/gaia/testnets/README.md index 7f9707e90..e64db9f7d 100644 --- a/cmd/gaia/testnets/README.md +++ b/cmd/gaia/testnets/README.md @@ -5,5 +5,3 @@ The content of this file was moved to the `/docs` folder and is hosted on the The rest of this folder was moved to the [testnets repo](https://github.com/cosmos/testnets). - - diff --git a/cmd/gaia/testnets/STATUS.md b/cmd/gaia/testnets/STATUS.md index 0b4e9421b..b972eb802 100644 --- a/cmd/gaia/testnets/STATUS.md +++ b/cmd/gaia/testnets/STATUS.md @@ -2,6 +2,11 @@ See [testnets repo](https://github.com/cosmos/testnets). +## *July 22, 2018, 5:30 EST* - Gaia-7001 Consensus Failure + +- [Consensus Failure at Block 24570](https://github.com/cosmos/cosmos-sdk/issues/1787) + + ## *July 17, 2018, 4:00 EST* - New Testnet Gaia-7001 - New testnet with fixes for the genesis file diff --git a/cmd/gaia/testnets/gaia-5001/adrian.json b/cmd/gaia/testnets/gaia-5001/adrian.json deleted file mode 100644 index 7ca99cb1e..000000000 --- a/cmd/gaia/testnets/gaia-5001/adrian.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "1ebc5ca705b3ae1c06a0888ff1287ada82149dc3", - "ip": "138.68.77.24", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - }, - "power": 100, - "name": "adrian" - }, - "app_gen_tx": { - "name": "default", - "address": "D9C12CB5186FE0018179742FD3110EE534C63460", - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/anton.json b/cmd/gaia/testnets/gaia-5001/anton.json deleted file mode 100644 index 701e85887..000000000 --- a/cmd/gaia/testnets/gaia-5001/anton.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "c272ae3cff7558db2c6195eea38fd43fd08406dc", - "ip": "206.189.31.178", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "tJlZJWjOpYvRitYFTWNPTaUtvQVf+hoNjlfI84VPqvI=" - }, - "power": 100, - "name": "anton" - }, - "app_gen_tx": { - "name": "default", - "address": "E766088FD171906289617F60BF0014C46F0F85EC", - "pub_key": { - "type": "AC26791624DE60", - "value": "tJlZJWjOpYvRitYFTWNPTaUtvQVf+hoNjlfI84VPqvI=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/aurel.json b/cmd/gaia/testnets/gaia-5001/aurel.json deleted file mode 100644 index 0c2ea8166..000000000 --- a/cmd/gaia/testnets/gaia-5001/aurel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "aef085c4bfed0c1ffc6705f2e1e3bf85e5164600", - "ip": "45.77.53.208", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - }, - "power": 100, - "name": "aurel" - }, - "app_gen_tx": { - "name": "aurel", - "address": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/bucky.json b/cmd/gaia/testnets/gaia-5001/bucky.json deleted file mode 100644 index fc4bb51cd..000000000 --- a/cmd/gaia/testnets/gaia-5001/bucky.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "b0dd378c3fbc4c156cd6d302a799f0d2e4227201", - "ip": "159.89.121.174", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - }, - "power": 100, - "name": "bucky" - }, - "app_gen_tx": { - "name": "bucky", - "address": "935E48ED79F1006ED135553768E1D9A768747CF6", - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/cwgoes.json b/cmd/gaia/testnets/gaia-5001/cwgoes.json deleted file mode 100644 index dce7e20c9..000000000 --- a/cmd/gaia/testnets/gaia-5001/cwgoes.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "e25603602d8cf8542570ad0e311d50f55f497f85", - "ip": "158.69.63.13", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - }, - "power": 100, - "name": "cwgoes" - }, - "app_gen_tx": { - "name": "cwgoes", - "address": "328FBB8EA315D070DF908982A5F91A3618001D20", - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/iris.json b/cmd/gaia/testnets/gaia-5001/iris.json deleted file mode 100644 index 1a1019672..000000000 --- a/cmd/gaia/testnets/gaia-5001/iris.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "aabf05a67b2f399807dc602d05bf97b0ed283ac2", - "ip": "116.62.62.39", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - }, - "power": 100, - "name": "iris" - }, - "app_gen_tx": { - "name": "=suyu", - "address": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - } - } -} \ No newline at end of file diff --git a/cmd/gaia/testnets/gaia-5001/lino.json b/cmd/gaia/testnets/gaia-5001/lino.json deleted file mode 100644 index 5bc98bb6e..000000000 --- a/cmd/gaia/testnets/gaia-5001/lino.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "79466a03e9d4b4648a7dd8cead1fa7121ce76ee3", - "ip": "34.235.130.1", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - }, - "power": 100, - "name": "lino" - }, - "app_gen_tx": { - "name": "lino", - "address": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/pbostrom.json b/cmd/gaia/testnets/gaia-5001/pbostrom.json deleted file mode 100644 index 59cd46950..000000000 --- a/cmd/gaia/testnets/gaia-5001/pbostrom.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "adb290585a2753bf1a520c76802b0dab3dffa895", - "ip": "34.201.21.179", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - }, - "power": 100, - "name": "pbostrom" - }, - "app_gen_tx": { - "name": "default", - "address": "109720515B4F8C0858DA3521E448262334534FFD", - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/poldsam.json b/cmd/gaia/testnets/gaia-5001/poldsam.json deleted file mode 100644 index 8149a9259..000000000 --- a/cmd/gaia/testnets/gaia-5001/poldsam.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "678503e6c8f50db7279c7da3cb9b072aac4bc0d5", - "ip": "35.193.188.125", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - }, - "power": 100, - "name": "polsdam" - }, - "app_gen_tx": { - "name": "poldsam", - "address": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/staked.json b/cmd/gaia/testnets/gaia-5001/staked.json deleted file mode 100644 index f39cced6b..000000000 --- a/cmd/gaia/testnets/gaia-5001/staked.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "3519f05985394107e0b2e285361b7e012adb1113", - "ip": "54.209.118.64", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "vq0V0BjpmIh6WyNnFpMaO5LyUK2FamkNt65eJYa5AaQ=" - }, - "power": 100, - "name": "staked" - }, - "app_gen_tx": { - "name": "default", - "address": "935E04662697134905706A4CCDB822AC6FC11C2E", - "pub_key": { - "type": "AC26791624DE60", - "value": "vq0V0BjpmIh6WyNnFpMaO5LyUK2FamkNt65eJYa5AaQ=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/zach.json b/cmd/gaia/testnets/gaia-5001/zach.json deleted file mode 100644 index 76a08cc92..000000000 --- a/cmd/gaia/testnets/gaia-5001/zach.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "8a2802fb25d352f3e7e277559a4f683780c3ef22", - "ip": "167.99.191.184", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - }, - "power": 100, - "name": "" - }, - "app_gen_tx": { - "name": "zach", - "address": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-5001/zaki.json b/cmd/gaia/testnets/gaia-5001/zaki.json deleted file mode 100644 index 956f2bf8c..000000000 --- a/cmd/gaia/testnets/gaia-5001/zaki.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "node_id": "30b45459e4881680c0ef1750fde136fefa6c3b98", - "ip": "35.184.182.143", - "validator": { - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - }, - "power": 100, - "name": "zaki" - }, - "app_gen_tx": { - "name": "zaki", - "address": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - } - } -} diff --git a/cmd/gaia/testnets/gaia-6000/genesis.json b/cmd/gaia/testnets/gaia-6000/genesis.json deleted file mode 100644 index aefab9286..000000000 --- a/cmd/gaia/testnets/gaia-6000/genesis.json +++ /dev/null @@ -1,1459 +0,0 @@ -{ - "genesis_time": "2018-05-15T18:29:12.38288148Z", - "chain_id": "gaia-6000", - "consensus_params": { - "block_size_params": { - "max_bytes": 22020096, - "max_txs": 100000, - "max_gas": -1 - }, - "tx_size_params": { - "max_bytes": 10240, - "max_gas": -1 - }, - "block_gossip_params": { - "block_part_size_bytes": 65536 - }, - "evidence_params": { - "max_age": 100000 - } - }, - "validators": [ - { - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - }, - "power": 1000, - "name": "adrian" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - }, - "power": 1000, - "name": "zaki" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "bIvXwf0qlOy0rO0SY/h8FfsqyW/AMpGL2yUhUNOY7hs=" - }, - "power": 100, - "name": "staked" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - }, - "power": 1000, - "name": "polsdam" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - }, - "power": 1000, - "name": "lino" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - }, - "power": 100, - "name": "" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - }, - "power": 1000, - "name": "iris" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - }, - "power": 1000, - "name": "pbostrom" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - }, - "power": 1000, - "name": "aurel" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - }, - "power": 1000, - "name": "bucky" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - }, - "power": 100, - "name": "cwgoes" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "TNPLvN6f6QoSLJqGHzIfbraBoSw3emr9Sk2Us94M4gM=" - }, - "power": 1000, - "name": "bdnet" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "cvGYknYP9XMUzqlXZde7lRpvAp/kZiSRYHg66krJNxQ=" - }, - "power": 1000, - "name": "melea-trust" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "power": 1000, - "name": "naruemon" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "rcl+kuM69Un/a7e+fQsQrCEtT1g04tFviOeq2GygSIw=" - }, - "power": 1000, - "name": "idoor" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "S9urD5q7je21qp5vEobiURdWrtJwvqMsfZGQhb8GOBQ=" - }, - "power": 1000, - "name": "ATEAM1" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "vSr94aI+zfF3D8Cr2VtCXPpfgj7t2ck8SlZxRsfn7gk=" - }, - "power": 1000, - "name": "figmatt" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "p5ijoVwp2zmA7RkXXvPl+yqdnlaWMwoV2pYIN8bDyFs=" - }, - "power": 1000, - "name": "jla-bsd" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "KOdWpo4aQFrLxVlkyc66p7m6mBNnPLmGuO4Z4L+CI1Y=" - }, - "power": 1000, - "name": "Gold" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "VfOsmcON77auerRc9zKwOR+CvL0sj1nA45hS2WqX1xE=" - }, - "power": 1000, - "name": "nylira" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "QYONAknaJqx3OKPSKraDrOPkx6xssezYtXVS84nZvZE=" - }, - "power": 1000, - "name": "BKCM" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "PyFJmNrUres3QOkj2BjxplCxrOF+HDFGohi3tRKsToY=" - }, - "power": 1000, - "name": "Dev's Validator" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "s4ER09+WeX10euzGyK7xDW7+myQVXt3Plup8IHUE4nk=" - }, - "power": 1000, - "name": "Staking Facilities" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "OPxj9edXgufNEjYNhZKqLgmYnK4A3nGw3rxaFQrHn24=" - }, - "power": 1000, - "name": "nuevax" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "Hi2rtbdJdQtOe3Kq4OoD/xkWJbIjIsUI9qgLQ6TlhiM=" - }, - "power": 1000, - "name": "vultr.guest" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "ah3JtmBA7gbxSiimPsLqQlV85gpNOUBJMvnxGx8eVlo=" - }, - "power": 1000, - "name": "forebole" - } - ], - "app_hash": "", - "app_state": { - "accounts": [ - { - "address": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "coins": [ - { - "denom": "devToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "coins": [ - { - "denom": "adrianToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "109720515B4F8C0858DA3521E448262334534FFD", - "coins": [ - { - "denom": "defaultToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "coins": [ - { - "denom": "aurelToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "328FBB8EA315D070DF908982A5F91A3618001D20", - "coins": [ - { - "denom": "cwgoesToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "coins": [ - { - "denom": "BKCMToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "coins": [ - { - "denom": "BDToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "coins": [ - { - "denom": "suyuToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "coins": [ - { - "denom": "linoToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "coins": [ - { - "denom": "stakingToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "935E04662697134905706A4CCDB822AC6FC11C2E", - "coins": [ - { - "denom": "defaultToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "935E48ED79F1006ED135553768E1D9A768747CF6", - "coins": [ - { - "denom": "buckyToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "99FFAEE5BF6040EADA2F26548C4A702619797C9F", - "coins": [ - { - "denom": "kwunyeungToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "zachToken", - "amount": 1000 - } - ] - }, - { - "address": "A323EC45243D600204BA3D298E3C20322D08C84C", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "nuevaxToken", - "amount": 1000 - } - ] - }, - { - "address": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "dokiaToken", - "amount": 1000 - } - ] - }, - { - "address": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "forboleToken", - "amount": 1000 - } - ] - }, - { - "address": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "coins": [ - { - "denom": "steak", - "amount": 100 - }, - { - "denom": "pengToken", - "amount": 1000 - } - ] - }, - { - "address": "FD30D5C983FFEDEC069C3DDFCF270E41A556A86E", - "coins": [ - { - "denom": "steak", - "amount": 900 - }, - { - "denom": "faucetToken", - "amount": 10000000 - } - ] - }, - { - "address": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "goldToken", - "amount": 100 - } - ] - }, - { - "address": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "jlaToken", - "amount": 100 - } - ] - }, - { - "address": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "figmattToken", - "amount": 100 - } - ] - }, - { - "address": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "ATEAM1Token", - "amount": 100 - } - ] - }, - { - "address": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "idoorToken", - "amount": 100 - } - ] - }, - { - "address": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "naruemonToken", - "amount": 100 - } - ] - }, - { - "address": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "zakiToken", - "amount": 1000 - } - ] - }, - { - "address": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "trustToken", - "amount": 1000 - } - ] - }, - { - "address": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "coins": [ - { - "denom": "poldsamToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - } - ], - "stake": { - "pool": { - "loose_unbonded_tokens": 2350, - "unbonded_tokens": 0, - "unbonding_tokens": 0, - "bonded_tokens": 25200, - "unbonded_shares": "0", - "unbonding_shares": "0", - "bonded_shares": "25200", - "inflation_last_time": 0, - "inflation": "9012837/100000000", - "date_last_commission_reset": 0, - "prev_bonded_shares": "0" - }, - "params": { - "inflation_rate_change": "13/100", - "inflation_max": "1/5", - "inflation_min": "7/100", - "goal_bonded": "67/100", - "max_validators": 100, - "bond_denom": "steak" - }, - "bonds": [ - { - "delegator_addr": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "validator_addr": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "109720515B4F8C0858DA3521E448262334534FFD", - "validator_addr": "109720515B4F8C0858DA3521E448262334534FFD", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "validator_addr": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "328FBB8EA315D070DF908982A5F91A3618001D20", - "validator_addr": "328FBB8EA315D070DF908982A5F91A3618001D20", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "validator_addr": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "validator_addr": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "validator_addr": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "validator_addr": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "validator_addr": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "935E04662697134905706A4CCDB822AC6FC11C2E", - "validator_addr": "935E04662697134905706A4CCDB822AC6FC11C2E", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "935E48ED79F1006ED135553768E1D9A768747CF6", - "validator_addr": "935E48ED79F1006ED135553768E1D9A768747CF6", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "validator_addr": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "A323EC45243D600204BA3D298E3C20322D08C84C", - "validator_addr": "A323EC45243D600204BA3D298E3C20322D08C84C", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "validator_addr": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "validator_addr": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "validator_addr": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "validator_addr": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "validator_addr": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "validator_addr": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "validator_addr": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "validator_addr": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "validator_addr": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "validator_addr": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "validator_addr": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "validator_addr": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "validator_addr": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "shares": "1000", - "height": 0 - } - ], - "validators": [ - { - "owner": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "pub_key": { - "type": "AC26791624DE60", - "value": "PyFJmNrUres3QOkj2BjxplCxrOF+HDFGohi3tRKsToY=" - }, - "description": { - "moniker": "Dev's Validator", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "109720515B4F8C0858DA3521E448262334534FFD", - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - }, - "description": { - "moniker": "", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - }, - "description": { - "moniker": "aurel", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "328FBB8EA315D070DF908982A5F91A3618001D20", - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - }, - "description": { - "moniker": "cwgoes", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "pub_key": { - "type": "AC26791624DE60", - "value": "QYONAknaJqx3OKPSKraDrOPkx6xssezYtXVS84nZvZE=" - }, - "description": { - "moniker": "BKCM", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "pub_key": { - "type": "AC26791624DE60", - "value": "TNPLvN6f6QoSLJqGHzIfbraBoSw3emr9Sk2Us94M4gM=" - }, - "description": { - "moniker": "bdnet", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - }, - "description": { - "moniker": "suyu", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - }, - "description": { - "moniker": "lino", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "pub_key": { - "type": "AC26791624DE60", - "value": "s4ER09+WeX10euzGyK7xDW7+myQVXt3Plup8IHUE4nk=" - }, - "description": { - "moniker": "Staking Facilities", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "935E04662697134905706A4CCDB822AC6FC11C2E", - "pub_key": { - "type": "AC26791624DE60", - "value": "bIvXwf0qlOy0rO0SY/h8FfsqyW/AMpGL2yUhUNOY7hs=" - }, - "description": { - "moniker": "default", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "935E48ED79F1006ED135553768E1D9A768747CF6", - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - }, - "description": { - "moniker": "bucky", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - }, - "description": { - "moniker": "zach", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "A323EC45243D600204BA3D298E3C20322D08C84C", - "pub_key": { - "type": "AC26791624DE60", - "value": "OPxj9edXgufNEjYNhZKqLgmYnK4A3nGw3rxaFQrHn24=" - }, - "description": { - "moniker": "nuevax", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "pub_key": { - "type": "AC26791624DE60", - "value": "Hi2rtbdJdQtOe3Kq4OoD/xkWJbIjIsUI9qgLQ6TlhiM=" - }, - "description": { - "moniker": "vultr.guest", - "identity": "", - "website": "https://ion.dokia.capital/", - "details": "DokiaValidator" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "pub_key": { - "type": "AC26791624DE60", - "value": "ah3JtmBA7gbxSiimPsLqQlV85gpNOUBJMvnxGx8eVlo=" - }, - "description": { - "moniker": "forbole", - "identity": "", - "website": "https://www.forbole.com", - "details": "Recommend. Refer. Reward" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "pub_key": { - "type": "AC26791624DE60", - "value": "VfOsmcON77auerRc9zKwOR+CvL0sj1nA45hS2WqX1xE=" - }, - "description": { - "moniker": "nylira", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "pub_key": { - "type": "AC26791624DE60", - "value": "KOdWpo4aQFrLxVlkyc66p7m6mBNnPLmGuO4Z4L+CI1Y=" - }, - "description": { - "moniker": "Gold", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "pub_key": { - "type": "AC26791624DE60", - "value": "p5ijoVwp2zmA7RkXXvPl+yqdnlaWMwoV2pYIN8bDyFs=" - }, - "description": { - "moniker": "jla-bsd", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "pub_key": { - "type": "AC26791624DE60", - "value": "vSr94aI+zfF3D8Cr2VtCXPpfgj7t2ck8SlZxRsfn7gk=" - }, - "description": { - "moniker": "figmatt", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "pub_key": { - "type": "AC26791624DE60", - "value": "S9urD5q7je21qp5vEobiURdWrtJwvqMsfZGQhb8GOBQ=" - }, - "description": { - "moniker": "ATEAM1", - "identity": "", - "website": "", - "details": "ATEAM1" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "pub_key": { - "type": "AC26791624DE60", - "value": "rcl+kuM69Un/a7e+fQsQrCEtT1g04tFviOeq2GygSIw=" - }, - "description": { - "moniker": "idoor", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "pub_key": { - "type": "AC26791624DE60", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "description": { - "moniker": "naruemon", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - }, - "description": { - "moniker": "Adrian Brink - Cryptium Labs", - "identity": "", - "website": "https://cryptium.ch", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - }, - "description": { - "moniker": "zaki", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "pub_key": { - "type": "AC26791624DE60", - "value": "cvGYknYP9XMUzqlXZde7lRpvAp/kZiSRYHg66krJNxQ=" - }, - "description": { - "moniker": "trust", - "identity": "", - "website": "http://cosmos-trust.com", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - }, - "description": { - "moniker": "proof-of-audit", - "identity": "", - "website": "https://proof-of-audit.com", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - } - ] - } - } -} diff --git a/cmd/gaia/testnets/gaia-6001/genesis.json b/cmd/gaia/testnets/gaia-6001/genesis.json deleted file mode 100644 index 512d761be..000000000 --- a/cmd/gaia/testnets/gaia-6001/genesis.json +++ /dev/null @@ -1,1459 +0,0 @@ -{ - "genesis_time": "2018-05-15T18:29:12.38288148Z", - "chain_id": "gaia-6001", - "consensus_params": { - "block_size_params": { - "max_bytes": 22020096, - "max_txs": 100000, - "max_gas": -1 - }, - "tx_size_params": { - "max_bytes": 10240, - "max_gas": -1 - }, - "block_gossip_params": { - "block_part_size_bytes": 65536 - }, - "evidence_params": { - "max_age": 100000 - } - }, - "validators": [ - { - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - }, - "power": 1000, - "name": "adrian" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - }, - "power": 1000, - "name": "zaki" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "bIvXwf0qlOy0rO0SY/h8FfsqyW/AMpGL2yUhUNOY7hs=" - }, - "power": 100, - "name": "staked" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - }, - "power": 1000, - "name": "polsdam" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - }, - "power": 1000, - "name": "lino" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - }, - "power": 100, - "name": "" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - }, - "power": 1000, - "name": "iris" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - }, - "power": 1000, - "name": "pbostrom" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - }, - "power": 1000, - "name": "aurel" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - }, - "power": 1000, - "name": "bucky" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - }, - "power": 100, - "name": "cwgoes" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "TNPLvN6f6QoSLJqGHzIfbraBoSw3emr9Sk2Us94M4gM=" - }, - "power": 1000, - "name": "bdnet" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "cvGYknYP9XMUzqlXZde7lRpvAp/kZiSRYHg66krJNxQ=" - }, - "power": 1000, - "name": "melea-trust" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "power": 1000, - "name": "naruemon" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "rcl+kuM69Un/a7e+fQsQrCEtT1g04tFviOeq2GygSIw=" - }, - "power": 1000, - "name": "idoor" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "S9urD5q7je21qp5vEobiURdWrtJwvqMsfZGQhb8GOBQ=" - }, - "power": 1000, - "name": "ATEAM1" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "vSr94aI+zfF3D8Cr2VtCXPpfgj7t2ck8SlZxRsfn7gk=" - }, - "power": 1000, - "name": "figmatt" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "p5ijoVwp2zmA7RkXXvPl+yqdnlaWMwoV2pYIN8bDyFs=" - }, - "power": 1000, - "name": "jla-bsd" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "KOdWpo4aQFrLxVlkyc66p7m6mBNnPLmGuO4Z4L+CI1Y=" - }, - "power": 1000, - "name": "Gold" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "VfOsmcON77auerRc9zKwOR+CvL0sj1nA45hS2WqX1xE=" - }, - "power": 1000, - "name": "nylira" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "QYONAknaJqx3OKPSKraDrOPkx6xssezYtXVS84nZvZE=" - }, - "power": 1000, - "name": "BKCM" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "PyFJmNrUres3QOkj2BjxplCxrOF+HDFGohi3tRKsToY=" - }, - "power": 1000, - "name": "Dev's Validator" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "s4ER09+WeX10euzGyK7xDW7+myQVXt3Plup8IHUE4nk=" - }, - "power": 1000, - "name": "Staking Facilities" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "OPxj9edXgufNEjYNhZKqLgmYnK4A3nGw3rxaFQrHn24=" - }, - "power": 1000, - "name": "nuevax" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "Hi2rtbdJdQtOe3Kq4OoD/xkWJbIjIsUI9qgLQ6TlhiM=" - }, - "power": 1000, - "name": "vultr.guest" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "ah3JtmBA7gbxSiimPsLqQlV85gpNOUBJMvnxGx8eVlo=" - }, - "power": 1000, - "name": "forebole" - } - ], - "app_hash": "", - "app_state": { - "accounts": [ - { - "address": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "coins": [ - { - "denom": "devToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "coins": [ - { - "denom": "adrianToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "109720515B4F8C0858DA3521E448262334534FFD", - "coins": [ - { - "denom": "defaultToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "coins": [ - { - "denom": "aurelToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "328FBB8EA315D070DF908982A5F91A3618001D20", - "coins": [ - { - "denom": "cwgoesToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "coins": [ - { - "denom": "BKCMToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "coins": [ - { - "denom": "BDToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "coins": [ - { - "denom": "suyuToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "coins": [ - { - "denom": "linoToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "coins": [ - { - "denom": "stakingToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "935E04662697134905706A4CCDB822AC6FC11C2E", - "coins": [ - { - "denom": "defaultToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "935E48ED79F1006ED135553768E1D9A768747CF6", - "coins": [ - { - "denom": "buckyToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "99FFAEE5BF6040EADA2F26548C4A702619797C9F", - "coins": [ - { - "denom": "kwunyeungToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "zachToken", - "amount": 1000 - } - ] - }, - { - "address": "A323EC45243D600204BA3D298E3C20322D08C84C", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "nuevaxToken", - "amount": 1000 - } - ] - }, - { - "address": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "dokiaToken", - "amount": 1000 - } - ] - }, - { - "address": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "forboleToken", - "amount": 1000 - } - ] - }, - { - "address": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "coins": [ - { - "denom": "steak", - "amount": 100 - }, - { - "denom": "pengToken", - "amount": 1000 - } - ] - }, - { - "address": "FD30D5C983FFEDEC069C3DDFCF270E41A556A86E", - "coins": [ - { - "denom": "steak", - "amount": 900 - }, - { - "denom": "faucetToken", - "amount": 10000000 - } - ] - }, - { - "address": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "goldToken", - "amount": 100 - } - ] - }, - { - "address": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "jlaToken", - "amount": 100 - } - ] - }, - { - "address": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "figmattToken", - "amount": 100 - } - ] - }, - { - "address": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "ATEAM1Token", - "amount": 100 - } - ] - }, - { - "address": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "idoorToken", - "amount": 100 - } - ] - }, - { - "address": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "naruemonToken", - "amount": 100 - } - ] - }, - { - "address": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "zakiToken", - "amount": 1000 - } - ] - }, - { - "address": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "trustToken", - "amount": 1000 - } - ] - }, - { - "address": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "coins": [ - { - "denom": "poldsamToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - } - ], - "stake": { - "pool": { - "loose_unbonded_tokens": 2300, - "unbonded_tokens": 0, - "unbonding_tokens": 0, - "bonded_tokens": 23300, - "unbonded_shares": "0", - "unbonding_shares": "0", - "bonded_shares": "23300", - "inflation_last_time": 0, - "inflation": "9012837/100000000", - "date_last_commission_reset": 0, - "prev_bonded_shares": "0" - }, - "params": { - "inflation_rate_change": "13/100", - "inflation_max": "1/5", - "inflation_min": "7/100", - "goal_bonded": "67/100", - "max_validators": 100, - "bond_denom": "steak" - }, - "bonds": [ - { - "delegator_addr": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "validator_addr": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "109720515B4F8C0858DA3521E448262334534FFD", - "validator_addr": "109720515B4F8C0858DA3521E448262334534FFD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "validator_addr": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "328FBB8EA315D070DF908982A5F91A3618001D20", - "validator_addr": "328FBB8EA315D070DF908982A5F91A3618001D20", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "validator_addr": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "validator_addr": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "validator_addr": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "validator_addr": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "validator_addr": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "935E04662697134905706A4CCDB822AC6FC11C2E", - "validator_addr": "935E04662697134905706A4CCDB822AC6FC11C2E", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "935E48ED79F1006ED135553768E1D9A768747CF6", - "validator_addr": "935E48ED79F1006ED135553768E1D9A768747CF6", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "validator_addr": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "A323EC45243D600204BA3D298E3C20322D08C84C", - "validator_addr": "A323EC45243D600204BA3D298E3C20322D08C84C", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "validator_addr": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "validator_addr": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "validator_addr": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "validator_addr": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "validator_addr": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "validator_addr": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "validator_addr": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "validator_addr": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "validator_addr": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "validator_addr": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "validator_addr": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "validator_addr": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "validator_addr": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "shares": "1000", - "height": 0 - } - ], - "validators": [ - { - "owner": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "pub_key": { - "type": "AC26791624DE60", - "value": "PyFJmNrUres3QOkj2BjxplCxrOF+HDFGohi3tRKsToY=" - }, - "description": { - "moniker": "Dev's Validator", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "109720515B4F8C0858DA3521E448262334534FFD", - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - }, - "description": { - "moniker": "", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - }, - "description": { - "moniker": "aurel", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "328FBB8EA315D070DF908982A5F91A3618001D20", - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - }, - "description": { - "moniker": "cwgoes", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "pub_key": { - "type": "AC26791624DE60", - "value": "QYONAknaJqx3OKPSKraDrOPkx6xssezYtXVS84nZvZE=" - }, - "description": { - "moniker": "BKCM", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "pub_key": { - "type": "AC26791624DE60", - "value": "TNPLvN6f6QoSLJqGHzIfbraBoSw3emr9Sk2Us94M4gM=" - }, - "description": { - "moniker": "bdnet", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - }, - "description": { - "moniker": "suyu", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - }, - "description": { - "moniker": "lino", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "pub_key": { - "type": "AC26791624DE60", - "value": "s4ER09+WeX10euzGyK7xDW7+myQVXt3Plup8IHUE4nk=" - }, - "description": { - "moniker": "Staking Facilities", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "935E04662697134905706A4CCDB822AC6FC11C2E", - "pub_key": { - "type": "AC26791624DE60", - "value": "bIvXwf0qlOy0rO0SY/h8FfsqyW/AMpGL2yUhUNOY7hs=" - }, - "description": { - "moniker": "default", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "935E48ED79F1006ED135553768E1D9A768747CF6", - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - }, - "description": { - "moniker": "bucky", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - }, - "description": { - "moniker": "zach", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "A323EC45243D600204BA3D298E3C20322D08C84C", - "pub_key": { - "type": "AC26791624DE60", - "value": "OPxj9edXgufNEjYNhZKqLgmYnK4A3nGw3rxaFQrHn24=" - }, - "description": { - "moniker": "nuevax", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "pub_key": { - "type": "AC26791624DE60", - "value": "Hi2rtbdJdQtOe3Kq4OoD/xkWJbIjIsUI9qgLQ6TlhiM=" - }, - "description": { - "moniker": "vultr.guest", - "identity": "", - "website": "https://ion.dokia.capital/", - "details": "DokiaValidator" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "pub_key": { - "type": "AC26791624DE60", - "value": "ah3JtmBA7gbxSiimPsLqQlV85gpNOUBJMvnxGx8eVlo=" - }, - "description": { - "moniker": "forbole", - "identity": "", - "website": "https://www.forbole.com", - "details": "Recommend. Refer. Reward" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "pub_key": { - "type": "AC26791624DE60", - "value": "VfOsmcON77auerRc9zKwOR+CvL0sj1nA45hS2WqX1xE=" - }, - "description": { - "moniker": "nylira", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "pub_key": { - "type": "AC26791624DE60", - "value": "KOdWpo4aQFrLxVlkyc66p7m6mBNnPLmGuO4Z4L+CI1Y=" - }, - "description": { - "moniker": "Gold", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "pub_key": { - "type": "AC26791624DE60", - "value": "p5ijoVwp2zmA7RkXXvPl+yqdnlaWMwoV2pYIN8bDyFs=" - }, - "description": { - "moniker": "jla-bsd", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "pub_key": { - "type": "AC26791624DE60", - "value": "vSr94aI+zfF3D8Cr2VtCXPpfgj7t2ck8SlZxRsfn7gk=" - }, - "description": { - "moniker": "figmatt", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "pub_key": { - "type": "AC26791624DE60", - "value": "S9urD5q7je21qp5vEobiURdWrtJwvqMsfZGQhb8GOBQ=" - }, - "description": { - "moniker": "ATEAM1", - "identity": "", - "website": "", - "details": "ATEAM1" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "pub_key": { - "type": "AC26791624DE60", - "value": "rcl+kuM69Un/a7e+fQsQrCEtT1g04tFviOeq2GygSIw=" - }, - "description": { - "moniker": "idoor", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "pub_key": { - "type": "AC26791624DE60", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "description": { - "moniker": "naruemon", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - }, - "description": { - "moniker": "Adrian Brink - Cryptium Labs", - "identity": "", - "website": "https://cryptium.ch", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - }, - "description": { - "moniker": "zaki", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "pub_key": { - "type": "AC26791624DE60", - "value": "cvGYknYP9XMUzqlXZde7lRpvAp/kZiSRYHg66krJNxQ=" - }, - "description": { - "moniker": "trust", - "identity": "", - "website": "http://cosmos-trust.com", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - }, - "description": { - "moniker": "proof-of-audit", - "identity": "", - "website": "https://proof-of-audit.com", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - } - ] - } - } -} diff --git a/cmd/gaia/testnets/gaia-6002/genesis.json b/cmd/gaia/testnets/gaia-6002/genesis.json deleted file mode 100644 index 7f53893a8..000000000 --- a/cmd/gaia/testnets/gaia-6002/genesis.json +++ /dev/null @@ -1,1459 +0,0 @@ -{ - "genesis_time": "2018-06-16T18:29:12.38288148Z", - "chain_id": "gaia-6002", - "consensus_params": { - "block_size_params": { - "max_bytes": 22020096, - "max_txs": 100000, - "max_gas": -1 - }, - "tx_size_params": { - "max_bytes": 10240, - "max_gas": -1 - }, - "block_gossip_params": { - "block_part_size_bytes": 65536 - }, - "evidence_params": { - "max_age": 100000 - } - }, - "validators": [ - { - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - }, - "power": 1000, - "name": "adrian" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - }, - "power": 1000, - "name": "zaki" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "bIvXwf0qlOy0rO0SY/h8FfsqyW/AMpGL2yUhUNOY7hs=" - }, - "power": 100, - "name": "staked" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - }, - "power": 1000, - "name": "polsdam" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - }, - "power": 1000, - "name": "lino" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - }, - "power": 100, - "name": "" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - }, - "power": 1000, - "name": "iris" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - }, - "power": 1000, - "name": "pbostrom" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - }, - "power": 1000, - "name": "aurel" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - }, - "power": 1000, - "name": "bucky" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - }, - "power": 100, - "name": "cwgoes" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "TNPLvN6f6QoSLJqGHzIfbraBoSw3emr9Sk2Us94M4gM=" - }, - "power": 1000, - "name": "bdnet" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "cvGYknYP9XMUzqlXZde7lRpvAp/kZiSRYHg66krJNxQ=" - }, - "power": 1000, - "name": "melea-trust" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "power": 1000, - "name": "naruemon" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "rcl+kuM69Un/a7e+fQsQrCEtT1g04tFviOeq2GygSIw=" - }, - "power": 1000, - "name": "idoor" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "S9urD5q7je21qp5vEobiURdWrtJwvqMsfZGQhb8GOBQ=" - }, - "power": 1000, - "name": "ATEAM1" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "vSr94aI+zfF3D8Cr2VtCXPpfgj7t2ck8SlZxRsfn7gk=" - }, - "power": 1000, - "name": "figmatt" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "p5ijoVwp2zmA7RkXXvPl+yqdnlaWMwoV2pYIN8bDyFs=" - }, - "power": 1000, - "name": "jla-bsd" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "KOdWpo4aQFrLxVlkyc66p7m6mBNnPLmGuO4Z4L+CI1Y=" - }, - "power": 1000, - "name": "Gold" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "VfOsmcON77auerRc9zKwOR+CvL0sj1nA45hS2WqX1xE=" - }, - "power": 1000, - "name": "nylira" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "QYONAknaJqx3OKPSKraDrOPkx6xssezYtXVS84nZvZE=" - }, - "power": 1000, - "name": "BKCM" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "PyFJmNrUres3QOkj2BjxplCxrOF+HDFGohi3tRKsToY=" - }, - "power": 1000, - "name": "Dev's Validator" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "s4ER09+WeX10euzGyK7xDW7+myQVXt3Plup8IHUE4nk=" - }, - "power": 1000, - "name": "Staking Facilities" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "OPxj9edXgufNEjYNhZKqLgmYnK4A3nGw3rxaFQrHn24=" - }, - "power": 1000, - "name": "nuevax" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "Hi2rtbdJdQtOe3Kq4OoD/xkWJbIjIsUI9qgLQ6TlhiM=" - }, - "power": 1000, - "name": "vultr.guest" - }, - { - "pub_key": { - "type": "AC26791624DE60", - "value": "ah3JtmBA7gbxSiimPsLqQlV85gpNOUBJMvnxGx8eVlo=" - }, - "power": 1000, - "name": "forebole" - } - ], - "app_hash": "", - "app_state": { - "accounts": [ - { - "address": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "coins": [ - { - "denom": "devToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "coins": [ - { - "denom": "adrianToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "109720515B4F8C0858DA3521E448262334534FFD", - "coins": [ - { - "denom": "defaultToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "coins": [ - { - "denom": "aurelToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "328FBB8EA315D070DF908982A5F91A3618001D20", - "coins": [ - { - "denom": "cwgoesToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "coins": [ - { - "denom": "BKCMToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "coins": [ - { - "denom": "BDToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "coins": [ - { - "denom": "suyuToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "coins": [ - { - "denom": "linoToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "coins": [ - { - "denom": "stakingToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "935E04662697134905706A4CCDB822AC6FC11C2E", - "coins": [ - { - "denom": "defaultToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "935E48ED79F1006ED135553768E1D9A768747CF6", - "coins": [ - { - "denom": "buckyToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "99FFAEE5BF6040EADA2F26548C4A702619797C9F", - "coins": [ - { - "denom": "kwunyeungToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - }, - { - "address": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "zachToken", - "amount": 1000 - } - ] - }, - { - "address": "A323EC45243D600204BA3D298E3C20322D08C84C", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "nuevaxToken", - "amount": 1000 - } - ] - }, - { - "address": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "dokiaToken", - "amount": 1000 - } - ] - }, - { - "address": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "forboleToken", - "amount": 1000 - } - ] - }, - { - "address": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "coins": [ - { - "denom": "steak", - "amount": 100 - }, - { - "denom": "pengToken", - "amount": 1000 - } - ] - }, - { - "address": "FD30D5C983FFEDEC069C3DDFCF270E41A556A86E", - "coins": [ - { - "denom": "steak", - "amount": 900 - }, - { - "denom": "faucetToken", - "amount": 10000000 - } - ] - }, - { - "address": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "goldToken", - "amount": 100 - } - ] - }, - { - "address": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "jlaToken", - "amount": 100 - } - ] - }, - { - "address": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "figmattToken", - "amount": 100 - } - ] - }, - { - "address": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "ATEAM1Token", - "amount": 100 - } - ] - }, - { - "address": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "idoorToken", - "amount": 100 - } - ] - }, - { - "address": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "naruemonToken", - "amount": 100 - } - ] - }, - { - "address": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "zakiToken", - "amount": 1000 - } - ] - }, - { - "address": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "coins": [ - { - "denom": "steak", - "amount": 50 - }, - { - "denom": "trustToken", - "amount": 1000 - } - ] - }, - { - "address": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "coins": [ - { - "denom": "poldsamToken", - "amount": 1000 - }, - { - "denom": "steak", - "amount": 50 - } - ] - } - ], - "stake": { - "pool": { - "loose_unbonded_tokens": 2300, - "unbonded_tokens": 0, - "unbonding_tokens": 0, - "bonded_tokens": 23300, - "unbonded_shares": "0", - "unbonding_shares": "0", - "bonded_shares": "23300", - "inflation_last_time": 0, - "inflation": "9012837/100000000", - "date_last_commission_reset": 0, - "prev_bonded_shares": "0" - }, - "params": { - "inflation_rate_change": "13/100", - "inflation_max": "1/5", - "inflation_min": "7/100", - "goal_bonded": "67/100", - "max_validators": 100, - "bond_denom": "steak" - }, - "bonds": [ - { - "delegator_addr": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "validator_addr": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "109720515B4F8C0858DA3521E448262334534FFD", - "validator_addr": "109720515B4F8C0858DA3521E448262334534FFD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "validator_addr": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "328FBB8EA315D070DF908982A5F91A3618001D20", - "validator_addr": "328FBB8EA315D070DF908982A5F91A3618001D20", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "validator_addr": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "validator_addr": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "validator_addr": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "validator_addr": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "validator_addr": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "935E04662697134905706A4CCDB822AC6FC11C2E", - "validator_addr": "935E04662697134905706A4CCDB822AC6FC11C2E", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "935E48ED79F1006ED135553768E1D9A768747CF6", - "validator_addr": "935E48ED79F1006ED135553768E1D9A768747CF6", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "validator_addr": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "shares": "100", - "height": 0 - }, - { - "delegator_addr": "A323EC45243D600204BA3D298E3C20322D08C84C", - "validator_addr": "A323EC45243D600204BA3D298E3C20322D08C84C", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "validator_addr": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "validator_addr": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "validator_addr": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "validator_addr": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "validator_addr": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "validator_addr": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "validator_addr": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "validator_addr": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "validator_addr": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "validator_addr": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "validator_addr": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "validator_addr": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "shares": "1000", - "height": 0 - }, - { - "delegator_addr": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "validator_addr": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "shares": "1000", - "height": 0 - } - ], - "validators": [ - { - "owner": "04F01D5AF8DD248130BBE1D0780EA219CE479A9B", - "pub_key": { - "type": "AC26791624DE60", - "value": "PyFJmNrUres3QOkj2BjxplCxrOF+HDFGohi3tRKsToY=" - }, - "description": { - "moniker": "Dev's Validator", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "109720515B4F8C0858DA3521E448262334534FFD", - "pub_key": { - "type": "AC26791624DE60", - "value": "pY7eLF0Ez3yq495kIjag8mD67Q131np/ssagpEvlV2A=" - }, - "description": { - "moniker": "", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "10B0899E05A486AE4E5589C39587DF7E9A185872", - "pub_key": { - "type": "AC26791624DE60", - "value": "RpX+xkwnCNw5DpBelscz4//TiODyC9RDiyIuD6NEwx0=" - }, - "description": { - "moniker": "aurel", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "328FBB8EA315D070DF908982A5F91A3618001D20", - "pub_key": { - "type": "AC26791624DE60", - "value": "dcmCn+RZTBdwbCa4YqSnw/Va7xQloBw6vF87ItLwdM0=" - }, - "description": { - "moniker": "cwgoes", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "4062DAFB9ACD4D91051B569CD4B19A26524B314B", - "pub_key": { - "type": "AC26791624DE60", - "value": "QYONAknaJqx3OKPSKraDrOPkx6xssezYtXVS84nZvZE=" - }, - "description": { - "moniker": "BKCM", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "42D76AF31E36EE23CA5366FBB9CE18610CCB9820", - "pub_key": { - "type": "AC26791624DE60", - "value": "TNPLvN6f6QoSLJqGHzIfbraBoSw3emr9Sk2Us94M4gM=" - }, - "description": { - "moniker": "bdnet", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "4B5BE759EB23B0D76C6A60636BD0E3111178794E", - "pub_key": { - "type": "AC26791624DE60", - "value": "7SaH/LyM+qdz9ovD/pvqIf2q7LC7tc5v0ZJxsA2CGTw=" - }, - "description": { - "moniker": "suyu", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "5A007B81A25AF34B829B79DA508A26E12180BCDB", - "pub_key": { - "type": "AC26791624DE60", - "value": "SW12+WpGKUCO9oT2CV0CD5kUclbXjJHV1MjerLWB7Oc=" - }, - "description": { - "moniker": "lino", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "83C2788B74E1A410A4E62F1040EAE15F4B6EA3F5", - "pub_key": { - "type": "AC26791624DE60", - "value": "s4ER09+WeX10euzGyK7xDW7+myQVXt3Plup8IHUE4nk=" - }, - "description": { - "moniker": "Staking Facilities", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "935E04662697134905706A4CCDB822AC6FC11C2E", - "pub_key": { - "type": "AC26791624DE60", - "value": "bIvXwf0qlOy0rO0SY/h8FfsqyW/AMpGL2yUhUNOY7hs=" - }, - "description": { - "moniker": "default", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "935E48ED79F1006ED135553768E1D9A768747CF6", - "pub_key": { - "type": "AC26791624DE60", - "value": "0aNTDL49987ZNRi3FtJIi0jk93ybHuYg1FjWrfP9H2o=" - }, - "description": { - "moniker": "bucky", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "9D5723057702E2090405AB5D3B48C45B9ABF4377", - "pub_key": { - "type": "AC26791624DE60", - "value": "NjjEQKUsq8F0gWxl3BoU2Li5n7hEz9H/LX80rfMxVyE=" - }, - "description": { - "moniker": "zach", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "100" - }, - "delegator_shares": "100", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "A323EC45243D600204BA3D298E3C20322D08C84C", - "pub_key": { - "type": "AC26791624DE60", - "value": "OPxj9edXgufNEjYNhZKqLgmYnK4A3nGw3rxaFQrHn24=" - }, - "description": { - "moniker": "nuevax", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "A9A3DADDC8BFFAD52BA51C8F4F2E9F62709412DC", - "pub_key": { - "type": "AC26791624DE60", - "value": "Hi2rtbdJdQtOe3Kq4OoD/xkWJbIjIsUI9qgLQ6TlhiM=" - }, - "description": { - "moniker": "vultr.guest", - "identity": "", - "website": "https://ion.dokia.capital/", - "details": "DokiaValidator" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "B6834D914FE50F0C743E6A012AB20438CFADFB95", - "pub_key": { - "type": "AC26791624DE60", - "value": "ah3JtmBA7gbxSiimPsLqQlV85gpNOUBJMvnxGx8eVlo=" - }, - "description": { - "moniker": "forbole", - "identity": "", - "website": "https://www.forbole.com", - "details": "Recommend. Refer. Reward" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "B75C2C4309475C91E8DE271BC52CBAC408365B83", - "pub_key": { - "type": "AC26791624DE60", - "value": "VfOsmcON77auerRc9zKwOR+CvL0sj1nA45hS2WqX1xE=" - }, - "description": { - "moniker": "nylira", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C0D0CA58C50B7B02A841E1B27D9A21D939754AC7", - "pub_key": { - "type": "AC26791624DE60", - "value": "KOdWpo4aQFrLxVlkyc66p7m6mBNnPLmGuO4Z4L+CI1Y=" - }, - "description": { - "moniker": "Gold", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C5033FCFB67D7BD7B8546389F125710462D4FB6C", - "pub_key": { - "type": "AC26791624DE60", - "value": "p5ijoVwp2zmA7RkXXvPl+yqdnlaWMwoV2pYIN8bDyFs=" - }, - "description": { - "moniker": "jla-bsd", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "C6CB038C98026D2F17241A3B3166AE7E9488D9AD", - "pub_key": { - "type": "AC26791624DE60", - "value": "vSr94aI+zfF3D8Cr2VtCXPpfgj7t2ck8SlZxRsfn7gk=" - }, - "description": { - "moniker": "figmatt", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D0861E3F22339C507B716102FDD5CA681EDE4F8E", - "pub_key": { - "type": "AC26791624DE60", - "value": "S9urD5q7je21qp5vEobiURdWrtJwvqMsfZGQhb8GOBQ=" - }, - "description": { - "moniker": "ATEAM1", - "identity": "", - "website": "", - "details": "ATEAM1" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D6545CB14FCA7840A295FB0566C27E4B9D526993", - "pub_key": { - "type": "AC26791624DE60", - "value": "rcl+kuM69Un/a7e+fQsQrCEtT1g04tFviOeq2GygSIw=" - }, - "description": { - "moniker": "idoor", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "D841E0DACF3994E6A40126F023F6F32F98A5D89E", - "pub_key": { - "type": "AC26791624DE60", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "description": { - "moniker": "naruemon", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "FD8DA5F512A59A30F8698E3CA638D384A68DF977", - "pub_key": { - "type": "AC26791624DE60", - "value": "TZTQnfqOsi89SeoXVnIw+tnFJnr4X8qVC0U8AsEmFk4=" - }, - "description": { - "moniker": "Adrian Brink - Cryptium Labs", - "identity": "", - "website": "https://cryptium.ch", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "ECE57661F0CDCF28EED257B72F86240E57F4A612", - "pub_key": { - "type": "AC26791624DE60", - "value": "CDF/8aD8Lt+ikR3LyCg9c7DwWBA51NH+MUkH7tzxrfY=" - }, - "description": { - "moniker": "zaki", - "identity": "", - "website": "", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "EFE597F7A90D3F3E7599B25259449628E2C4AFAD", - "pub_key": { - "type": "AC26791624DE60", - "value": "cvGYknYP9XMUzqlXZde7lRpvAp/kZiSRYHg66krJNxQ=" - }, - "description": { - "moniker": "trust", - "identity": "", - "website": "http://cosmos-trust.com", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - }, - { - "owner": "FA929191B04C5DB222AFC6F15C63EF48CCC864C5", - "pub_key": { - "type": "AC26791624DE60", - "value": "RMwWTZsVdkq1heicNJb2fosy9Fls4NHxAHReiJvHl+8=" - }, - "description": { - "moniker": "proof-of-audit", - "identity": "", - "website": "https://proof-of-audit.com", - "details": "" - }, - "revoked": false, - "pool_shares": { - "status": 2, - "amount": "1000" - }, - "delegator_shares": "1000", - "bond_height": 0, - "bond_intra_tx_counter": 0, - "commision": "0/1", - "commission_max": "0/1", - "commission_change_rate": "0/1", - "commission_change_rate_today": "0/1", - "prev_bonded_shares": "0/1" - } - ] - } - } -} diff --git a/cmd/gaia/testnets/gaia-7000/genesis.json b/cmd/gaia/testnets/gaia-7000/genesis.json deleted file mode 100644 index 7ada516d4..000000000 --- a/cmd/gaia/testnets/gaia-7000/genesis.json +++ /dev/null @@ -1,5680 +0,0 @@ -{ - "genesis_time": "2018-07-16T19:57:28.971479541Z", - "chain_id": "gaia-7000", - "consensus_params": { - "block_size_params": { - "max_bytes": "22020096", - "max_txs": "10000", - "max_gas": "-1" - }, - "tx_size_params": { - "max_bytes": "10240", - "max_gas": "-1" - }, - "block_gossip_params": { - "block_part_size_bytes": "65536" - }, - "evidence_params": { - "max_age": "100000" - } - }, - "validators": [ - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MRCeBDANSjH6IsxO0z6tRe+xqoZvIGhdfl1t+SXGUpM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "tOEqjO2t51PEgO9Tv0B7qM0yPmy1n5tMa3Beg0tp3ns=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "S8s6fdAQNQ3bN9SNVAsHB/j8uv1CM1roxeLesL+fh4g=" - }, - "power": "100", - "name": "validatorluigi001" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2JoNf1gavJ1d6XFIumO1Mki5GVMOcg58AioHksU3maE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2JoNf1gavJ1d6XFIumO1Mki5GVMOcg58AioHksU3maE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "k3YLQYEN2QMP6XITRsBmgb+pNGhJ5Jbg0bzUW977kK0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "EREUrXXl1OJqLQag0P4h6vJ2H+8GEwyNAjgn1XEJU+I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "heNintBalqaJwCOjLb9+mX/cQ1ytMlV7ZroPIlkwZqo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nb2oRB12DlEQkFn7KSjSVkj5rDoSTsuBFa09+gmNJ7o=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "bZSEBDNIOr0xJ/PxaAScJIyG6hqFtryBAMNwghAOTTU=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8K3clCjVU33BTIpUhdahGmu++WxHj4NUE9krCRkk++s=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RBuRRNEzA9RA1Wrdi9PPFQJ29/n/bqN9O2tQv9Gq248=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RwPRoiY5C0covekqbr3VrQwxWGHioUUIf2+TOq8LIC0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2qtEBT+Tc+SD2wJsdrVMHXrBKfvesxtmtSKDK5fXwA0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gU5mmVLUSzn/fIEMgiiB4LARRoWlqjUGHr3A4SndWO8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "xlO2cnii42KisAn8OcstC/3XV5+I0FlcSbWuyy5MVA8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "q5ezDn4DcWFPWvMayPJI35nXr//jjF8fGHsuiHjpDcU=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PSqbJOwglJb1yrj3aWebBpXb2ujXcR037s1Cyj2HoW4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A6GzeXUM3vsXaDAEYMSDgSKkqn9AoUYjs8empH46MGY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "81fx09BivOOxeGL7QisF8aKRZjjcARpiSaCOX9mJfY8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UjTvuOew2EaooduJBiYmBWeF5ai0yFJG8uio5YXpJgg=" - }, - "power": "1", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "y7p9JSVZBnRxjAI9v5Pxl37hMtyuHf6B4Ghqzm6+ii0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oG8Q5o+SN4wqMLvlIfVgQPnsQzNEKeH0D/XGM8JlGrY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PxJbo5FKA6mXtgwclRQVNIjOCQK3Q7WkLQrvM9lYbGI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Q/UShqqVDOUSNYBrR1G/1X1s+YXEVXEJzeXmYvfYIr0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "uEWWDBwFW+/BpTCvNCLW7AP98hndBukzSbrwCb7sooo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MZi48DJZOgRbE0ZStR66omv6Ez1Wkjvf2D/41q6Nd0I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Go9GXHI6SCQo2QKMxkAkgYLhfo3XrVjWLR2nE2AvYyk=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "P9RgE4RMQT/aHap2oICpwpgKeBAwxPUwuU9zIffKFNM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "1+EkFYvTDmz4WQRbK+kznRHoaZVLludtkDrMuM6h++E=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "QEMDwUVoyJT7MNfOYKa25xU+Lnsz/ciH8rFUri4diLI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "lUMCRAeu47BsOhNvCQTQJQeB68z0/VaElC9j5gDt9y8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VnAr7ZIjvUXpWmzbkt8skHp0oRNc3V89SfvgaZydwfw=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "u4GEbsk9IEF56V1am5dRtAWXz4iFQkO03FVL87BZXIM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BaaCxmYHKJ6obIzTCdRtjw1cc8d2mUJcMbLWCjf1aLo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "N3K5kDdfcKJurfaa6s2zfKgtYvz1Pagz7VWi9ZfX8yM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "DsTbM0AgHfhSUKvOGkxudDOY3ojYT6bifhpelqHs8+s=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j9be+ddLChInrFz6/820/uYh4WZBzlp61klyJBDy/ZY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xi7nIgj4PqVXrpKLfJhcyxyVY1d3HRo72sKKPDmuU78=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2p8s/pRBZPjYWKKMlR7AOXypDzDmPo762iXlKpCwtco=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nsofE1FmSr1TiDR0gfnxfMDQ8o2pC+1NE7Oa9ceztSg=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WvmTBjsCN4ueGpEdySRwsRC5knBRLfY439/e4mG+YAY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "c0i2uKsYBv8fubnI60lZIWA1y4zw1bFgsq5MmWBHKak=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "AJR2ex094A1nJEWQsZYjALWsrSl1/huGZ37z2ZsMrpg=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "LSDd6ab46sHxwJSrg5YLpsPG2o6EcsZ3rDikpHzMNmI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dnFjFoTM9sP/RjQkXBK1YpYn3v5W+j0+g/OfUHS4xu8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "L0I4JoDfktbDWe0fCDL/nQlBPkF5mNgqamnM5JKJ1Uc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dPpZD53AbAMtW6sK+rTnXYe2GGGoSCNWsCtsmArLiIs=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VakMQSPBEuSC9Nwuv8WWhrZVUmH31bUR4+G6pJhkgE8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "KI+kCESWD9cB8se4uxRrFVAI5viyNNUXUyMCc903yQc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8Qu1LFMt7qlZNmYQWrsXUA80aIx0rrFPPXs2s6NBdU8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WRsXnLz3gf8o4lYYeCZjAXgPU1cdmOOYPdy7aY63iIA=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "R/3f7VruxWpu+2hiHlVpplTwoOou5kfQI1k/6/9H/y8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "HjSC7VkhKih6xMhudlqfaFE8ZZnP8RKJPv4iqR7RhcE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cLM/HeUFsXlnYnYod695u6NBDS0trMq8sVRdABnF7uc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Epd2FDKZwDybzT38Z7WB0y2jiLn9/2OLzmY3Zu18l6I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ENAVynNXVpj/IdYx9kCPKaPs4bWSxRIHNlmS9QiDuZQ=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j2w5BFOnZTrPN4SFpmQyfRomnUwbEbz1A+kr3z1icjo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "I2ILaY31gonxYQhlIk4PFUIN+Pk7+9dDTK1C/s+Vcb0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "3wRufybSUsTMnUeQkP74uJNDRKeM8jBLAS64T0BRfpY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2gOiMAdnIdND4cA75E7naQdyyIYDAdcjF3uO6OiEZlU=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2S8Y/vnLM3W+MYxNCxcUItIBfdZL/T4A8vRg89n0wLg=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UBTju7UZfXLVPPYb1a8gPZ69BeCv2Fho7YVo2EUbxKc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "0HqB2x6x5HzeozpHatePECw07x1UcDdSz8kQGNznnA8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "H0SIA/BU6Xj8oT5bQkvLpEITN3CqFLbMeBcQ72NZrAE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xnh8TL3BbIs9VTUenmnx6r2UAHpGCj3G9FV0mzc+mU4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "X62YB48gO2SsWGnjYxH+aGfLQcjnP+T0hnErdWZ859g=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8pfpbIxBBiu88hpxS3CeRpv7kClEjl8SwVgckDNBGlE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UuxXNPImsE5Wp+utGfJywZBHuuGE4RmL0CArc6td82w=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Sl3NKLaYEgDaovqTkKVZh2ihRFbSmyVjC63wpv3ecdc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SYjCs2AlY04xdfJGPD+gyO9NZ/zQ0Lfb/TLrjgOLS68=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oI1+4FoeI/knjsjDyCJtgZPaeyKON8tCTcM9QX0BHa8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nts1nu73aBgIdSaYye4coIuE1iBNeCuTZZC8LQ37ac8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NQX4yKpOztKrmgBhGIC5WOALOLOq3LTpbzsN4ZLXGec=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BB4a/Xh5z+dkGCRlF+pSGC3iDOoDrFse/xzQAtmxMF4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ydjx2ea+PVuChrny6X2dluJwyXta+BsNQRsgHXp8fXw=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "pPGLc4NhNaehdoV2antWuyr0GmBVEG1NhD9NiSRrTi0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VBVHOLnWGptY26J0wqXoZI2Dnu96pccMb08zlsaxPCQ=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "aUViYC2znC55sleHfmsIN9hZ45SbYPbDcYA0gVzglsc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "riYrMXBFLavmf4MU/Ly7emDlciVqfB2/zxJoRsBUlfY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "F2wCn9rKafNZsYZwoLGkSQIpr3rk86cjYyuhSjsjRaE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ugb3W6W7WL9Vc4KiSBWIaowBfpqJlzbfBSfrIqZW06A=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gJDxhwAE6GeGCKQeVaNZ5is7+7MFHXtOG0UsnguKdoA=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "b9RSkt+WmMxVHQExQH0IMPpnR9zDAaJwz/mv1gtyRVY=" - }, - "power": "100", - "name": "smartpesa" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "569Sb+Wpo8VFqXRi4cQhlOD9kS8uBgmJ2rntY3GLtzY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SNwrT1B+A4g6TY7x0QzVrmVbcbl3cHXzXdD1tFHxLNo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "K4kLogLtZxqrYSqRVJfrFm9tUG+Tc3QWXWIewnAgI9w=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "TwzOJ4GcN+ZTswub4R8488SrKeWXjY/PaqCF5neXJig=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JXW8iTiWG28E05ZFJIKvCOBwI2RrH/BOBL/MluTZ6+I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A3zUdVcpj4H+HRZmRW5xixj4dzMgqD7be9GrdXcjdns=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "7RhnD9OAZEJ4SV6V3LOZ1gGWubtX25457wCQq+AYYPI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "66j9af4xDJSblMLS+mFbp7d8TaFGu0FOo+0MwEYm2lE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8DScmobjJQmkN44K2xiZkESM/O9MJK/DqlggnIPLpso=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "4JoJuRfaANhdM1x3AWRo1/Cj9DH3VA+fi1SynzknV+w=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cCoFsZzKZ9SQZbHe4NueVObIezP6ts0tRTZ/aN96dig=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Zp4tk/ieqplJF8xMeef9HV8bYpHSY+3hJ2sH7PfCX1I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "jj0Y/Fy8JSJR3g+PHU6Ce0ecYwHGUVJ4bVyR7WwcyLI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "XQDVMXja3kFk5Jb47BsqJmzcDsM4lE9+r+f/J3O5Jms=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oL/QCr7LEOivyTqpGrmwVd1r+hYI2WB5+kSVzpDMxx4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "eeImG09hOPo1W7j7lKepN/Lx6I9GGHqVBVEKmznxACc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Abws3eXrUFAH8LeZJIcECakPL945TTmFsBlXONOUeII=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PEg/D54SoiKZ+pic0Z0RzZa/vfYNAAf4kzSc5UKXDYk=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "omAzuJps8KX3/iOC1LjwkMPMH3c6tjfLXwCNWXRBdWw=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nctikQSpoLRl5kV6KarIS761QvEOZCWw6nvc48xWhic=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NrTRAbZnBqJpW9lRW6LxXxE7EV++y7WiIRV0ifRLovA=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "W0rP8sv4Ae/LZOqlBA9evvYARDt79WpFaI26jw/9Tfk=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JdfJDlE46456GWp+AkSZhzlkUQI41f8aX7611oiWUSc=" - }, - "power": "100", - "name": "" - } - ], - "app_hash": "", - "app_state": { - "accounts": [ - { - "address": "cosmosaccaddr1c2dkaym4teqw6jl9jkq8eu8nf4wzn2lgf4ydyt", - "coins": [ - { - "denom": "faucetToken", - "amount": "1000000" - }, - { - "denom": "steak", - "amount": "10000000" - } - ] - }, - { - "address": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "coins": [ - { - "denom": "jlandrewsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "coins": [ - { - "denom": "jackToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "coins": [ - { - "denom": "luigi001Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "coins": [ - { - "denom": "irisToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "coins": [ - { - "denom": "irisToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "coins": [ - { - "denom": "TropicalMongoXToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "coins": [ - { - "denom": "wingmanToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "coins": [ - { - "denom": "Nemea7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "coins": [ - { - "denom": "infinite-castingToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "coins": [ - { - "denom": "cwgoesToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "coins": [ - { - "denom": "lunamintToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "coins": [ - { - "denom": "skoed-validator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "coins": [ - { - "denom": "starfishToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "coins": [ - { - "denom": "jjangg96Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "coins": [ - { - "denom": "iaspirationiToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "coins": [ - { - "denom": "21e800Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "coins": [ - { - "denom": "spptest1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "coins": [ - { - "denom": "windmillToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "coins": [ - { - "denom": "pbostrom/Mythos-1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "coins": [ - { - "denom": "BarytToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "coins": [ - { - "denom": "P2P.ORG ValidatorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "coins": [ - { - "denom": "oleary-labsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "coins": [ - { - "denom": "wancloudsentryToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "coins": [ - { - "denom": "space4Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "coins": [ - { - "denom": "colony-finderToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "coins": [ - { - "denom": "sparkpool-validator-02Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "coins": [ - { - "denom": "mining-shipToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "coins": [ - { - "denom": "StakedToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "coins": [ - { - "denom": "nyliraToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "coins": [ - { - "denom": "liangpingToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "coins": [ - { - "denom": "SVNode01Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "coins": [ - { - "denom": "vhxnode1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "coins": [ - { - "denom": "gregToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "coins": [ - { - "denom": "bucksterToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "coins": [ - { - "denom": "grass-fedToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "coins": [ - { - "denom": "ATEAM1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "coins": [ - { - "denom": "BFF-Validator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "coins": [ - { - "denom": "redbricks7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "coins": [ - { - "denom": "kittyfishToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "coins": [ - { - "denom": "ForboleToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "coins": [ - { - "denom": "coinoneToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "coins": [ - { - "denom": "bmen-companyToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "coins": [ - { - "denom": "2400bpsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "coins": [ - { - "denom": "devToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "coins": [ - { - "denom": "w1m3lToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "coins": [ - { - "denom": "aetherToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "coins": [ - { - "denom": "JColToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "coins": [ - { - "denom": "SaiKrishnaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "coins": [ - { - "denom": "UmbrellaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "coins": [ - { - "denom": "@MarceldeveloperToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "coins": [ - { - "denom": "stereo-watcherToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "coins": [ - { - "denom": "cosmosToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "coins": [ - { - "denom": "stake.zoneToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "coins": [ - { - "denom": "firstblock.ioToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "coins": [ - { - "denom": "shensiToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "coins": [ - { - "denom": "figmentToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "coins": [ - { - "denom": "iqlusionToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "coins": [ - { - "denom": "cosmosthecatToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "coins": [ - { - "denom": "snaticoToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "coins": [ - { - "denom": "mpaxeNodeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "coins": [ - { - "denom": "joltz-secureware.ioToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "coins": [ - { - "denom": "mwnode1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "coins": [ - { - "denom": "VNode01Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "coins": [ - { - "denom": "7768Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "coins": [ - { - "denom": "block3.communityToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "coins": [ - { - "denom": "4455Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "coins": [ - { - "denom": "dooroomeeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "coins": [ - { - "denom": "sheiudToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "coins": [ - { - "denom": "Staking Facilities ValidatorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "coins": [ - { - "denom": "ritter-rammToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "coins": [ - { - "denom": "meteor-discoverToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "coins": [ - { - "denom": "COSMODROMEToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "coins": [ - { - "denom": "broadleaf7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "coins": [ - { - "denom": "ravenclubToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "coins": [ - { - "denom": "dokia-capitalToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "coins": [ - { - "denom": "chainflow08Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "coins": [ - { - "denom": "MiaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "coins": [ - { - "denom": "sikka.techToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "coins": [ - { - "denom": "certus.oneToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "coins": [ - { - "denom": "Gold2Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "coins": [ - { - "denom": "idoor7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "coins": [ - { - "denom": "ironforkToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "coins": [ - { - "denom": "sunny-mintorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "coins": [ - { - "denom": "BlissDynamicsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "coins": [ - { - "denom": "smartpesaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "coins": [ - { - "denom": "ianstreamToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "coins": [ - { - "denom": "TruNodeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "coins": [ - { - "denom": "abcinToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "coins": [ - { - "denom": "kochacolajToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "coins": [ - { - "denom": "D2R-validator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "coins": [ - { - "denom": "juelianshanaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "coins": [ - { - "denom": "lambda-mixerToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "coins": [ - { - "denom": "bkcmToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "coins": [ - { - "denom": "ramihanToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "coins": [ - { - "denom": "davinchcodeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "coins": [ - { - "denom": "DoriToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "coins": [ - { - "denom": "daefreecaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "coins": [ - { - "denom": "nuevaxToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "coins": [ - { - "denom": "inschain_validatorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "coins": [ - { - "denom": "gruberxToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "coins": [ - { - "denom": "meleatrustToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "coins": [ - { - "denom": "Cosmodator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "coins": [ - { - "denom": "bharvestToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "coins": [ - { - "denom": "cryptiumToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "coins": [ - { - "denom": "finalityToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "coins": [ - { - "denom": "coscloudToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "coins": [ - { - "denom": "xiaochinaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "coins": [ - { - "denom": "gazua1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - } - ], - "stake": { - "pool": { - "loose_tokens": "16200", - "bonded_tokens": "0", - "inflation_last_time": "0", - "inflation": "7/100", - "date_last_commission_reset": "0", - "prev_bonded_shares": "0" - }, - "params": { - "inflation_rate_change": "13/100", - "inflation_max": "1/5", - "inflation_min": "7/100", - "goal_bonded": "67/100", - "unbonding_time": "86400", - "max_validators": 100, - "bond_denom": "steak" - }, - "validators": [ - { - "owner": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MRCeBDANSjH6IsxO0z6tRe+xqoZvIGhdfl1t+SXGUpM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "jlandrews", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "tOEqjO2t51PEgO9Tv0B7qM0yPmy1n5tMa3Beg0tp3ns=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "jack", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "S8s6fdAQNQ3bN9SNVAsHB/j8uv1CM1roxeLesL+fh4g=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "luigi001", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2JoNf1gavJ1d6XFIumO1Mki5GVMOcg58AioHksU3maE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "iris", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2JoNf1gavJ1d6XFIumO1Mki5GVMOcg58AioHksU3maE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "iris", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "k3YLQYEN2QMP6XITRsBmgb+pNGhJ5Jbg0bzUW977kK0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "TropicalMongoX", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "EREUrXXl1OJqLQag0P4h6vJ2H+8GEwyNAjgn1XEJU+I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "wingman", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "heNintBalqaJwCOjLb9+mX/cQ1ytMlV7ZroPIlkwZqo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Nemea7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nb2oRB12DlEQkFn7KSjSVkj5rDoSTsuBFa09+gmNJ7o=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "infinite-casting", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "bZSEBDNIOr0xJ/PxaAScJIyG6hqFtryBAMNwghAOTTU=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "cwgoes", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8K3clCjVU33BTIpUhdahGmu++WxHj4NUE9krCRkk++s=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "lunamint", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RBuRRNEzA9RA1Wrdi9PPFQJ29/n/bqN9O2tQv9Gq248=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "skoed-validator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RwPRoiY5C0covekqbr3VrQwxWGHioUUIf2+TOq8LIC0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "starfish", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2qtEBT+Tc+SD2wJsdrVMHXrBKfvesxtmtSKDK5fXwA0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "jjangg96", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gU5mmVLUSzn/fIEMgiiB4LARRoWlqjUGHr3A4SndWO8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "iaspirationi", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "xlO2cnii42KisAn8OcstC/3XV5+I0FlcSbWuyy5MVA8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "21e800", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "q5ezDn4DcWFPWvMayPJI35nXr//jjF8fGHsuiHjpDcU=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "spptest1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PSqbJOwglJb1yrj3aWebBpXb2ujXcR037s1Cyj2HoW4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "windmill", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A6GzeXUM3vsXaDAEYMSDgSKkqn9AoUYjs8empH46MGY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "pbostrom/Mythos-1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "81fx09BivOOxeGL7QisF8aKRZjjcARpiSaCOX9mJfY8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Baryt", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UjTvuOew2EaooduJBiYmBWeF5ai0yFJG8uio5YXpJgg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "P2P.ORG Validator", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "y7p9JSVZBnRxjAI9v5Pxl37hMtyuHf6B4Ghqzm6+ii0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "oleary-labs", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oG8Q5o+SN4wqMLvlIfVgQPnsQzNEKeH0D/XGM8JlGrY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "wancloudsentry", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PxJbo5FKA6mXtgwclRQVNIjOCQK3Q7WkLQrvM9lYbGI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "space4", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Q/UShqqVDOUSNYBrR1G/1X1s+YXEVXEJzeXmYvfYIr0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "colony-finder", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "uEWWDBwFW+/BpTCvNCLW7AP98hndBukzSbrwCb7sooo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sparkpool-validator-02", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MZi48DJZOgRbE0ZStR66omv6Ez1Wkjvf2D/41q6Nd0I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "mining-ship", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Go9GXHI6SCQo2QKMxkAkgYLhfo3XrVjWLR2nE2AvYyk=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Staked", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "P9RgE4RMQT/aHap2oICpwpgKeBAwxPUwuU9zIffKFNM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "nylira", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "1+EkFYvTDmz4WQRbK+kznRHoaZVLludtkDrMuM6h++E=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "liangping", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "QEMDwUVoyJT7MNfOYKa25xU+Lnsz/ciH8rFUri4diLI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "SVNode01", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "lUMCRAeu47BsOhNvCQTQJQeB68z0/VaElC9j5gDt9y8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "vhxnode1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VnAr7ZIjvUXpWmzbkt8skHp0oRNc3V89SfvgaZydwfw=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "greg", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "u4GEbsk9IEF56V1am5dRtAWXz4iFQkO03FVL87BZXIM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "buckster", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BaaCxmYHKJ6obIzTCdRtjw1cc8d2mUJcMbLWCjf1aLo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "grass-fed", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "N3K5kDdfcKJurfaa6s2zfKgtYvz1Pagz7VWi9ZfX8yM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ATEAM1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "DsTbM0AgHfhSUKvOGkxudDOY3ojYT6bifhpelqHs8+s=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "BFF-Validator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j9be+ddLChInrFz6/820/uYh4WZBzlp61klyJBDy/ZY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "redbricks7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xi7nIgj4PqVXrpKLfJhcyxyVY1d3HRo72sKKPDmuU78=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "kittyfish", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2p8s/pRBZPjYWKKMlR7AOXypDzDmPo762iXlKpCwtco=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Forbole", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nsofE1FmSr1TiDR0gfnxfMDQ8o2pC+1NE7Oa9ceztSg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "coinone", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WvmTBjsCN4ueGpEdySRwsRC5knBRLfY439/e4mG+YAY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "bmen-company", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "c0i2uKsYBv8fubnI60lZIWA1y4zw1bFgsq5MmWBHKak=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "2400bps", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "AJR2ex094A1nJEWQsZYjALWsrSl1/huGZ37z2ZsMrpg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "dev", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "LSDd6ab46sHxwJSrg5YLpsPG2o6EcsZ3rDikpHzMNmI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "w1m3l", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dnFjFoTM9sP/RjQkXBK1YpYn3v5W+j0+g/OfUHS4xu8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "aether", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "L0I4JoDfktbDWe0fCDL/nQlBPkF5mNgqamnM5JKJ1Uc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "JCol", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dPpZD53AbAMtW6sK+rTnXYe2GGGoSCNWsCtsmArLiIs=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "SaiKrishna", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VakMQSPBEuSC9Nwuv8WWhrZVUmH31bUR4+G6pJhkgE8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Umbrella", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "KI+kCESWD9cB8se4uxRrFVAI5viyNNUXUyMCc903yQc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "@Marceldeveloper", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8Qu1LFMt7qlZNmYQWrsXUA80aIx0rrFPPXs2s6NBdU8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "stereo-watcher", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WRsXnLz3gf8o4lYYeCZjAXgPU1cdmOOYPdy7aY63iIA=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "cosmos", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "R/3f7VruxWpu+2hiHlVpplTwoOou5kfQI1k/6/9H/y8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "stake.zone", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "HjSC7VkhKih6xMhudlqfaFE8ZZnP8RKJPv4iqR7RhcE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "firstblock.io", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cLM/HeUFsXlnYnYod695u6NBDS0trMq8sVRdABnF7uc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "shensi", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Epd2FDKZwDybzT38Z7WB0y2jiLn9/2OLzmY3Zu18l6I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "figment", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ENAVynNXVpj/IdYx9kCPKaPs4bWSxRIHNlmS9QiDuZQ=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "iqlusion", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j2w5BFOnZTrPN4SFpmQyfRomnUwbEbz1A+kr3z1icjo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "cosmosthecat", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "I2ILaY31gonxYQhlIk4PFUIN+Pk7+9dDTK1C/s+Vcb0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "snatico", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "3wRufybSUsTMnUeQkP74uJNDRKeM8jBLAS64T0BRfpY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "mpaxeNode", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2gOiMAdnIdND4cA75E7naQdyyIYDAdcjF3uO6OiEZlU=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "joltz-secureware.io", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2S8Y/vnLM3W+MYxNCxcUItIBfdZL/T4A8vRg89n0wLg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "mwnode1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "VNode01", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UBTju7UZfXLVPPYb1a8gPZ69BeCv2Fho7YVo2EUbxKc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "7768", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "0HqB2x6x5HzeozpHatePECw07x1UcDdSz8kQGNznnA8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "block3.community", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "H0SIA/BU6Xj8oT5bQkvLpEITN3CqFLbMeBcQ72NZrAE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "4455", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xnh8TL3BbIs9VTUenmnx6r2UAHpGCj3G9FV0mzc+mU4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "dooroomee", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "X62YB48gO2SsWGnjYxH+aGfLQcjnP+T0hnErdWZ859g=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sheiud", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8pfpbIxBBiu88hpxS3CeRpv7kClEjl8SwVgckDNBGlE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Staking Facilities Validator", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UuxXNPImsE5Wp+utGfJywZBHuuGE4RmL0CArc6td82w=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ritter-ramm", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Sl3NKLaYEgDaovqTkKVZh2ihRFbSmyVjC63wpv3ecdc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "meteor-discover", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SYjCs2AlY04xdfJGPD+gyO9NZ/zQ0Lfb/TLrjgOLS68=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "COSMODROME", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oI1+4FoeI/knjsjDyCJtgZPaeyKON8tCTcM9QX0BHa8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "broadleaf7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nts1nu73aBgIdSaYye4coIuE1iBNeCuTZZC8LQ37ac8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ravenclub", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NQX4yKpOztKrmgBhGIC5WOALOLOq3LTpbzsN4ZLXGec=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "dokia-capital", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BB4a/Xh5z+dkGCRlF+pSGC3iDOoDrFse/xzQAtmxMF4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "chainflow08", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ydjx2ea+PVuChrny6X2dluJwyXta+BsNQRsgHXp8fXw=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Mia", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "pPGLc4NhNaehdoV2antWuyr0GmBVEG1NhD9NiSRrTi0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sikka.tech", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VBVHOLnWGptY26J0wqXoZI2Dnu96pccMb08zlsaxPCQ=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "certus.one", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "aUViYC2znC55sleHfmsIN9hZ45SbYPbDcYA0gVzglsc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Gold2", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "riYrMXBFLavmf4MU/Ly7emDlciVqfB2/zxJoRsBUlfY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "idoor7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "F2wCn9rKafNZsYZwoLGkSQIpr3rk86cjYyuhSjsjRaE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ironfork", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ugb3W6W7WL9Vc4KiSBWIaowBfpqJlzbfBSfrIqZW06A=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sunny-mintor", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gJDxhwAE6GeGCKQeVaNZ5is7+7MFHXtOG0UsnguKdoA=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "BlissDynamics", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "b9RSkt+WmMxVHQExQH0IMPpnR9zDAaJwz/mv1gtyRVY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "smartpesa", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "569Sb+Wpo8VFqXRi4cQhlOD9kS8uBgmJ2rntY3GLtzY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ianstream", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SNwrT1B+A4g6TY7x0QzVrmVbcbl3cHXzXdD1tFHxLNo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "TruNode", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "K4kLogLtZxqrYSqRVJfrFm9tUG+Tc3QWXWIewnAgI9w=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "abcin", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "TwzOJ4GcN+ZTswub4R8488SrKeWXjY/PaqCF5neXJig=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "kochacolaj", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JXW8iTiWG28E05ZFJIKvCOBwI2RrH/BOBL/MluTZ6+I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "D2R-validator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A3zUdVcpj4H+HRZmRW5xixj4dzMgqD7be9GrdXcjdns=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "juelianshana", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "7RhnD9OAZEJ4SV6V3LOZ1gGWubtX25457wCQq+AYYPI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "lambda-mixer", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "66j9af4xDJSblMLS+mFbp7d8TaFGu0FOo+0MwEYm2lE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "bkcm", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8DScmobjJQmkN44K2xiZkESM/O9MJK/DqlggnIPLpso=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ramihan", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "4JoJuRfaANhdM1x3AWRo1/Cj9DH3VA+fi1SynzknV+w=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "davinchcode", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cCoFsZzKZ9SQZbHe4NueVObIezP6ts0tRTZ/aN96dig=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Dori", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Zp4tk/ieqplJF8xMeef9HV8bYpHSY+3hJ2sH7PfCX1I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "daefreeca", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "jj0Y/Fy8JSJR3g+PHU6Ce0ecYwHGUVJ4bVyR7WwcyLI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "nuevax", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "XQDVMXja3kFk5Jb47BsqJmzcDsM4lE9+r+f/J3O5Jms=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "inschain_validator", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oL/QCr7LEOivyTqpGrmwVd1r+hYI2WB5+kSVzpDMxx4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "gruberx", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "eeImG09hOPo1W7j7lKepN/Lx6I9GGHqVBVEKmznxACc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "meleatrust", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Abws3eXrUFAH8LeZJIcECakPL945TTmFsBlXONOUeII=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Cosmodator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PEg/D54SoiKZ+pic0Z0RzZa/vfYNAAf4kzSc5UKXDYk=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "bharvest", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "omAzuJps8KX3/iOC1LjwkMPMH3c6tjfLXwCNWXRBdWw=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Adrian Brink - Cryptium Labs", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nctikQSpoLRl5kV6KarIS761QvEOZCWw6nvc48xWhic=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "finality", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NrTRAbZnBqJpW9lRW6LxXxE7EV++y7WiIRV0ifRLovA=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "coscloud", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "W0rP8sv4Ae/LZOqlBA9evvYARDt79WpFaI26jw/9Tfk=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "xiaochina", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JdfJDlE46456GWp+AkSZhzlkUQI41f8aX7611oiWUSc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "gazua1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - } - ], - "bonds": [ - { - "delegator_addr": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "validator_addr": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "validator_addr": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "validator_addr": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "validator_addr": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "validator_addr": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "validator_addr": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "validator_addr": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "validator_addr": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "validator_addr": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "validator_addr": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "validator_addr": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "validator_addr": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "validator_addr": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "validator_addr": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "validator_addr": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "validator_addr": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "validator_addr": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "validator_addr": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "validator_addr": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "validator_addr": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "validator_addr": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "validator_addr": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "validator_addr": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "validator_addr": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "validator_addr": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "validator_addr": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "validator_addr": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "validator_addr": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "validator_addr": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "validator_addr": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "validator_addr": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "validator_addr": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "validator_addr": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "validator_addr": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "validator_addr": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "validator_addr": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "validator_addr": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "validator_addr": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "validator_addr": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "validator_addr": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "validator_addr": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "validator_addr": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "validator_addr": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "validator_addr": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "validator_addr": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "validator_addr": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "validator_addr": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "validator_addr": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "validator_addr": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "validator_addr": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "validator_addr": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "validator_addr": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "validator_addr": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "validator_addr": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "validator_addr": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "validator_addr": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "validator_addr": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "validator_addr": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "validator_addr": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "validator_addr": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "validator_addr": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "validator_addr": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "validator_addr": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "validator_addr": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "validator_addr": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "validator_addr": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "validator_addr": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "validator_addr": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "validator_addr": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "validator_addr": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "validator_addr": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "validator_addr": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "validator_addr": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "validator_addr": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "validator_addr": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "validator_addr": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "validator_addr": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "validator_addr": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "validator_addr": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "validator_addr": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "validator_addr": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "validator_addr": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "validator_addr": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "validator_addr": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "validator_addr": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "validator_addr": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "validator_addr": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "validator_addr": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "validator_addr": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "validator_addr": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "validator_addr": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "validator_addr": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "validator_addr": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "validator_addr": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "validator_addr": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "validator_addr": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "validator_addr": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "validator_addr": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "validator_addr": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "validator_addr": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "validator_addr": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "validator_addr": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "validator_addr": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "validator_addr": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "validator_addr": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "validator_addr": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "validator_addr": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "validator_addr": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "shares": "100", - "height": "0" - } - ] - } - } -} \ No newline at end of file diff --git a/cmd/gaia/testnets/gaia-7001/genesis.json b/cmd/gaia/testnets/gaia-7001/genesis.json deleted file mode 100644 index 48db5a4ed..000000000 --- a/cmd/gaia/testnets/gaia-7001/genesis.json +++ /dev/null @@ -1,5628 +0,0 @@ -{ - "genesis_time": "2018-07-17T07:19:26.795692941Z", - "chain_id": "gaia-7001", - "consensus_params": { - "block_size_params": { - "max_bytes": "22020096", - "max_txs": "10000", - "max_gas": "-1" - }, - "tx_size_params": { - "max_bytes": "10240", - "max_gas": "-1" - }, - "block_gossip_params": { - "block_part_size_bytes": "65536" - }, - "evidence_params": { - "max_age": "100000" - } - }, - "validators": [ - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MRCeBDANSjH6IsxO0z6tRe+xqoZvIGhdfl1t+SXGUpM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "tOEqjO2t51PEgO9Tv0B7qM0yPmy1n5tMa3Beg0tp3ns=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "S8s6fdAQNQ3bN9SNVAsHB/j8uv1CM1roxeLesL+fh4g=" - }, - "power": "100", - "name": "validatorluigi001" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2JoNf1gavJ1d6XFIumO1Mki5GVMOcg58AioHksU3maE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "k3YLQYEN2QMP6XITRsBmgb+pNGhJ5Jbg0bzUW977kK0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "EREUrXXl1OJqLQag0P4h6vJ2H+8GEwyNAjgn1XEJU+I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "heNintBalqaJwCOjLb9+mX/cQ1ytMlV7ZroPIlkwZqo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nb2oRB12DlEQkFn7KSjSVkj5rDoSTsuBFa09+gmNJ7o=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "bZSEBDNIOr0xJ/PxaAScJIyG6hqFtryBAMNwghAOTTU=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8K3clCjVU33BTIpUhdahGmu++WxHj4NUE9krCRkk++s=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RBuRRNEzA9RA1Wrdi9PPFQJ29/n/bqN9O2tQv9Gq248=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RwPRoiY5C0covekqbr3VrQwxWGHioUUIf2+TOq8LIC0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2qtEBT+Tc+SD2wJsdrVMHXrBKfvesxtmtSKDK5fXwA0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gU5mmVLUSzn/fIEMgiiB4LARRoWlqjUGHr3A4SndWO8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "xlO2cnii42KisAn8OcstC/3XV5+I0FlcSbWuyy5MVA8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "q5ezDn4DcWFPWvMayPJI35nXr//jjF8fGHsuiHjpDcU=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PSqbJOwglJb1yrj3aWebBpXb2ujXcR037s1Cyj2HoW4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A6GzeXUM3vsXaDAEYMSDgSKkqn9AoUYjs8empH46MGY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "81fx09BivOOxeGL7QisF8aKRZjjcARpiSaCOX9mJfY8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UjTvuOew2EaooduJBiYmBWeF5ai0yFJG8uio5YXpJgg=" - }, - "power": "1", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "y7p9JSVZBnRxjAI9v5Pxl37hMtyuHf6B4Ghqzm6+ii0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oG8Q5o+SN4wqMLvlIfVgQPnsQzNEKeH0D/XGM8JlGrY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PxJbo5FKA6mXtgwclRQVNIjOCQK3Q7WkLQrvM9lYbGI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Q/UShqqVDOUSNYBrR1G/1X1s+YXEVXEJzeXmYvfYIr0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "uEWWDBwFW+/BpTCvNCLW7AP98hndBukzSbrwCb7sooo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MZi48DJZOgRbE0ZStR66omv6Ez1Wkjvf2D/41q6Nd0I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Go9GXHI6SCQo2QKMxkAkgYLhfo3XrVjWLR2nE2AvYyk=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "P9RgE4RMQT/aHap2oICpwpgKeBAwxPUwuU9zIffKFNM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "1+EkFYvTDmz4WQRbK+kznRHoaZVLludtkDrMuM6h++E=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "QEMDwUVoyJT7MNfOYKa25xU+Lnsz/ciH8rFUri4diLI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "lUMCRAeu47BsOhNvCQTQJQeB68z0/VaElC9j5gDt9y8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VnAr7ZIjvUXpWmzbkt8skHp0oRNc3V89SfvgaZydwfw=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "u4GEbsk9IEF56V1am5dRtAWXz4iFQkO03FVL87BZXIM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BaaCxmYHKJ6obIzTCdRtjw1cc8d2mUJcMbLWCjf1aLo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "N3K5kDdfcKJurfaa6s2zfKgtYvz1Pagz7VWi9ZfX8yM=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "DsTbM0AgHfhSUKvOGkxudDOY3ojYT6bifhpelqHs8+s=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j9be+ddLChInrFz6/820/uYh4WZBzlp61klyJBDy/ZY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xi7nIgj4PqVXrpKLfJhcyxyVY1d3HRo72sKKPDmuU78=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2p8s/pRBZPjYWKKMlR7AOXypDzDmPo762iXlKpCwtco=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nsofE1FmSr1TiDR0gfnxfMDQ8o2pC+1NE7Oa9ceztSg=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WvmTBjsCN4ueGpEdySRwsRC5knBRLfY439/e4mG+YAY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "c0i2uKsYBv8fubnI60lZIWA1y4zw1bFgsq5MmWBHKak=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "AJR2ex094A1nJEWQsZYjALWsrSl1/huGZ37z2ZsMrpg=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "LSDd6ab46sHxwJSrg5YLpsPG2o6EcsZ3rDikpHzMNmI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dnFjFoTM9sP/RjQkXBK1YpYn3v5W+j0+g/OfUHS4xu8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "L0I4JoDfktbDWe0fCDL/nQlBPkF5mNgqamnM5JKJ1Uc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dPpZD53AbAMtW6sK+rTnXYe2GGGoSCNWsCtsmArLiIs=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VakMQSPBEuSC9Nwuv8WWhrZVUmH31bUR4+G6pJhkgE8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "KI+kCESWD9cB8se4uxRrFVAI5viyNNUXUyMCc903yQc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8Qu1LFMt7qlZNmYQWrsXUA80aIx0rrFPPXs2s6NBdU8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WRsXnLz3gf8o4lYYeCZjAXgPU1cdmOOYPdy7aY63iIA=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "R/3f7VruxWpu+2hiHlVpplTwoOou5kfQI1k/6/9H/y8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "HjSC7VkhKih6xMhudlqfaFE8ZZnP8RKJPv4iqR7RhcE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cLM/HeUFsXlnYnYod695u6NBDS0trMq8sVRdABnF7uc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Epd2FDKZwDybzT38Z7WB0y2jiLn9/2OLzmY3Zu18l6I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ENAVynNXVpj/IdYx9kCPKaPs4bWSxRIHNlmS9QiDuZQ=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j2w5BFOnZTrPN4SFpmQyfRomnUwbEbz1A+kr3z1icjo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "I2ILaY31gonxYQhlIk4PFUIN+Pk7+9dDTK1C/s+Vcb0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "3wRufybSUsTMnUeQkP74uJNDRKeM8jBLAS64T0BRfpY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2gOiMAdnIdND4cA75E7naQdyyIYDAdcjF3uO6OiEZlU=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2S8Y/vnLM3W+MYxNCxcUItIBfdZL/T4A8vRg89n0wLg=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UBTju7UZfXLVPPYb1a8gPZ69BeCv2Fho7YVo2EUbxKc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "0HqB2x6x5HzeozpHatePECw07x1UcDdSz8kQGNznnA8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "H0SIA/BU6Xj8oT5bQkvLpEITN3CqFLbMeBcQ72NZrAE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xnh8TL3BbIs9VTUenmnx6r2UAHpGCj3G9FV0mzc+mU4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "X62YB48gO2SsWGnjYxH+aGfLQcjnP+T0hnErdWZ859g=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8pfpbIxBBiu88hpxS3CeRpv7kClEjl8SwVgckDNBGlE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UuxXNPImsE5Wp+utGfJywZBHuuGE4RmL0CArc6td82w=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Sl3NKLaYEgDaovqTkKVZh2ihRFbSmyVjC63wpv3ecdc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SYjCs2AlY04xdfJGPD+gyO9NZ/zQ0Lfb/TLrjgOLS68=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oI1+4FoeI/knjsjDyCJtgZPaeyKON8tCTcM9QX0BHa8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nts1nu73aBgIdSaYye4coIuE1iBNeCuTZZC8LQ37ac8=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NQX4yKpOztKrmgBhGIC5WOALOLOq3LTpbzsN4ZLXGec=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BB4a/Xh5z+dkGCRlF+pSGC3iDOoDrFse/xzQAtmxMF4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ydjx2ea+PVuChrny6X2dluJwyXta+BsNQRsgHXp8fXw=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "pPGLc4NhNaehdoV2antWuyr0GmBVEG1NhD9NiSRrTi0=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VBVHOLnWGptY26J0wqXoZI2Dnu96pccMb08zlsaxPCQ=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "aUViYC2znC55sleHfmsIN9hZ45SbYPbDcYA0gVzglsc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "riYrMXBFLavmf4MU/Ly7emDlciVqfB2/zxJoRsBUlfY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "F2wCn9rKafNZsYZwoLGkSQIpr3rk86cjYyuhSjsjRaE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ugb3W6W7WL9Vc4KiSBWIaowBfpqJlzbfBSfrIqZW06A=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gJDxhwAE6GeGCKQeVaNZ5is7+7MFHXtOG0UsnguKdoA=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "b9RSkt+WmMxVHQExQH0IMPpnR9zDAaJwz/mv1gtyRVY=" - }, - "power": "100", - "name": "smartpesa" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "569Sb+Wpo8VFqXRi4cQhlOD9kS8uBgmJ2rntY3GLtzY=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SNwrT1B+A4g6TY7x0QzVrmVbcbl3cHXzXdD1tFHxLNo=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "K4kLogLtZxqrYSqRVJfrFm9tUG+Tc3QWXWIewnAgI9w=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "TwzOJ4GcN+ZTswub4R8488SrKeWXjY/PaqCF5neXJig=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JXW8iTiWG28E05ZFJIKvCOBwI2RrH/BOBL/MluTZ6+I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A3zUdVcpj4H+HRZmRW5xixj4dzMgqD7be9GrdXcjdns=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "7RhnD9OAZEJ4SV6V3LOZ1gGWubtX25457wCQq+AYYPI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "66j9af4xDJSblMLS+mFbp7d8TaFGu0FOo+0MwEYm2lE=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8DScmobjJQmkN44K2xiZkESM/O9MJK/DqlggnIPLpso=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "4JoJuRfaANhdM1x3AWRo1/Cj9DH3VA+fi1SynzknV+w=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cCoFsZzKZ9SQZbHe4NueVObIezP6ts0tRTZ/aN96dig=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Zp4tk/ieqplJF8xMeef9HV8bYpHSY+3hJ2sH7PfCX1I=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "jj0Y/Fy8JSJR3g+PHU6Ce0ecYwHGUVJ4bVyR7WwcyLI=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "XQDVMXja3kFk5Jb47BsqJmzcDsM4lE9+r+f/J3O5Jms=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oL/QCr7LEOivyTqpGrmwVd1r+hYI2WB5+kSVzpDMxx4=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "eeImG09hOPo1W7j7lKepN/Lx6I9GGHqVBVEKmznxACc=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Abws3eXrUFAH8LeZJIcECakPL945TTmFsBlXONOUeII=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PEg/D54SoiKZ+pic0Z0RzZa/vfYNAAf4kzSc5UKXDYk=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "omAzuJps8KX3/iOC1LjwkMPMH3c6tjfLXwCNWXRBdWw=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nctikQSpoLRl5kV6KarIS761QvEOZCWw6nvc48xWhic=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NrTRAbZnBqJpW9lRW6LxXxE7EV++y7WiIRV0ifRLovA=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "W0rP8sv4Ae/LZOqlBA9evvYARDt79WpFaI26jw/9Tfk=" - }, - "power": "100", - "name": "" - }, - { - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JdfJDlE46456GWp+AkSZhzlkUQI41f8aX7611oiWUSc=" - }, - "power": "100", - "name": "" - } - ], - "app_hash": "", - "app_state": { - "accounts": [ - { - "address": "cosmosaccaddr1c2dkaym4teqw6jl9jkq8eu8nf4wzn2lgf4ydyt", - "coins": [ - { - "denom": "faucetToken", - "amount": "10000000" - }, - { - "denom": "steak", - "amount": "10000000" - } - ] - }, - { - "address": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "coins": [ - { - "denom": "jlandrewsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "coins": [ - { - "denom": "jackToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "coins": [ - { - "denom": "luigi001Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "coins": [ - { - "denom": "irisToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "coins": [ - { - "denom": "TropicalMongoXToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "coins": [ - { - "denom": "wingmanToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "coins": [ - { - "denom": "Nemea7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "coins": [ - { - "denom": "infinite-castingToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "coins": [ - { - "denom": "cwgoesToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "coins": [ - { - "denom": "lunamintToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "coins": [ - { - "denom": "skoed-validator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "coins": [ - { - "denom": "starfishToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "coins": [ - { - "denom": "jjangg96Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "coins": [ - { - "denom": "iaspirationiToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "coins": [ - { - "denom": "21e800Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "coins": [ - { - "denom": "spptest1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "coins": [ - { - "denom": "windmillToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "coins": [ - { - "denom": "pbostrom/Mythos-1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "coins": [ - { - "denom": "BarytToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "coins": [ - { - "denom": "P2P.ORG ValidatorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "coins": [ - { - "denom": "oleary-labsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "coins": [ - { - "denom": "wancloudsentryToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "coins": [ - { - "denom": "space4Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "coins": [ - { - "denom": "colony-finderToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "coins": [ - { - "denom": "sparkpool-validator-02Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "coins": [ - { - "denom": "mining-shipToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "coins": [ - { - "denom": "StakedToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "coins": [ - { - "denom": "nyliraToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "coins": [ - { - "denom": "liangpingToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "coins": [ - { - "denom": "SVNode01Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "coins": [ - { - "denom": "vhxnode1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "coins": [ - { - "denom": "gregToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "coins": [ - { - "denom": "bucksterToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "coins": [ - { - "denom": "grass-fedToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "coins": [ - { - "denom": "ATEAM1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "coins": [ - { - "denom": "BFF-Validator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "coins": [ - { - "denom": "redbricks7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "coins": [ - { - "denom": "kittyfishToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "coins": [ - { - "denom": "ForboleToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "coins": [ - { - "denom": "coinoneToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "coins": [ - { - "denom": "bmen-companyToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "coins": [ - { - "denom": "2400bpsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "coins": [ - { - "denom": "devToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "coins": [ - { - "denom": "w1m3lToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "coins": [ - { - "denom": "aetherToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "coins": [ - { - "denom": "JColToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "coins": [ - { - "denom": "SaiKrishnaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "coins": [ - { - "denom": "UmbrellaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "coins": [ - { - "denom": "@MarceldeveloperToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "coins": [ - { - "denom": "stereo-watcherToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "coins": [ - { - "denom": "cosmosToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "coins": [ - { - "denom": "stake.zoneToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "coins": [ - { - "denom": "firstblock.ioToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "coins": [ - { - "denom": "shensiToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "coins": [ - { - "denom": "figmentToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "coins": [ - { - "denom": "iqlusionToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "coins": [ - { - "denom": "cosmosthecatToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "coins": [ - { - "denom": "snaticoToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "coins": [ - { - "denom": "mpaxeNodeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "coins": [ - { - "denom": "joltz-secureware.ioToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "coins": [ - { - "denom": "mwnode1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "coins": [ - { - "denom": "VNode01Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "coins": [ - { - "denom": "7768Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "coins": [ - { - "denom": "block3.communityToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "coins": [ - { - "denom": "4455Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "coins": [ - { - "denom": "dooroomeeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "coins": [ - { - "denom": "sheiudToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "coins": [ - { - "denom": "Staking Facilities ValidatorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "coins": [ - { - "denom": "ritter-rammToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "coins": [ - { - "denom": "meteor-discoverToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "coins": [ - { - "denom": "COSMODROMEToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "coins": [ - { - "denom": "broadleaf7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "coins": [ - { - "denom": "ravenclubToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "coins": [ - { - "denom": "dokia-capitalToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "coins": [ - { - "denom": "chainflow08Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "coins": [ - { - "denom": "MiaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "coins": [ - { - "denom": "sikka.techToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "coins": [ - { - "denom": "certus.oneToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "coins": [ - { - "denom": "Gold2Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "coins": [ - { - "denom": "idoor7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "coins": [ - { - "denom": "ironforkToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "coins": [ - { - "denom": "sunny-mintorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "coins": [ - { - "denom": "BlissDynamicsToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "coins": [ - { - "denom": "smartpesaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "coins": [ - { - "denom": "ianstreamToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "coins": [ - { - "denom": "TruNodeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "coins": [ - { - "denom": "abcinToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "coins": [ - { - "denom": "kochacolajToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "coins": [ - { - "denom": "D2R-validator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "coins": [ - { - "denom": "juelianshanaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "coins": [ - { - "denom": "lambda-mixerToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "coins": [ - { - "denom": "bkcmToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "coins": [ - { - "denom": "ramihanToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "coins": [ - { - "denom": "davinchcodeToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "coins": [ - { - "denom": "DoriToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "coins": [ - { - "denom": "daefreecaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "coins": [ - { - "denom": "nuevaxToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "coins": [ - { - "denom": "inschain_validatorToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "coins": [ - { - "denom": "gruberxToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "coins": [ - { - "denom": "meleatrustToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "coins": [ - { - "denom": "Cosmodator-7000Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "coins": [ - { - "denom": "bharvestToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "coins": [ - { - "denom": "cryptiumToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "coins": [ - { - "denom": "finalityToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "coins": [ - { - "denom": "coscloudToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "coins": [ - { - "denom": "xiaochinaToken", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - }, - { - "address": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "coins": [ - { - "denom": "gazua1Token", - "amount": "1000" - }, - { - "denom": "steak", - "amount": "50" - } - ] - } - ], - "stake": { - "pool": { - "loose_tokens": "16050", - "bonded_tokens": "0", - "inflation_last_time": "0", - "inflation": "7/100", - "date_last_commission_reset": "0", - "prev_bonded_shares": "0" - }, - "params": { - "inflation_rate_change": "13/100", - "inflation_max": "1/5", - "inflation_min": "7/100", - "goal_bonded": "67/100", - "unbonding_time": "86400", - "max_validators": 128, - "bond_denom": "steak" - }, - "validators": [ - { - "owner": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MRCeBDANSjH6IsxO0z6tRe+xqoZvIGhdfl1t+SXGUpM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "jlandrews", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "tOEqjO2t51PEgO9Tv0B7qM0yPmy1n5tMa3Beg0tp3ns=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "jack", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "S8s6fdAQNQ3bN9SNVAsHB/j8uv1CM1roxeLesL+fh4g=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "luigi001", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2JoNf1gavJ1d6XFIumO1Mki5GVMOcg58AioHksU3maE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "iris", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "k3YLQYEN2QMP6XITRsBmgb+pNGhJ5Jbg0bzUW977kK0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "TropicalMongoX", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "EREUrXXl1OJqLQag0P4h6vJ2H+8GEwyNAjgn1XEJU+I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "wingman", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "heNintBalqaJwCOjLb9+mX/cQ1ytMlV7ZroPIlkwZqo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Nemea7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nb2oRB12DlEQkFn7KSjSVkj5rDoSTsuBFa09+gmNJ7o=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "infinite-casting", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "bZSEBDNIOr0xJ/PxaAScJIyG6hqFtryBAMNwghAOTTU=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "cwgoes", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8K3clCjVU33BTIpUhdahGmu++WxHj4NUE9krCRkk++s=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "lunamint", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RBuRRNEzA9RA1Wrdi9PPFQJ29/n/bqN9O2tQv9Gq248=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "skoed-validator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "RwPRoiY5C0covekqbr3VrQwxWGHioUUIf2+TOq8LIC0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "starfish", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2qtEBT+Tc+SD2wJsdrVMHXrBKfvesxtmtSKDK5fXwA0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "jjangg96", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gU5mmVLUSzn/fIEMgiiB4LARRoWlqjUGHr3A4SndWO8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "iaspirationi", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "xlO2cnii42KisAn8OcstC/3XV5+I0FlcSbWuyy5MVA8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "21e800", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "q5ezDn4DcWFPWvMayPJI35nXr//jjF8fGHsuiHjpDcU=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "spptest1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PSqbJOwglJb1yrj3aWebBpXb2ujXcR037s1Cyj2HoW4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "windmill", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A6GzeXUM3vsXaDAEYMSDgSKkqn9AoUYjs8empH46MGY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "pbostrom/Mythos-1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "81fx09BivOOxeGL7QisF8aKRZjjcARpiSaCOX9mJfY8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Baryt", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UjTvuOew2EaooduJBiYmBWeF5ai0yFJG8uio5YXpJgg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "P2P.ORG Validator", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "y7p9JSVZBnRxjAI9v5Pxl37hMtyuHf6B4Ghqzm6+ii0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "oleary-labs", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oG8Q5o+SN4wqMLvlIfVgQPnsQzNEKeH0D/XGM8JlGrY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "wancloudsentry", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PxJbo5FKA6mXtgwclRQVNIjOCQK3Q7WkLQrvM9lYbGI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "space4", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Q/UShqqVDOUSNYBrR1G/1X1s+YXEVXEJzeXmYvfYIr0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "colony-finder", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "uEWWDBwFW+/BpTCvNCLW7AP98hndBukzSbrwCb7sooo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sparkpool-validator-02", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "MZi48DJZOgRbE0ZStR66omv6Ez1Wkjvf2D/41q6Nd0I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "mining-ship", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Go9GXHI6SCQo2QKMxkAkgYLhfo3XrVjWLR2nE2AvYyk=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Staked", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "P9RgE4RMQT/aHap2oICpwpgKeBAwxPUwuU9zIffKFNM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "nylira", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "1+EkFYvTDmz4WQRbK+kznRHoaZVLludtkDrMuM6h++E=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "liangping", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "QEMDwUVoyJT7MNfOYKa25xU+Lnsz/ciH8rFUri4diLI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "SVNode01", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "lUMCRAeu47BsOhNvCQTQJQeB68z0/VaElC9j5gDt9y8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "vhxnode1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VnAr7ZIjvUXpWmzbkt8skHp0oRNc3V89SfvgaZydwfw=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "greg", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "u4GEbsk9IEF56V1am5dRtAWXz4iFQkO03FVL87BZXIM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "buckster", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BaaCxmYHKJ6obIzTCdRtjw1cc8d2mUJcMbLWCjf1aLo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "grass-fed", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "N3K5kDdfcKJurfaa6s2zfKgtYvz1Pagz7VWi9ZfX8yM=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ATEAM1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "DsTbM0AgHfhSUKvOGkxudDOY3ojYT6bifhpelqHs8+s=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "BFF-Validator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j9be+ddLChInrFz6/820/uYh4WZBzlp61klyJBDy/ZY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "redbricks7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xi7nIgj4PqVXrpKLfJhcyxyVY1d3HRo72sKKPDmuU78=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "kittyfish", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2p8s/pRBZPjYWKKMlR7AOXypDzDmPo762iXlKpCwtco=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Forbole", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nsofE1FmSr1TiDR0gfnxfMDQ8o2pC+1NE7Oa9ceztSg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "coinone", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WvmTBjsCN4ueGpEdySRwsRC5knBRLfY439/e4mG+YAY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "bmen-company", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "c0i2uKsYBv8fubnI60lZIWA1y4zw1bFgsq5MmWBHKak=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "2400bps", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "AJR2ex094A1nJEWQsZYjALWsrSl1/huGZ37z2ZsMrpg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "dev", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "LSDd6ab46sHxwJSrg5YLpsPG2o6EcsZ3rDikpHzMNmI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "w1m3l", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dnFjFoTM9sP/RjQkXBK1YpYn3v5W+j0+g/OfUHS4xu8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "aether", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "L0I4JoDfktbDWe0fCDL/nQlBPkF5mNgqamnM5JKJ1Uc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "JCol", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "dPpZD53AbAMtW6sK+rTnXYe2GGGoSCNWsCtsmArLiIs=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "SaiKrishna", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VakMQSPBEuSC9Nwuv8WWhrZVUmH31bUR4+G6pJhkgE8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Umbrella", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "KI+kCESWD9cB8se4uxRrFVAI5viyNNUXUyMCc903yQc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "@Marceldeveloper", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8Qu1LFMt7qlZNmYQWrsXUA80aIx0rrFPPXs2s6NBdU8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "stereo-watcher", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "WRsXnLz3gf8o4lYYeCZjAXgPU1cdmOOYPdy7aY63iIA=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "cosmos", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "R/3f7VruxWpu+2hiHlVpplTwoOou5kfQI1k/6/9H/y8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "stake.zone", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "HjSC7VkhKih6xMhudlqfaFE8ZZnP8RKJPv4iqR7RhcE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "firstblock.io", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cLM/HeUFsXlnYnYod695u6NBDS0trMq8sVRdABnF7uc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "shensi", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Epd2FDKZwDybzT38Z7WB0y2jiLn9/2OLzmY3Zu18l6I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "figment", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ENAVynNXVpj/IdYx9kCPKaPs4bWSxRIHNlmS9QiDuZQ=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "iqlusion", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "j2w5BFOnZTrPN4SFpmQyfRomnUwbEbz1A+kr3z1icjo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "cosmosthecat", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "I2ILaY31gonxYQhlIk4PFUIN+Pk7+9dDTK1C/s+Vcb0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "snatico", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "3wRufybSUsTMnUeQkP74uJNDRKeM8jBLAS64T0BRfpY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "mpaxeNode", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2gOiMAdnIdND4cA75E7naQdyyIYDAdcjF3uO6OiEZlU=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "joltz-secureware.io", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "2S8Y/vnLM3W+MYxNCxcUItIBfdZL/T4A8vRg89n0wLg=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "mwnode1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "kol7Gj60Fct4X8T1rHLJQ0z/b14UqqSae8h1e37rLL8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "VNode01", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UBTju7UZfXLVPPYb1a8gPZ69BeCv2Fho7YVo2EUbxKc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "7768", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "0HqB2x6x5HzeozpHatePECw07x1UcDdSz8kQGNznnA8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "block3.community", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "H0SIA/BU6Xj8oT5bQkvLpEITN3CqFLbMeBcQ72NZrAE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "4455", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Xnh8TL3BbIs9VTUenmnx6r2UAHpGCj3G9FV0mzc+mU4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "dooroomee", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "X62YB48gO2SsWGnjYxH+aGfLQcjnP+T0hnErdWZ859g=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sheiud", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8pfpbIxBBiu88hpxS3CeRpv7kClEjl8SwVgckDNBGlE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Staking Facilities Validator", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "UuxXNPImsE5Wp+utGfJywZBHuuGE4RmL0CArc6td82w=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ritter-ramm", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Sl3NKLaYEgDaovqTkKVZh2ihRFbSmyVjC63wpv3ecdc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "meteor-discover", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SYjCs2AlY04xdfJGPD+gyO9NZ/zQ0Lfb/TLrjgOLS68=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "COSMODROME", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oI1+4FoeI/knjsjDyCJtgZPaeyKON8tCTcM9QX0BHa8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "broadleaf7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nts1nu73aBgIdSaYye4coIuE1iBNeCuTZZC8LQ37ac8=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ravenclub", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NQX4yKpOztKrmgBhGIC5WOALOLOq3LTpbzsN4ZLXGec=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "dokia-capital", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "BB4a/Xh5z+dkGCRlF+pSGC3iDOoDrFse/xzQAtmxMF4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "chainflow08", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ydjx2ea+PVuChrny6X2dluJwyXta+BsNQRsgHXp8fXw=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Mia", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "pPGLc4NhNaehdoV2antWuyr0GmBVEG1NhD9NiSRrTi0=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sikka.tech", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "VBVHOLnWGptY26J0wqXoZI2Dnu96pccMb08zlsaxPCQ=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "certus.one", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "aUViYC2znC55sleHfmsIN9hZ45SbYPbDcYA0gVzglsc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Gold2", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "riYrMXBFLavmf4MU/Ly7emDlciVqfB2/zxJoRsBUlfY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "idoor7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "F2wCn9rKafNZsYZwoLGkSQIpr3rk86cjYyuhSjsjRaE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ironfork", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "ugb3W6W7WL9Vc4KiSBWIaowBfpqJlzbfBSfrIqZW06A=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "sunny-mintor", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "gJDxhwAE6GeGCKQeVaNZ5is7+7MFHXtOG0UsnguKdoA=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "BlissDynamics", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "b9RSkt+WmMxVHQExQH0IMPpnR9zDAaJwz/mv1gtyRVY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "smartpesa", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "569Sb+Wpo8VFqXRi4cQhlOD9kS8uBgmJ2rntY3GLtzY=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ianstream", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "SNwrT1B+A4g6TY7x0QzVrmVbcbl3cHXzXdD1tFHxLNo=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "TruNode", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "K4kLogLtZxqrYSqRVJfrFm9tUG+Tc3QWXWIewnAgI9w=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "abcin", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "TwzOJ4GcN+ZTswub4R8488SrKeWXjY/PaqCF5neXJig=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "kochacolaj", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JXW8iTiWG28E05ZFJIKvCOBwI2RrH/BOBL/MluTZ6+I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "D2R-validator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "A3zUdVcpj4H+HRZmRW5xixj4dzMgqD7be9GrdXcjdns=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "juelianshana", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "7RhnD9OAZEJ4SV6V3LOZ1gGWubtX25457wCQq+AYYPI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "lambda-mixer", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "66j9af4xDJSblMLS+mFbp7d8TaFGu0FOo+0MwEYm2lE=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "bkcm", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "8DScmobjJQmkN44K2xiZkESM/O9MJK/DqlggnIPLpso=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "ramihan", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "4JoJuRfaANhdM1x3AWRo1/Cj9DH3VA+fi1SynzknV+w=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "davinchcode", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "cCoFsZzKZ9SQZbHe4NueVObIezP6ts0tRTZ/aN96dig=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Dori", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Zp4tk/ieqplJF8xMeef9HV8bYpHSY+3hJ2sH7PfCX1I=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "daefreeca", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "jj0Y/Fy8JSJR3g+PHU6Ce0ecYwHGUVJ4bVyR7WwcyLI=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "nuevax", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "XQDVMXja3kFk5Jb47BsqJmzcDsM4lE9+r+f/J3O5Jms=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "inschain_validator", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "oL/QCr7LEOivyTqpGrmwVd1r+hYI2WB5+kSVzpDMxx4=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "gruberx", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "eeImG09hOPo1W7j7lKepN/Lx6I9GGHqVBVEKmznxACc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "meleatrust", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "Abws3eXrUFAH8LeZJIcECakPL945TTmFsBlXONOUeII=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Cosmodator-7000", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "PEg/D54SoiKZ+pic0Z0RzZa/vfYNAAf4kzSc5UKXDYk=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "bharvest", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "omAzuJps8KX3/iOC1LjwkMPMH3c6tjfLXwCNWXRBdWw=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "Adrian Brink - Cryptium Labs", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "nctikQSpoLRl5kV6KarIS761QvEOZCWw6nvc48xWhic=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "finality", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "NrTRAbZnBqJpW9lRW6LxXxE7EV++y7WiIRV0ifRLovA=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "coscloud", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "W0rP8sv4Ae/LZOqlBA9evvYARDt79WpFaI26jw/9Tfk=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "xiaochina", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - }, - { - "owner": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "pub_key": { - "type": "tendermint/PubKeyEd25519", - "value": "JdfJDlE46456GWp+AkSZhzlkUQI41f8aX7611oiWUSc=" - }, - "revoked": false, - "status": 0, - "tokens": "100", - "delegator_shares": "100", - "description": { - "moniker": "gazua1", - "identity": "", - "website": "", - "details": "" - }, - "bond_height": "0", - "bond_intra_tx_counter": 0, - "proposer_reward_pool": [], - "commission": "0", - "commission_max": "0", - "commission_change_rate": "0", - "commission_change_today": "0", - "prev_bonded_tokens": "0" - } - ], - "bonds": [ - { - "delegator_addr": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "validator_addr": "cosmosaccaddr157mg9hnhchfrqvk3enrvmvj29yhmlwf759xrgw", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "validator_addr": "cosmosaccaddr193vn0gk3nsmjkxwz78gce8e8mkmagmvulpg5jt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "validator_addr": "cosmosaccaddr16rcrnftjyl2mctz78825ng8tx5ss22jf6jcp9l", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "validator_addr": "cosmosaccaddr1shuqhpl273t96yg6nnqvyfeewj3ew3mdcwvcnu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "validator_addr": "cosmosaccaddr1syhzpjwx6vv3erv2myq7txrjhrp95hrhgcl242", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "validator_addr": "cosmosaccaddr1uga4nuresex5u8ajjh2pcr39l0s9hszdkp843j", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "validator_addr": "cosmosaccaddr12wnqvqg79s9jqrul0lva3h72rfmewm7jprrcp5", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "validator_addr": "cosmosaccaddr1lq0mvtgnwe8mp0096un0v8ztcsj8ad92t2cwrq", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "validator_addr": "cosmosaccaddr14e774gfzt5l9ka766ehfgu6n5hgy9f3sehzyv8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "validator_addr": "cosmosaccaddr164jntjfk9zs8x29mc27qansfwvjqs60gj6ermu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "validator_addr": "cosmosaccaddr1qkc3tghc3fms7eye7vtu0g0370epr4jkje2ne7", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "validator_addr": "cosmosaccaddr18m09d56pg5p2660de4sjfezpd8ud6jfghndfnt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "validator_addr": "cosmosaccaddr1k9pqxd8fxqlk52uwfxnlsexqj6xnmw5swhss45", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "validator_addr": "cosmosaccaddr13q937pwglh24knwa2v23ml0kkpl9vwzjmfmj3q", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "validator_addr": "cosmosaccaddr1xvt4e7xd0j9dwv2w83g50tpcltsl90h5dfnz6h", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "validator_addr": "cosmosaccaddr1nnyel6v0kx8zmfh9edmre3ua4dt9306cfxsxgd", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "validator_addr": "cosmosaccaddr13cds7hwqyq9ja2hsv4sg7glq9arlk43gcl3cek", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "validator_addr": "cosmosaccaddr1y2z20pwqu5qpclque3pqkguruvheum2djtzjw3", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "validator_addr": "cosmosaccaddr1anuuffusmq5ng3rhlndhnacy45et30jqygtn67", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "validator_addr": "cosmosaccaddr1wk0t6na230vxhf6ddresw2c40k5y3ayrww0s2m", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "validator_addr": "cosmosaccaddr12pn4p6r5wjpsep9kn655ng7fh59yez7t0rahru", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "validator_addr": "cosmosaccaddr15rrxdflhq4744qt9m5ysstq3zpykhacf908eez", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "validator_addr": "cosmosaccaddr17rqsh3fw6rehnwzarz90jkqtt5fupmh50gy556", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "validator_addr": "cosmosaccaddr1g4q87u438qdh2c8ue4dzdr9ldrqrs77ptm9c70", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "validator_addr": "cosmosaccaddr1dq7jt3pn7mrce2twac907jue7hjd0p0rgt3qnq", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "validator_addr": "cosmosaccaddr1gg6natrtt5lf02xwr06ujcczvavl54wgljuaut", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "validator_addr": "cosmosaccaddr1zds6r7jyxyxcpf05r5yyyy3u8q2rvj9kkc6vcv", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "validator_addr": "cosmosaccaddr1l0qw5znfd6e8pshpjvyghjjzyr4l6ymla080lt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "validator_addr": "cosmosaccaddr1rxxcpkmsngd0azkh3n2467m66ls4rwq52yuv27", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "validator_addr": "cosmosaccaddr1jsch8k385shvse6j5dfx20483qym5uhq76xpjf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "validator_addr": "cosmosaccaddr19uhnhct0p45ek6qxp3cjjrjtz4pacwcsgzvpuj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "validator_addr": "cosmosaccaddr1gghhdtx2sceafvgg8dry5sqrvc8srxghm4qqsy", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "validator_addr": "cosmosaccaddr1cyayv35tv47t829mel6jm0vqzmrdhf3jq87tqg", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "validator_addr": "cosmosaccaddr126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "validator_addr": "cosmosaccaddr1fskmzyt2hr8usr3s65dq3rfur3fy6g2hjp23tm", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "validator_addr": "cosmosaccaddr1lhjta6nt0lewj05m8444tuyhalkrffgpm7njpp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "validator_addr": "cosmosaccaddr1pm0gx3lk46gf8vyj5my9w5tk06cuq66ll77ugj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "validator_addr": "cosmosaccaddr15w2rengajq9js8hu57kjw88dly5vy7gsqedn0n", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "validator_addr": "cosmosaccaddr10505nl7yftsme9jk2glhjhta7w0475uva87paj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "validator_addr": "cosmosaccaddr18z3pnjgdtt337z8g5drfts7r3fm6n9a0896h0r", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "validator_addr": "cosmosaccaddr1vmdgku2g0n5p2ef995r4fugu99ze9e5me9kh4d", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "validator_addr": "cosmosaccaddr1j2frwt2vq2xer7f060wpsu3y3f63uys2w9lx2e", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "validator_addr": "cosmosaccaddr1whxd48da3r56n8eecym8zg0c6xmf35fn2myart", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "validator_addr": "cosmosaccaddr1jkmn6asju47zuuzrf8rjt7sllaj5cx4kueyv8p", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "validator_addr": "cosmosaccaddr120skmenn2a0ra8y6zassrxvnfc5rlme8rqarvs", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "validator_addr": "cosmosaccaddr1jtt6al0acr8h0uvq489rt9zx9lnau7rlcu30pt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "validator_addr": "cosmosaccaddr135dz5hdtvk3z8vl0zyy5l223kjanv0gudu4905", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "validator_addr": "cosmosaccaddr182ujqw3r8p5fffjqkf0rxzj29pg5q96nxd2khq", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "validator_addr": "cosmosaccaddr1qrc3ed8tnz6vc24ftmnht8efs5ufhjmrjkds4x", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "validator_addr": "cosmosaccaddr1swydkj5u3jd4jwe7uygu4479zgs4qg6v4ds3c9", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "validator_addr": "cosmosaccaddr1l9jt8xgejkcm4sulhwj8c83ftprz5p9lyq4605", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "validator_addr": "cosmosaccaddr128ty3kzhcepjacu4q0xjgq60qa3zz8na3jl793", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "validator_addr": "cosmosaccaddr1e3qm8jd9357zhdemwnaafmf0wy3f4yqmd307c2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "validator_addr": "cosmosaccaddr18wfz5vj26y079surms5sm6avjtezzspfvqs6g4", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "validator_addr": "cosmosaccaddr1vrc7zpg5teawwuzkfh6t7c6sy353sukhlarxpa", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "validator_addr": "cosmosaccaddr1umaajfgap5ef6yxvk5706kwk8j08l7wh6h9fp2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "validator_addr": "cosmosaccaddr1670l5up6e5fddvlc027yvvlvedrzyx0mmsl622", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "validator_addr": "cosmosaccaddr1wx33m9dvglryga0saey0pr99ja0klhcfrwaw7l", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "validator_addr": "cosmosaccaddr15u9ve7fz8fqaf7r2u3p4f9ru4ze47pau5cxgcg", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "validator_addr": "cosmosaccaddr1h4q0xkdg30cl9vw0u8ejm0rs337dszy98gnd4a", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "validator_addr": "cosmosaccaddr12zpkulxv7kn59sgf0tpf24qhqzxsvf3gamkl7g", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "validator_addr": "cosmosaccaddr1g6sc5t9t68vmcj3alk7dfqr54tvastpxac28k6", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "validator_addr": "cosmosaccaddr1jck6gp4mqy33sk6a0fr5c8maq53hf4245v3mgg", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "validator_addr": "cosmosaccaddr1jh3grawl62juvx5p8fz5xsy9hpw8w3mngqafe4", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "validator_addr": "cosmosaccaddr17nlusdvrk34fq65jemy3umfjfwaxfzv4asyl60", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "validator_addr": "cosmosaccaddr18u2sqnuetfnkugp59e9pgyv2dpuvkkxmmsc7m8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "validator_addr": "cosmosaccaddr1xdp4pls4ryvchq2n8v0cpmtwsprvyh8wvg563q", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "validator_addr": "cosmosaccaddr1pmntq5en2rgtr5rzr4e304efrve4lr43z32y5s", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "validator_addr": "cosmosaccaddr197p65z7ge5g55r68thvw4l5e43gnm70jhu5g75", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "validator_addr": "cosmosaccaddr15klp8pypkd8htppzt6pguej57yyvp5p442khcu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "validator_addr": "cosmosaccaddr1jsvgewy7h62v3q43m0l347wlcwyhd4un5q8aa3", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "validator_addr": "cosmosaccaddr192yhf7f7f9304cy6cu6np3r8a3m9yqzqfeu9je", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "validator_addr": "cosmosaccaddr1pag7xgpl8njlaksvp2ur5un3htg85vcrxcp5rs", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "validator_addr": "cosmosaccaddr1p56gv748xfd74qek5e637vhcr6tyjd9ukqfecc", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "validator_addr": "cosmosaccaddr1kwftgznylzerft2ksgkzvvfn5rfpy4nk2ye8na", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "validator_addr": "cosmosaccaddr1rj74vaqm0xkxl5cjjam63mayh4x6at3m379ulv", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "validator_addr": "cosmosaccaddr1zpx36km7tk5cksyzxgvcp6g552p3uhwx84r53q", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "validator_addr": "cosmosaccaddr1gq0qecxs8xdaarrqxxazwavwxm7qz5jzs5anvt", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "validator_addr": "cosmosaccaddr1cypmdvszcd9kd3jenmqxd03cpceql8rtuvxftp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "validator_addr": "cosmosaccaddr1klslzz2n2nqvdaa6gwflwpka7gc60vvmh3k450", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "validator_addr": "cosmosaccaddr1qkllv8f6qakkw3hk9dqvytys090lk6twsyv8vf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "validator_addr": "cosmosaccaddr1wf9nug554ugpw4t0wnlppxc6crl2n02qr8v3cd", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "validator_addr": "cosmosaccaddr1t3afuz2kt99jz4pe5k4vjvkdmldn2x0lqzv83w", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "validator_addr": "cosmosaccaddr14zfph0h8rexsca6gg6jkwqup3sgl6mwj6eu4e6", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "validator_addr": "cosmosaccaddr1998p0xkdwvul952ydavnx88tmwkhlfa0vhrngj", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "validator_addr": "cosmosaccaddr1jw554408yw2h438q200jyuqgln76xh4ax0q4s0", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "validator_addr": "cosmosaccaddr1mwmcpq5nhaen8zyy86mrrept2gmp0z5peapkhu", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "validator_addr": "cosmosaccaddr1emaa7mwgpnpmc7yptm728ytp9quamsvu9rk4hp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "validator_addr": "cosmosaccaddr1tq0zwzyc88l2enrlhtzw0he8rm24xfd5s9aeer", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "validator_addr": "cosmosaccaddr1n9qsfp3x09rhhxptzrgmdlucqhg2ce95fm3fw8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "validator_addr": "cosmosaccaddr1sqec04r28jfevkzfkdj4ql2qzr2zwrmg78qzj8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "validator_addr": "cosmosaccaddr1hfygmryre7r8m9pfqmc85y7kw7ejphmp59k2x8", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "validator_addr": "cosmosaccaddr1jvh448tvk368k4md83ys7auledclek0vfpckz2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "validator_addr": "cosmosaccaddr1fhfcs5npydv8s96wrk9p5ychctslu92t4n5qd4", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "validator_addr": "cosmosaccaddr1eg88jsn38mrael6cqu7d2u8j6dynya7fv2p2tl", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "validator_addr": "cosmosaccaddr1ukcuqpqw3eq505wkqd2adgn8ugewxr6jtakngs", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "validator_addr": "cosmosaccaddr1na3wr7ujdp3qdej6l5y0k4znzrkaz77t2yjaqf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "validator_addr": "cosmosaccaddr1xupfqk73y7rmc6qdgv7rtjy8wsngvt2g2t59t3", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "validator_addr": "cosmosaccaddr17gvlvfpsfl6hffn5u2hahk22un4ynpykc44tat", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "validator_addr": "cosmosaccaddr1yfseqtj5sjhzz2q2ym09jym4h4nc4yevae0jp2", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "validator_addr": "cosmosaccaddr1yd0rklq45zg89fywr89ccutlcwp9kehhh0z03k", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "validator_addr": "cosmosaccaddr1arlpxs2ftf5hgetqxxkvd7mqdc28mmaqclyv4y", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "validator_addr": "cosmosaccaddr12ceualfg92x7du73mtcv0zya4nxvq3tl2m52uz", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "validator_addr": "cosmosaccaddr1wxf0ck9h2e8p2wmecxtep6cefhexsp4kzc8fxy", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "validator_addr": "cosmosaccaddr1pzlud6lg8w9phcwetc5aqp24eflshtv4xlxthf", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "validator_addr": "cosmosaccaddr10qp8kqwm2cuql0hw2az5mngpmw5xm9ee32exlp", - "shares": "100", - "height": "0" - }, - { - "delegator_addr": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "validator_addr": "cosmosaccaddr14dwnmm6n7tjdpeylpwsdsatdl0umm75dfkqcpa", - "shares": "100", - "height": "0" - } - ] - } - } -} \ No newline at end of file diff --git a/crypto/encode_test.go b/crypto/encode_test.go index a2b5b1aea..9e7097855 100644 --- a/crypto/encode_test.go +++ b/crypto/encode_test.go @@ -15,12 +15,14 @@ type byter interface { Bytes() []byte } -func checkAminoBinary(t *testing.T, src byter, dst interface{}, size int) { +func checkAminoBinary(t *testing.T, src, dst interface{}, size int) { // Marshal to binary bytes. bz, err := cdc.MarshalBinaryBare(src) require.Nil(t, err, "%+v", err) - // Make sure this is compatible with current (Bytes()) encoding. - require.Equal(t, src.Bytes(), bz, "Amino binary vs Bytes() mismatch") + if byterSrc, ok := src.(byter); ok { + // Make sure this is compatible with current (Bytes()) encoding. + require.Equal(t, byterSrc.Bytes(), bz, "Amino binary vs Bytes() mismatch") + } // Make sure we have the expected length. if size != -1 { require.Equal(t, size, len(bz), "Amino binary size mismatch") @@ -55,8 +57,6 @@ func ExamplePrintRegisteredTypes() { //| PubKeySecp256k1 | tendermint/PubKeySecp256k1 | 0xEB5AE987 | 0x21 | | //| PrivKeyEd25519 | tendermint/PrivKeyEd25519 | 0xA3288910 | 0x40 | | //| PrivKeySecp256k1 | tendermint/PrivKeySecp256k1 | 0xE1B0F79B | 0x20 | | - //| SignatureEd25519 | tendermint/SignatureEd25519 | 0x2031EA53 | 0x40 | | - //| SignatureSecp256k1 | tendermint/SignatureSecp256k1 | 0x7FC4A495 | variable | | } func TestKeyEncodings(t *testing.T) { @@ -86,13 +86,11 @@ func TestKeyEncodings(t *testing.T) { require.EqualValues(t, tc.privKey, priv3) // Check (de/en)codings of Signatures. - var sig1, sig2, sig3 tcrypto.Signature + var sig1, sig2 []byte sig1, err := tc.privKey.Sign([]byte("something")) require.NoError(t, err) checkAminoBinary(t, sig1, &sig2, -1) // Signature size changes for Secp anyways. require.EqualValues(t, sig1, sig2) - checkAminoJSON(t, sig1, &sig3, false) // TODO also check Prefix bytes. - require.EqualValues(t, sig1, sig3) // Check (de/en)codings of PubKeys. pubKey := tc.privKey.PubKey() @@ -107,7 +105,7 @@ func TestKeyEncodings(t *testing.T) { func TestNilEncodings(t *testing.T) { // Check nil Signature. - var a, b tcrypto.Signature + var a, b []byte checkAminoJSON(t, &a, &b, true) require.EqualValues(t, a, b) diff --git a/crypto/keys/keybase.go b/crypto/keys/keybase.go index aa1c0cdeb..ae036362e 100644 --- a/crypto/keys/keybase.go +++ b/crypto/keys/keybase.go @@ -199,7 +199,7 @@ func (kb dbKeybase) Get(name string) (Info, error) { // Sign signs the msg with the named key. // It returns an error if the key doesn't exist or the decryption fails. -func (kb dbKeybase) Sign(name, passphrase string, msg []byte) (sig tmcrypto.Signature, pub tmcrypto.PubKey, err error) { +func (kb dbKeybase) Sign(name, passphrase string, msg []byte) (sig []byte, pub tmcrypto.PubKey, err error) { info, err := kb.Get(name) if err != nil { return diff --git a/crypto/keys/keybase_test.go b/crypto/keys/keybase_test.go index 7053896c6..652a36bcb 100644 --- a/crypto/keys/keybase_test.go +++ b/crypto/keys/keybase_test.go @@ -13,6 +13,10 @@ import ( dbm "github.com/tendermint/tendermint/libs/db" ) +func init() { + BcryptSecurityParameter = 1 +} + // TestKeyManagement makes sure we can manipulate these keys well func TestKeyManagement(t *testing.T) { // make the storage with reasonable defaults @@ -142,7 +146,7 @@ func TestSignVerify(t *testing.T) { cases := []struct { key crypto.PubKey data []byte - sig crypto.Signature + sig []byte valid bool }{ // proper matches diff --git a/crypto/keys/types.go b/crypto/keys/types.go index c3f5d7834..a68626489 100644 --- a/crypto/keys/types.go +++ b/crypto/keys/types.go @@ -16,7 +16,7 @@ type Keybase interface { Delete(name, passphrase string) error // Sign some bytes, looking up the private key to use - Sign(name, passphrase string, msg []byte) (crypto.Signature, crypto.PubKey, error) + Sign(name, passphrase string, msg []byte) ([]byte, crypto.PubKey, error) // CreateMnemonic creates a new mnemonic, and derives a hierarchical deterministic // key from that. @@ -44,10 +44,31 @@ type Keybase interface { ExportPrivateKeyObject(name string, passphrase string) (crypto.PrivKey, error) } +// KeyType reflects a human-readable type for key listing. +type KeyType uint + +// Info KeyTypes +const ( + TypeLocal KeyType = 0 + TypeLedger KeyType = 1 + TypeOffline KeyType = 2 +) + +var keyTypes = map[KeyType]string{ + TypeLocal: "local", + TypeLedger: "ledger", + TypeOffline: "offline", +} + +// String implements the stringer interface for KeyType. +func (kt KeyType) String() string { + return keyTypes[kt] +} + // Info is the publicly exposed information about a keypair type Info interface { // Human-readable type for key listing - GetType() string + GetType() KeyType // Name of the key GetName() string // Public key @@ -73,8 +94,8 @@ func newLocalInfo(name string, pub crypto.PubKey, privArmor string) Info { } } -func (i localInfo) GetType() string { - return "local" +func (i localInfo) GetType() KeyType { + return TypeLocal } func (i localInfo) GetName() string { @@ -100,8 +121,8 @@ func newLedgerInfo(name string, pub crypto.PubKey, path ccrypto.DerivationPath) } } -func (i ledgerInfo) GetType() string { - return "ledger" +func (i ledgerInfo) GetType() KeyType { + return TypeLedger } func (i ledgerInfo) GetName() string { @@ -125,8 +146,8 @@ func newOfflineInfo(name string, pub crypto.PubKey) Info { } } -func (i offlineInfo) GetType() string { - return "offline" +func (i offlineInfo) GetType() KeyType { + return TypeOffline } func (i offlineInfo) GetName() string { diff --git a/crypto/ledger_secp256k1.go b/crypto/ledger_secp256k1.go index 4a9a435d6..8cb175d4f 100644 --- a/crypto/ledger_secp256k1.go +++ b/crypto/ledger_secp256k1.go @@ -114,7 +114,7 @@ func (pkl PrivKeyLedgerSecp256k1) Equals(other tmcrypto.PrivKey) bool { // Communication is checked on NewPrivKeyLedger and PrivKeyFromBytes, returning // an error, so this should only trigger if the private key is held in memory // for a while before use. -func (pkl PrivKeyLedgerSecp256k1) Sign(msg []byte) (tmcrypto.Signature, error) { +func (pkl PrivKeyLedgerSecp256k1) Sign(msg []byte) ([]byte, error) { sig, err := pkl.signLedgerSecp256k1(msg) if err != nil { return nil, err @@ -135,13 +135,8 @@ func (pkl PrivKeyLedgerSecp256k1) getPubKey() (key tmcrypto.PubKey, err error) { return key, err } -func (pkl PrivKeyLedgerSecp256k1) signLedgerSecp256k1(msg []byte) (tmcrypto.Signature, error) { - sigBytes, err := pkl.ledger.SignSECP256K1(pkl.Path, msg) - if err != nil { - return nil, err - } - - return tmsecp256k1.SignatureSecp256k1FromBytes(sigBytes), nil +func (pkl PrivKeyLedgerSecp256k1) signLedgerSecp256k1(msg []byte) ([]byte, error) { + return pkl.ledger.SignSECP256K1(pkl.Path, msg) } func (pkl PrivKeyLedgerSecp256k1) pubkeyLedgerSecp256k1() (pub tmcrypto.PubKey, err error) { @@ -154,6 +149,9 @@ func (pkl PrivKeyLedgerSecp256k1) pubkeyLedgerSecp256k1() (pub tmcrypto.PubKey, // re-serialize in the 33-byte compressed format cmp, err := secp256k1.ParsePubKey(key[:], secp256k1.S256()) + if err != nil { + return nil, fmt.Errorf("error parsing public key: %v", err) + } copy(pk[:], cmp.SerializeCompressed()) return pk, nil diff --git a/docs/DOCS_README.md b/docs/DOCS_README.md new file mode 100644 index 000000000..564a7e955 --- /dev/null +++ b/docs/DOCS_README.md @@ -0,0 +1,17 @@ +# Documentation Maintenance Overview + +The documentation found in this directory is hosted at: + +- https://cosmos.network/docs/ + +and built using [VuePress](https://vuepress.vuejs.org/) from the Cosmos website repo: + +- https://github.com/cosmos/cosmos.network + +which has a [configuration file](https://github.com/cosmos/cosmos.network/blob/develop/docs/.vuepress/config.js) for displaying +the Table of Contents that lists all the documentation. + +Under the hood, Jenkins listens for changes in ./docs then pushes a `docs-staging` branch to the cosmos.network repo with the latest documentation. That branch must be manually PR'd to `develop` then `master` for staging then production. This process should happen in synchrony with a release. + +The `README.md` in this directory is the landing page for +website documentation. diff --git a/docs/PRIORITIES.md b/docs/PRIORITIES.md new file mode 100644 index 000000000..d628c136e --- /dev/null +++ b/docs/PRIORITIES.md @@ -0,0 +1,78 @@ +## Fees +- Collection + - Gas price based on parameter + - (which gets changed automatically) + - https://github.com/cosmos/cosmos-sdk/issues/1921 + - Per block gas usage as % + - Windowing function + - Block N, + - For Block N-x ~ N, get average of % + - Should take into account time. + - Standard for querying this price // needs to be used by UX. +- Distribution + - MVP: 1 week, 1 week for testing. + +## Governance v2 +- V1 is just text proposals + - Software upgrade stuff + - https://github.com/cosmos/cosmos-sdk/issues/1734#issuecomment-407254938 + - https://github.com/cosmos/cosmos-sdk/issues/1079 +- We need to test auto-flipping w/ threshold voting power. +- Super simple: + - Only use text proposals + - On-chain mechanism for agreeing on when to "flip" to new functionality + +## Staking/Slashing/Stability +- Unbonding state for validators https://github.com/cosmos/cosmos-sdk/issues/1676 +- current: downtime, double signing during unbonding +- who gets slashed when -- needs review about edge cases +- need to communicate to everyone that lite has this edge case + - Issues: + - https://github.com/cosmos/cosmos-sdk/issues/1378 + - https://github.com/cosmos/cosmos-sdk/issues/1348 + - https://github.com/cosmos/cosmos-sdk/issues/1440 + * Est Difficulty: Hard + * _*Note:*_ This feature needs to be fully fleshed out. Will require a meeting between @jaekwon, @cwgoes, @rigel, @zaki, @bucky to discuss the issues. @jackzampolin to facilitate. + +## Vesting +- 24 accounts with NLocktime +- “No funds can be transferred before timelock” +- New atoms and such can be withdrawn right way +- Requires being able to send fees and inflation to new account + +## Multisig +- Make it work with Cli +- ADR + +## Reserve Pool +- No withdrawing from it at launch + +## Other: +- Need to update for NextValidatorSet - need to upgrade SDK for it +- Need to update for new ABCI changes - error string, tags are list of lists, proposer in header +- Inflation ? + +## Gas +- Calculate gas + +## Reward proposer +- Requires tendermint changes + +# Lower priority + +## Circuit Breaker +- Kinda needed for enabling txs. + +## Governance proposal changes +- V2 is parameter changes + +## Slashing/Stability +- tendermint evidence: we don’t yet slash byzantine signatures (signing at all) when not bonded. + +# Other priority + +## gaiad // gaiacli +- Documentation // language + +## gaialite +- Documentation // language diff --git a/docs/RELEASE_PROCESS.md b/docs/RELEASE_PROCESS.md new file mode 100644 index 000000000..503c5d3fa --- /dev/null +++ b/docs/RELEASE_PROCESS.md @@ -0,0 +1,11 @@ +### `cosmos/cosmos-sdk` Release Process + +- [ ] 1. Decide on release designation (are we doing a patch, or minor version bump) and start a P.R. for the release +- [ ] 2. Add commits/PRs that are desired for this release **that haven’t already been added to develop** +- [ ] 3. Merge items in `PENDING.md` into the `CHANGELOG.md`. While doing this make sure that each entry contains links to issues/PRs for each item +- [ ] 4. Summarize breaking API changes section under “Breaking Changes” section to the `CHANGELOG.md` to bring attention to any breaking API changes that affect RPC consumers. +- [ ] 5. Tag the commit `{{ .Release.Name }}-rcN` +- [ ] 6. Kick off 1 day of automated fuzz testing +- [ ] 7. Release Lead assigns 2 people to perform [buddy testing script](/docs/RELEASE_TEST_SCRIPT.md) and update the relevant documentation +- [ ] 8. If errors are found in either #6 or #7 go back to #2 (*NOTE*: be sure to increment the `rcN`) +- [ ] 9. After #6 and #7 have successfully completed then merge the release PR and push the final release tag diff --git a/docs/RELEASE_TEST_SCRIPT.md b/docs/RELEASE_TEST_SCRIPT.md new file mode 100644 index 000000000..725507958 --- /dev/null +++ b/docs/RELEASE_TEST_SCRIPT.md @@ -0,0 +1,17 @@ +This document should contain plain english instructions for testing functionality on `gaiad`. This “Script” is supposed to be run by 2 people who will each spin up a `gaiad` node and run the series of prompts below. + +- [Create a network of 2 nodes](getting-started/create-testnet.md) +- [Generate an account](sdk/clients.md) +- [Send funds from one account to the other](sdk/clients.md) +- [Create a validator](validators/validator-setup.md) +- [Edit a validator](validators/validator-setup.md) +- [Delegate to validator](sdk/clients.md) +- [Unbond from a validator](sdk/clients.md) +- [View validators and verify output](validators/validator-setup.md) +- [Query network status](getting-started/full-node.md) +- [Create a proposal](validators/validator-setup.md) +- [Query a proposal](validators/validator-setup.md) +- [Vote on a proposal](validators/validator-setup.md) +- [Query status of a proposal](validators/validator-setup.md) +- [Query the votes on a proposal](validators/validator-setup.md) +- [Export state and reload](getting-started/create-testnet.md) diff --git a/docs/clients/lcd-rest-api.yaml b/docs/clients/lcd-rest-api.yaml index a39b7bf08..063e3a55b 100644 --- a/docs/clients/lcd-rest-api.yaml +++ b/docs/clients/lcd-rest-api.yaml @@ -1,8 +1,26 @@ swagger: '2.0' info: version: '1.1.0' - title: Light client daemon to interface with Cosmos baseserver via REST - description: Specification for the LCD provided by `gaiacli advanced rest-server` + title: Gaia-Lite (former LCD) to interface with Cosmos BaseServer via REST + description: Specification for Gaia-lite provided by `gaiacli advanced rest-server` + +tags: +- name: keys + description: Key management to add or view local private keys +- name: send + description: Create and sign a send tx +- name: stake + description: Stake module API for staking and validation +- name: account + description: Query account balance +- name: query + description: Information about blocks and txs +- name: validator set + description: Check the state of the validator set +- name: node + description: Information of the connected node +- name: version + description: Information about the app version securityDefinitions: @@ -12,22 +30,28 @@ securityDefinitions: paths: /version: get: - summary: Version of the light client daemon - description: Get the version of the LCD running locally to compare against expected + summary: Version of Gaia-lite + tags: + - version + description: Get the version of gaia-lite running locally to compare against expected responses: 200: description: Plaintext version i.e. "v0.5.0" /node_version: get: summary: Version of the connected node + tags: + - node description: Get the version of the SDK running on the connected node to compare against expected responses: 200: description: Plaintext version i.e. "v0.5.0" /node_info: get: - description: Only the node info. Block information can be queried via /block/latest - summary: The propertied of the connected node + description: Information about the connected node + summary: The properties of the connected node + tags: + - node produces: - application/json responses: @@ -61,6 +85,8 @@ paths: /syncing: get: summary: Syncing state of node + tags: + - node description: Get if the node is currently syning with other nodes responses: 200: @@ -69,6 +95,8 @@ paths: /keys: get: summary: List of accounts stored locally + tags: + - keys produces: - application/json responses: @@ -80,6 +108,8 @@ paths: $ref: '#/definitions/Account' post: summary: Create a new account locally + tags: + - keys consumes: - application/json parameters: @@ -105,6 +135,8 @@ paths: /keys/seed: get: summary: Create a new seed to create a new account with + tags: + - keys produces: - application/json responses: @@ -121,6 +153,8 @@ paths: type: string get: summary: Get a certain locally stored account + tags: + - keys produces: - application/json responses: @@ -132,6 +166,8 @@ paths: description: Account is not available put: summary: Update the password for this account in the KMS + tags: + - keys consumes: - application/json parameters: @@ -157,6 +193,8 @@ paths: description: Account is not available delete: summary: Remove an account + tags: + - keys consumes: - application/json parameters: @@ -216,6 +254,8 @@ paths: type: string get: summary: Get the account balances + tags: + - account produces: - application/json responses: @@ -234,6 +274,8 @@ paths: type: string post: summary: Send coins (build -> sign -> send) + tags: + - send security: - kms: [] consumes: @@ -265,6 +307,8 @@ paths: /blocks/latest: get: summary: Get the latest block + tags: + - query produces: - application/json responses: @@ -281,6 +325,8 @@ paths: type: number get: summary: Get a block at a certain height + tags: + - query produces: - application/json responses: @@ -293,6 +339,8 @@ paths: /validatorsets/latest: get: summary: Get the latest validator set + tags: + - validator set produces: - application/json responses: @@ -316,6 +364,8 @@ paths: type: number get: summary: Get a validator set a certain height + tags: + - validator set produces: - application/json responses: @@ -407,6 +457,8 @@ paths: type: string get: summary: Get a Tx by hash + tags: + - query produces: - application/json responses: @@ -416,141 +468,201 @@ paths: $ref: "#/definitions/Tx" 404: description: Tx not available for provided hash - # /delegates: - # parameters: - # - in: query - # name: delegator - # description: Query for all delegates a delegator has stake with - # schema: - # $ref: "#/definitions/Address" - # get: - # summary: Get a list of canidates/delegates/validators (optionally filtered by delegator) - # responses: - # 200: - # description: List of delegates, filtered by provided delegator address - # content: - # application/json: - # schema: - # type: array - # items: - # $ref: "#/definitions/Delegate" - # /delegates/bond: - # post: - # summary: Bond atoms (build -> sign -> send) - # security: - # - sign: [] - # requestBody: - # content: - # application/json: - # schema: - # type: array - # items: - # type: object - # properties: - # amount: - # $ref: "#/definitions/Coins" - # pub_key: - # $ref: "#/definitions/PubKey" - # responses: - # 202: - # description: Tx was send and will probably be added to the next block - # 400: - # description: The Tx was malformated - # /delegates/unbond: - # post: - # summary: Unbond atoms (build -> sign -> send) - # security: - # - sign: [] - # requestBody: - # content: - # application/json: - # schema: - # type: array - # items: - # type: object - # properties: - # amount: - # $ref: "#/definitions/Coins" - # pub_key: - # $ref: "#/definitions/PubKey" - # responses: - # 202: - # description: Tx was send and will probably be added to the next block - # 400: - # description: The Tx was malformated - # /delegates/{pubkey}: - # parameters: - # - in: path - # name: pubkey - # description: Pubkey of a delegate - # required: true - # schema: - # type: string - # example: 81B11E717789600CC192B26F452A983DF13B985EE75ABD9DD9E68D7BA007A958 - # get: - # summary: Get a certain canidate/delegate/validator - # responses: - # 200: - # description: Delegate for specified pub_key - # content: - # application/json: - # schema: - # $ref: "#/definitions/Delegate" - # 404: - # description: No delegate found for provided pub_key - # /delegates/{pubkey}/bond: - # parameters: - # - in: path - # name: pubkey - # description: Pubkey of a delegate - # required: true - # schema: - # type: string - # example: 81B11E717789600CC192B26F452A983DF13B985EE75ABD9DD9E68D7BA007A958 - # post: - # summary: Bond atoms (build -> sign -> send) - # security: - # - sign: [] - # requestBody: - # content: - # application/json: - # schema: - # type: object - # properties: - # amount: - # $ref: "#/definitions/Coins" - # responses: - # 202: - # description: Tx was send and will probably be added to the next block - # 400: - # description: The Tx was malformated - # /delegates/{pubkey}/unbond: - # parameters: - # - in: path - # name: pubkey - # description: Pubkey of a delegate - # required: true - # schema: - # type: string - # example: 81B11E717789600CC192B26F452A983DF13B985EE75ABD9DD9E68D7BA007A958 - # post: - # summary: Unbond atoms (build -> sign -> send) - # security: - # - sign: [] - # requestBody: - # content: - # application/json: - # schema: - # type: object - # properties: - # amount: - # $ref: "#/definitions/Coins" - # responses: - # 202: - # description: Tx was send and will probably be added to the next block - # 400: - # description: The Tx was malformated +# ================== Staking Module # ================== + +# TODO create D + /stake/delegators/{delegatorAddr}: + parameters: + - in: path + name: delegatorAddr + description: AccAddress of Delegator + required: true + type: string + get: + summary: Get all delegations (delegation, undelegation) from a delegator + tags: + - stake + produces: + - application/json + responses: + 200: + description: OK + 404: + description: Not Found + 500: + description: Internal Server Error + + /stake/delegators/{delegatorAddr}/txs: + parameters: + - in: path + name: delegatorAddr + description: AccAddress of Delegator + required: true + type: string + get: + summary: Get all staking txs (i.e msgs) from a delegator + tags: + - stake + produces: + - application/json + responses: + 200: + description: OK + schema: + $ref: "#/definitions/Tx" + 404: + description: Not Found + 500: + description: Internal Server Error + + /stake/delegators/{delegatorAddr}/delegations: + parameters: + - in: path + name: delegatorAddr + description: Bech32 AccAddress of Delegator + required: true + type: string + post: + summary: Submit delegation + parameters: + - in: body + name: delegation + description: The password of the account to remove from the KMS + schema: + type: object + properties: + name: + type: string + password: + type: string + account_number: + type: number + delegations: + type: array + items: + type: string + begin_unbondings: + type: array + items: + type: string + complete_unbondings: + type: array + items: + type: string + begin_redelegates: + type: array + items: + type: string + complete_redelegates: + type: array + items: + type: string + chain_id: + type: string + gas: + type: number + sequence: + type: number + tags: + - stake + produces: + - application/json + responses: + 200: + description: OK + schema: + $ref: "#/definitions/Tx" + 404: + description: Not Found + 500: + description: Internal Server Error + + /stake/delegators/{delegatorAddr}/delegations/{validatorAddr}: + parameters: + - in: path + name: delegatorAddr + description: Bech32 AccAddress of Delegator + required: true + type: string + - in: path + name: validatorAddr + description: Bech32 ValAddress of Delegator + required: true + type: string + get: + summary: Query the current delegation status between a delegator and a validator + tags: + - stake + produces: + - application/json + responses: + 200: + description: OK + 404: + description: Not Found + + /stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr}: + parameters: + - in: path + name: delegatorAddr + description: Bech32 AccAddress of Delegator + required: true + type: string + - in: path + name: validatorAddr + description: Bech32 ValAddress of Delegator + required: true + type: string + get: + summary: Query all unbonding delegations between a delegator and a validator + tags: + - stake + produces: + - application/json + responses: + 200: + description: OK + 404: + description: Not Found + 500: + description: Internal Server Error + + /stake/validators: + get: + summary: Get all validator candidates + tags: + - stake + produces: + - application/json + responses: + 200: + description: OK + 500: + description: Internal Server Error + + /stake/validators/{validatorAddr}: + parameters: + - in: path + name: validatorAddr + description: Bech32 ValAddress of Delegator + required: true + type: string + get: + summary: Query the information from a single validator + tags: + - stake + produces: + - application/json + responses: + 200: + description: OK + 404: + description: Not Found + 500: + description: Internal Server Error + +# TODO Add staking definitions definitions: Address: type: string diff --git a/docs/getting-started/create-testnet.md b/docs/getting-started/create-testnet.md new file mode 100644 index 000000000..0b68b3287 --- /dev/null +++ b/docs/getting-started/create-testnet.md @@ -0,0 +1,27 @@ +## Create your Own Testnet + +To create your own testnet, first each validator will need to install gaiad and run gen-tx + +```bash +gaiad init gen-tx --name +``` + +This populations `$HOME/.gaiad/gen-tx/` with a json file. + +Now these json files need to be aggregated together via Github, a Google form, pastebin or other methods. + +Place all files on one computer in `$HOME/.gaiad/gen-tx/` + +```bash +gaiad init --gen-txs -o --chain= +``` + +This will generate a `genesis.json` in `$HOME/.gaiad/config/genesis.json` distribute this file to all validators on your testnet. + +### Export state + +To export state and reload (useful for testing purposes): + +``` +gaiad export > genesis.json; cp genesis.json ~/.gaiad/config/genesis.json; gaiad start +``` diff --git a/docs/introduction/tendermint-cosmos.md b/docs/introduction/tendermint-cosmos.md new file mode 100644 index 000000000..f48106a1d --- /dev/null +++ b/docs/introduction/tendermint-cosmos.md @@ -0,0 +1,27 @@ +## Tendermint and Cosmos + +Blockchains can be divided into three conceptual layers: + +- **Networking:** Responsible for propagating transactions. +- **Consensus:** Enables validator nodes to agree on the next set of transactions to process (i.e. add blocks of transactions to the blockchain). +- **Application:** Responsible for updating the state given a set of transactions, i.e. processing transactions. + +The *networking* layer makes sure that each node receives transactions. The *consensus* layer makes sure that each node agrees on the same transactions to modify their local state. As for the *application* layer, it processes transactions. Given a transaction and a state, the application will return a new state. In Bitcoin for example, the application state is a ledger or list of balances for each account (in reality, it's a list of UTXO, short for Unspent Transaction Output, but let's call them balances for the sake of simplicity), and the transactions modify the application's state by changing these list of balances. In the case of Ethereum, the application is a virtual machine. Each transaction goes through this virtual machine and modifies the application state according to the the smart contract that is called within it. + +Before Tendermint, building a blockchain required building all three layers from the ground up. It was such a tedious task that most developers preferred to fork or replicate the Bitcoin codebase, but were constrainted by the limitations of Bitcoin's protocol. The Ethereum Virtual Machine (EVM) was designed to solve this problem and simplify decentralized application development by allowing customizable logic to be executed through smart contracts. But it did not resolve the limitations (interoperability, scalability and customization) of blockchains themselves. Go-Ethereum remains a very monolithic tech stack that is difficult to hard-fork much like Bitcoin's codebase. + +Tendermint was designed to address these issues and provide developers with an laternative. The goal of Tendermint is to provide the *networking* and *consensus* layers of a blockchain as a generic engine to power any application developers want to build. With Tendermint, developers only have to focus on the *application* layer, thereby saving hundreds of hours of work and costly development set-ups. For reference, Tendermint also designates the name of the byzantine fault tolerant consensus algorithm used within the Tendermint Core engine. + +Tendermint connects the blockchain engine, Tendermint Core (*networking* and *consensus* layers), to the *application* layer via a socket protocol called the [ABCI](https://github.com/tendermint/abci), short for Application-BlockChain Interface. Developers only have to implement a few messages to build an ABCI-enabled application that runs on top of the Tendermint Core engine. ABCI is language agnostic, meaning that developers can build the *application* part of their blockchain in any programming language. Building on top of the Tendermint Core engine also provides the following benefits: + +- **Public or private blockchain capable.** Developers can deploy any blockchain application, permissioned (private) and permissionless (public), on top of Tendermint Core. +- **Performance.** Tendermint Core is a state-of-the-art blockchain consensus engine able to handle large number of transactions in short timespan. A block time on Tendermint Core can be as low as one second and can process thousands of transactions in that time period. +- **Instant finality.** A property of the Tendermint consensus algorithm is instant finality, meaning that forks are never created, as long as less than a third of the validators are malicious (byzantine). Users can be sure their transactions are finalized as soon as a block is created. +- **Security.** Tendermint Core's consensus is not only fault tolerant, it’s optimally Byzantine fault-tolerant (BFT), with accountability. If the blockchain forks, there is a way to determine liability. +- **Light-client support**. Tendermint provides built-in light-clients. + +But most importantly, Tendermint is natively compatible with the [Inter-Blockchain Communication Protocol](https://github.com/cosmos/cosmos-sdk/tree/develop/docs/spec/ibc) (IBC). This means that any Tendermint-based blockchain, whether public or private, can be natively connected to the Cosmos ecosystem and securely exchange tokens with other blockchains in the ecosystem. Note that benefiting from interoperability via IBC and Cosmos preserves the sovereignty of your Tendermint chain. Non-Tendermint chains can also be connected to Cosmos via IBC adapters or Peg-Zones, but this is out of scope for this document. + +For a more detailed overview of the Cosmos ecosystem, you can read [this article](https://blog.cosmos.network/understanding-the-value-proposition-of-cosmos-ecaef63350d). + +For more on Tendermint, go [here](tendermint.md) \ No newline at end of file diff --git a/docs/introduction/tendermint.md b/docs/introduction/tendermint.md index 07ce67618..62db8cdbc 100644 --- a/docs/introduction/tendermint.md +++ b/docs/introduction/tendermint.md @@ -5,9 +5,43 @@ Tendermint is software for securely and consistently replicating an application Tendermint is designed to be easy-to-use, simple-to-understand, highly performant, and useful for a wide variety of distributed applications. ## Byzantine Fault Tolerance + The ability to tolerate machines failing in arbitrary ways, including becoming malicious, is known as Byzantine fault tolerance (BFT). The theory of BFT is decades old, but software implementations have only became popular recently, due largely to the success of “blockchain technology” like Bitcoin and Ethereum. Blockchain technology is just a re-formalization of BFT in a more modern setting, with emphasis on peer-to-peer networking and cryptographic authentication. The name derives from the way transactions are batched in blocks, where each block contains a cryptographic hash of the previous one, forming a chain. In practice, the blockchain data structure actually optimizes BFT design. ## Application Blockchain Interface + Tendermint consists of two chief technical components: a blockchain consensus engine and a generic application interface. The consensus engine, called Tendermint Core, ensures that the same transactions are recorded on every machine in the same order. The application interface, called the Application Blockchain Interface (ABCI), enables the transactions to be processed in any programming language. Unlike other blockchain and consensus solutions developers can use Tendermint for BFT state machine replication in any programming language or development environment. Visit the [Tendermint docs](https://tendermint.readthedocs.io/projects/tools/en/master/introduction.html#abci-overview) for a deep dive into the ABCI. -The [Cosmos SDK](/sdk/overview.md) is an ABCI framework written in Go. [Lotion JS](/lotion/overview.md) is an ABCI framework written in JavaScript. +## Understanding the roles of the different layers + +It is important to have a good understanding of the respective responsibilities of both the *Application* and the *Consensus Engine*. + +Responsibilities of the *Consensus Engine*: +- Propagate transactions +- Agree on the order of valid transactions + +Reponsibilities of the *Application*: +- Generate Transactions +- Check if transactions are valid +- Process Transactions (includes state changes) + +It is worth underlining that the *Consensus Engine* has knowledge of a given validator set for each block, but that it is the responsiblity of the *Application* to trigger validator set changes. This is the reason why it is possible to build both **public and private chains** with the Cosmos-SDK and Tendermint. A chain will be public or private depending on the rules, defined at application level, that governs a validator's set changes. + +The ABCI establishes the connection between the *Consensus Engine* and the *Application*. Essentially, it boils down to two messages: + +- `CheckTx`: Ask the application if the transaction is valid. When a validator's node receives a transaction, it will run `CheckTx` on it. If the transaction is valid, it is added to the mempool. +- `DeliverTx`: Ask the application to process the transaction and update the state. + +Let us give a high-level overview of how the *Consensus Engine* and the *Application* interract with each other. + +- At all times, when the consensus engine (Tendermint Core) of a validator node receives a transaction, it passes it to the application via `CheckTx` to check its validity. If it is valid, the transaction is added to the mempool. +- Let us say we are at block N. There is a validator set V. A proposer of the next block is selected from V by the *Consensus Engine*. The proposer gathers valid transaction from its mempool to form a new block. Then, the block is gossiped to other validators to be signed/commited. The block becomes block N+1 once 2/3+ of V have signed a *precommit* on it (For a more detailed explanation of the consensus algorithm, click [here](https://github.com/tendermint/tendermint/wiki/Byzantine-Consensus-Algorithm)). +- When block N+1 is signed by 2/3+ of V, it is gossipped to full-nodes. When full-nodes receive the block, they confirm its validity. A block is valid if it it holds valid signatures from more than 2/3 of V and if all the transactions in the block are valid. To check the validity of transactions, the *Consensus Engine* transfers them to the application via `DeliverTx`. After each transaction, `DeliverTx` returns a new state if the transaction was valid. At the end of the block, a final state is committed. Of course, this means that the order of transaction within a block matters. + +## Application frameworks + +Even if Tendermint makes it easy for developers to build their own blockchain by enabling them to focus on the *Application* layer of their blockchain, building an *Application* can be a challenging task in itself. This is why *Application Frameworks* exist. They provide developers with a secure and features-heavy environment to develop Tendermint-based applications. Here are some examples of *Application Frameworks* : + +- The [Cosmos SDK](/sdk/overview.md) is an ABCI framework written in Go. +- [Lotion JS](/lotion/overview.md) is an ABCI framework written in JavaScript. + diff --git a/docs/introduction/what-is-cosmos.md b/docs/introduction/what-is-cosmos.md index 2e20c329c..f9470d7c9 100644 --- a/docs/introduction/what-is-cosmos.md +++ b/docs/introduction/what-is-cosmos.md @@ -4,4 +4,4 @@ Cosmos is a decentralized network of independent parallel blockchains, each powe The first blockchain in the Cosmos Network is the [Cosmos Hub](), whose native token is the Atom. Cosmos is a permission-less network, meaning that anybody can build a blockchain on it. -Cosmos can interoperate with multiple other applications and cryptocurrencies. By creating a new zone, you can plug any blockchain system into the Cosmos hub and pass tokens back and forth between those zones, without the need for an intermediary. +Cosmos can interoperate with multiple other applications and cryptocurrencies. By creating a new zone, you can plug any blockchain system into the Cosmos hub and pass tokens back and forth between those zones, without the need for an intermediary. \ No newline at end of file diff --git a/docs/light/api.md b/docs/light/api.md new file mode 100644 index 000000000..41abed5da --- /dev/null +++ b/docs/light/api.md @@ -0,0 +1,660 @@ +# Cosmos Hub (Gaia) LCD API + +This document describes the API that is exposed by the specific LCD implementation of the Cosmos +Hub (Gaia). Those APIs are exposed by a REST server and can easily be accessed over HTTP/WS(websocket) +connections. + +The complete API is comprised of the sub-APIs of different modules. The modules in the Cosmos Hub +(Gaia) API are: + +* ICS0 (TendermintAPI) +* ICS1 (KeyAPI) +* ICS20 (TokenAPI) +* ICS21 (StakingAPI) - not yet implemented +* ICS22 (GovernanceAPI) - not yet implemented + +Error messages my change and should be only used for display purposes. Error messages should not be +used for determining the error type. + +## ICS0 - TendermintAPI - not yet implemented + +Exposes the same functionality as the Tendermint RPC from a full node. It aims to have a very +similar API. + +### /broadcast_tx_sync - POST + +url: /broadcast_tx_sync + +Functionality: Submit a signed transaction synchronously. This returns a response from CheckTx. + +Parameters: + +| Parameter | Type | Default | Required | Description | +| ----------- | ------ | ------- | -------- | --------------- | +| transaction | string | null | true | signed tx bytes | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "code":0, + "hash":"0D33F2F03A5234F38706E43004489E061AC40A2E", + "data":"", + "log":"" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not submit the transaction synchronously.", + "result":{} +} +``` + +### /broadcast_tx_async - POST + +url: /broadcast_tx_async + +Functionality: Submit a signed transaction asynchronously. This does not return a response from CheckTx. + +Parameters: + +| Parameter | Type | Default | Required | Description | +| ----------- | ------ | ------- | -------- | --------------- | +| transaction | string | null | true | signed tx bytes | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result": { + "code":0, + "hash":"E39AAB7A537ABAA237831742DCE1117F187C3C52", + "data":"", + "log":"" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not submit the transaction asynchronously.", + "result":{} +} +``` + +### /broadcast_tx_commit - POST + +url: /broadcast_tx_commit + +Functionality: Submit a signed transaction and waits for it to be committed in a block. + +Parameters: + +| Parameter | Type | Default | Required | Description | +| ----------- | ------ | ------- | -------- | --------------- | +| transaction | string | null | true | signed tx bytes | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "height":26682, + "hash":"75CA0F856A4DA078FC4911580360E70CEFB2EBEE", + "deliver_tx":{ + "log":"", + "data":"", + "code":0 + }, + "check_tx":{ + "log":"", + "data":"", + "code":0 + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not commit the transaction.", + "result":{} +} +``` + +## ICS1 - KeyAPI + +This API exposes all functionality needed for key creation, signing and management. + +### /keys - GET + +url: /keys + +Functionality: Gets a list of all the keys. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "keys":[ + { + "name":"monkey", + "address":"cosmosaccaddr1fedh326uxqlxs8ph9ej7cf854gz7fd5zlym5pd", + "pub_key":"cosmosaccpub1zcjduc3q8s8ha96ry4xc5xvjp9tr9w9p0e5lk5y0rpjs5epsfxs4wmf72x3shvus0t" + }, + { + "name":"test", + "address":"cosmosaccaddr1thlqhjqw78zvcy0ua4ldj9gnazqzavyw4eske2", + "pub_key":"cosmosaccpub1zcjduc3qyx6hlf825jcnj39adpkaxjer95q7yvy25yhfj3dmqy2ctev0rxmse9cuak" + } + ], + "block_height":5241 + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not retrieve the keys.", + "result":{} +} +``` + +### /keys/recover - POST + +url: /keys/recover + +Functionality: Recover your key from seed and persist it encrypted with the password. + +Parameter: + +| Parameter | Type | Default | Required | Description | +| --------- | ------ | ------- | -------- | ---------------- | +| name | string | null | true | name of key | +| password | string | null | true | password of key | +| seed | string | null | true | seed of key | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "address":"BD607C37147656A507A5A521AA9446EB72B2C907" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not recover the key.", + "result":{} +} +``` + +### /keys/create - POST + +url: /keys/create + +Functionality: Create a new key. + +Parameter: + +| Parameter | Type | Default | Required | Description | +| --------- | ------ | ------- | -------- | ---------------- | +| name | string | null | true | name of key | +| password | string | null | true | password of key | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "seed":"crime carpet recycle erase simple prepare moral dentist fee cause pitch trigger when velvet animal abandon" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create new key.", + "result":{} +} +``` + +### /keys/{name} - GET + +url: /keys/{name} + +Functionality: Get the information for the specified key. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "name":"test", + "address":"cosmosaccaddr1thlqhjqw78zvcy0ua4ldj9gnazqzavyw4eske2", + "pub_key":"cosmosaccpub1zcjduc3qyx6hlf825jcnj39adpkaxjer95q7yvy25yhfj3dmqy2ctev0rxmse9cuak" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not find information on the specified key.", + "result":{} +} +``` + +### /keys/{name} - PUT + +url: /keys/{name} + +Functionality: Change the encryption password for the specified key. + +Parameters: + +| Parameter | Type | Default | Required | Description | +| --------------- | ------ | ------- | -------- | --------------- | +| old_password | string | null | true | old password | +| new_password | string | null | true | new password | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{} +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not update the specified key.", + "result":{} +} +``` + +### /keys/{name} - DELETE + +url: /keys/{name} + +Functionality: Delete the specified key. + +Parameters: + +| Parameter | Type | Default | Required | Description | +| --------- | ------ | ------- | -------- | ---------------- | +| password | string | null | true | password of key | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{} +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not delete the specified key.", + "result":{} +} +``` + +## ICS20 - TokenAPI + +The TokenAPI exposes all functionality needed to query account balances and send transactions. + +### /bank/balance/{account} - GET + +url: /bank/balance/{account} + +Functionality: Query the specified account. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result": { + "atom":1000, + "photon":500, + "ether":20 + } +} +``` + +Returns on error: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not find any balance for the specified account.", + "result":{} +} +``` + +### /bank/create_transfer - POST + +url: /bank/create_transfer + +Functionality: Create a transfer in the bank module. + +Parameters: + +| Parameter | Type | Default | Required | Description | +| ------------ | ------ | ------- | -------- | ------------------------- | +| sender | string | null | true | Address of sender | +| receiver | string | null | true | address of receiver | +| chain_id | string | null | true | chain id | +| amount | int | null | true | amount of the token | +| denomonation | string | null | true | denomonation of the token | + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "transaction":"TODO:" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create the transaction.", + "result":{} +} +``` + +## ICS21 - StakingAPI + +The StakingAPI exposes all functionality needed for validation and delegation in Proof-of-Stake. + +### /stake/delegators/{delegatorAddr} - GET + +url: /stake/delegators/{delegatorAddr} + +Functionality: Get all delegations (delegation, undelegation) from a delegator. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result": { + "atom":1000, + "photon":500, + "ether":20 + } +} +``` + +Returns on error: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not find any balance for the specified account.", + "result":{} +} +``` + +### /stake/delegators/{delegatorAddr}/txs - GET + +url: /stake/delegators/{delegatorAddr}/txs + +Functionality: Get all staking txs (i.e msgs) from a delegator. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "transaction":"TODO" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create the transaction.", + "result":{} +} +``` + +### /stake/delegators/{delegatorAddr}/delegations - POST + +url: /stake/delegators/{delegatorAddr}/delegations + +Functionality: Submit a delegation. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "transaction":"TODO" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create the transaction.", + "result":{} +} +``` + +### /stake/delegators/{delegatorAddr}/delegations/{validatorAddr} - GET + +url: /stake/delegators/{delegatorAddr}/delegations/{validatorAddr} + +Functionality: Query the current delegation status between a delegator and a validator. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "transaction":"TODO" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create the transaction.", + "result":{} +} +``` + +### /stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr} - GET + +url: /stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr} + +Functionality: Query all unbonding delegations between a delegator and a validator. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "transaction":"TODO" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create the transaction.", + "result":{} +} +``` + +### /stake/validators - GET + +url: /stake/validators + +Functionality: Get all validator candidates. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "transaction":"TODO" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create the transaction.", + "result":{} +} +``` + +### /stake/validators/{validatorAddr} - GET + +url: /stake/validators/{validatorAddr} + +Functionality: Query the information from a single validator. + +Returns on success: + +```json +{ + "rest api":"2.0", + "code":200, + "error":"", + "result":{ + "transaction":"TODO" + } +} +``` + +Returns on failure: + +```json +{ + "rest api":"2.0", + "code":500, + "error":"Could not create the transaction.", + "result":{} +} +``` diff --git a/docs/light/getting_started.md b/docs/light/getting_started.md new file mode 100644 index 000000000..5f11956c0 --- /dev/null +++ b/docs/light/getting_started.md @@ -0,0 +1,40 @@ +# Getting Started + +To start a rest server, we need to specify the following parameters: +| Parameter | Type | Default | Required | Description | +| ----------- | --------- | ----------------------- | -------- | ---------------------------------------------------- | +| chain-id | string | null | true | chain id of the full node to connect | +| node | URL | "tcp://localhost:46657" | true | address of the full node to connect | +| laddr | URL | "tcp://localhost:1317" | true | address to run the rest server on | +| trust-node | bool | "false" | true | Whether this LCD is connected to a trusted full node | +| trust-store | DIRECTORY | "$HOME/.lcd" | false | directory for save checkpoints and validator sets | + +Sample command: + +```bash +gaiacli light-client --chain-id=test --laddr=tcp://localhost:1317 --node tcp://localhost:46657 --trust-node=false +``` + +## Gaia Light Use Cases + +LCD could be very helpful for related service providers. For a wallet service provider, LCD could +make transaction faster and more reliable in the following cases. + +### Create an account + +![deposit](pics/create-account.png) + +First you need to get a new seed phrase :[get-seed](api.md#keysseed---get) + +After having new seed, you could generate a new account with it : [keys](api.md#keys---post) + +### Transfer a token + +![transfer](pics/transfer-tokens.png) + +The first step is to build an asset transfer transaction. Here we can post all necessary parameters +to /create_transfer to get the unsigned transaction byte array. Refer to this link for detailed +operation: [build transaction](api.md#create_transfer---post) + +Then sign the returned transaction byte array with users' private key. Finally broadcast the signed +transaction. Refer to this link for how to broadcast the signed transaction: [broadcast transaction](api.md#create_transfer---post) diff --git a/docs/light/load_balancer.md b/docs/light/load_balancer.md new file mode 100644 index 000000000..0cc280827 --- /dev/null +++ b/docs/light/load_balancer.md @@ -0,0 +1,203 @@ +# Load Balancing Module - WIP + +The LCD will be an important bridge between service providers and cosmos blockchain network. Suppose +a service provider wants to monitor token information for millions of accounts. Then it has to keep +sending a large mount of requests to LCD to query token information. As a result, LCD will send huge +requests to full node to get token information and necessary proof which will cost full node much +computing and bandwidth resource. Too many requests to a single full node may result in some bad +situations: + +```text +1. The full node crash possibility increases. +2. The reply delay increases. +3. The system reliability will decrease. +4. As the full node may belong to other people or associates, they may deny too frequent access from a single client. +``` + +It is very urgent to solve this problems. Here we consider to import load balancing into LCD. By the +help of load balancing, LCD can distribute millions of requests to a set of full nodes. Thus the +load of each full node won't be too heavy and the unavailable full nodes will be wiped out of query +list. In addition, the system reliability will increase. + +## Design + +This module need combine with client to realize the real load balancing. It can embed the +[HTTP Client](https://github.com/tendermint/tendermint/rpc/lib/client/httpclient.go). In other +words，we realise the new httpclient based on `HTTP`. + +```go +type HTTPLoadBalancer struct { + rpcs map[string]*rpcclient.JSONRPCClient + *WSEvents +} +``` + +## The Diagram of LCD RPC WorkFlow with LoadBalance + +![The Diagram of LCD RPC WorkFlow](pics/loadbalanceDiagram.png) + +In the above sequence diagram, application calls the `Request()`, and LCD finally call the +`HTTP.Request()` through the SecureClient `Wrapper`. In every `HTTP.Request()`, `Getclient()` +selects the current working rpcclient by the load balancing algorithm,then run the +`JSONRPCClient.Call()` to request from the Full Node, finally `UpdateClient()` updates the weight of + the current rpcclient according to the status that is returned by the full node. The `GetAddr()` + and `UpdateAddrWeight()` are realized in the load balancing module. + +There are some abilities to do: + +* Add the Remote Address +* Delete the Remote Address +* Update the weights of the addresses + +## Load balancing Strategies + +We can design some strategies like nginx to combine the different load balancing algorithms to get +the final remote. We can also get the status of the remote server to add or delete the addresses and + update weights of the addresses. + +In a word，it can make the entire LCD work more effective in actual conditions. +We are working this module independently in this [Github Repository](https://github.com/MrXJC/GoLoadBalance). + +## Interface And Type + +### Balancer + +This interface `Balancer`is the core of the package. Every load balancing algorithm should realize +it,and it defined two interfaces. + +* `init` initialize the balancer, assigns the variables which `DoBalance` needs. +* `DoBalance` load balance the full node addresses according to the current situation. + +```go +package balance + +type Balancer interface { + init(NodeAddrs) + DoBalance(NodeAddrs) (*NodeAddr,int,error) +} +``` + +### NodeAddr + +* host: ip address +* port: the number of port +* weight: the weight of this full node address,default:1 + +This NodeAddr is the base struct of the address. + +```go +type NodeAddr struct{ + host string + port int + weight int +} + +func (p *NodeAddr) GetHost() string + +func (p *NodeAddr) GetPort() int + +func (p *NodeAddr) GetWeight() int + +func (p *NodeAddr) updateWeight(weight int) +``` + +The `weight` is the important factor that schedules which full node the LCD calls. The weight can be +changed by the information from the full node. So we have the function `updateWegiht`. + +### NodeAddrs + +>in `balance/types.go` + +`NodeAddrs` is the list of the full node address. This is the member variable in the +BalanceManager(`BalancerMgr`). + +```go +type NodeAddrs []*NodeAddr +``` + +## Load Balancing Algorithm + +### Random + +>in `balance/random.go` + +Random algorithm selects a remote address randomly to process the request. The probability of them +being selected is the same. + +### RandomWeight + +>in `balance/random.go` + +RandomWeight Algorithm also selects a remote address randomly to process the request. But the higher +the weight, the greater the probability. + +### RoundRobin + +>in `balance/roundrobin.go` + +RoundRobin Algorithm selects a remote address orderly. Every remote address have the same +probability to be selected. + +### RoundRobinWeight + +>in `balance/roundrobin.go` + +RoundRobinWeight Algorthm selects a remote address orderly. But every remote address have different +probability to be selected which are determined by their weight. + +### Hash + +//TODO + +## Load Balancing Manager + +### BalanceMgr + +>in `balance/manager.go` + +* addrs: the set of the remote full node addresses +* balancers: map the string of balancer name to the specific balancer +* change: record whether the machine reinitialize after the `addrs` changes + +`BalanceMgr` is the manager of many balancer. It is the access of load balancing. Its main function +is to maintain the `NodeAddrs` and to call the specific load balancing algorithm above. + +```go +type BalanceMgr struct{ + addrs NodeAddrs + balancers map[string]Balancer + change map[string]bool +} + +func (p *BalanceMgr) RegisterBalancer(name string,balancer Balancer) + +func (p *BalanceMgr) updateBalancer(name string) + +func (p *BalanceMgr) AddNodeAddr(addr *NodeAddr) + +func (p *BalanceMgr) DeleteNodeAddr(i int) + +func (p *BalanceMgr) UpdateWeightNodeAddr(i int,weight int) + +func (p *BalanceMgr) GetAddr(name string)(*NodeAddr,int,error) { + // if addrs change,update the balancer which we use. + if p.change[name]{ + p.updateBalancer(name) + } + + // get the balancer by name + balancer := p.balancers[name] + + // use the load balancing algorithm + addr,index,err := balancer.DoBalance(p.addrs) + + return addr,index,err +} +``` + +* `RegisterBalancer`: register the basic balancer implementing the `Balancer` interface and initialize them. +* `updateBalancer`: update the specific balancer after the `addrs` change. +* `AddNodeAddr`: add the remote address and set all the values of the `change` to true. +* `DeleteNodeAddr`: delete the remote address and set all the values of the `change` to true. +* `UpdateWeightNodeAddr`: update the weight of the remote address and set all the values of the `change` to true. +* `GetAddr`:select the address by the balancer the `name` decides. diff --git a/docs/light/pics/C2H.png b/docs/light/pics/C2H.png new file mode 100644 index 000000000..49f7e07f3 Binary files /dev/null and b/docs/light/pics/C2H.png differ diff --git a/docs/light/pics/H2C.png b/docs/light/pics/H2C.png new file mode 100644 index 000000000..027eafcde Binary files /dev/null and b/docs/light/pics/H2C.png differ diff --git a/docs/light/pics/MA.png b/docs/light/pics/MA.png new file mode 100644 index 000000000..ae3823962 Binary files /dev/null and b/docs/light/pics/MA.png differ diff --git a/docs/light/pics/absence1.png b/docs/light/pics/absence1.png new file mode 100755 index 000000000..70b4c9e8d Binary files /dev/null and b/docs/light/pics/absence1.png differ diff --git a/docs/light/pics/absence2.png b/docs/light/pics/absence2.png new file mode 100755 index 000000000..6ce5bcde3 Binary files /dev/null and b/docs/light/pics/absence2.png differ diff --git a/docs/light/pics/absence3.png b/docs/light/pics/absence3.png new file mode 100755 index 000000000..d3afdc2c5 Binary files /dev/null and b/docs/light/pics/absence3.png differ diff --git a/docs/light/pics/architecture.png b/docs/light/pics/architecture.png new file mode 100644 index 000000000..741a90c26 Binary files /dev/null and b/docs/light/pics/architecture.png differ diff --git a/docs/light/pics/changeProcess.png b/docs/light/pics/changeProcess.png new file mode 100755 index 000000000..1771c239b Binary files /dev/null and b/docs/light/pics/changeProcess.png differ diff --git a/docs/light/pics/commitValidation.png b/docs/light/pics/commitValidation.png new file mode 100755 index 000000000..89985bcc1 Binary files /dev/null and b/docs/light/pics/commitValidation.png differ diff --git a/docs/light/pics/create-account.png b/docs/light/pics/create-account.png new file mode 100644 index 000000000..35a249b97 Binary files /dev/null and b/docs/light/pics/create-account.png differ diff --git a/docs/light/pics/deposit.png b/docs/light/pics/deposit.png new file mode 100644 index 000000000..1fb3acdc5 Binary files /dev/null and b/docs/light/pics/deposit.png differ diff --git a/docs/light/pics/existProof.png b/docs/light/pics/existProof.png new file mode 100755 index 000000000..ee5de0851 Binary files /dev/null and b/docs/light/pics/existProof.png differ diff --git a/docs/light/pics/high-level.png b/docs/light/pics/high-level.png new file mode 100644 index 000000000..73a14e0d7 Binary files /dev/null and b/docs/light/pics/high-level.png differ diff --git a/docs/light/pics/light-client-architecture.png b/docs/light/pics/light-client-architecture.png new file mode 100644 index 000000000..df44aeef5 Binary files /dev/null and b/docs/light/pics/light-client-architecture.png differ diff --git a/docs/light/pics/loadbalanceDiagram.png b/docs/light/pics/loadbalanceDiagram.png new file mode 100644 index 000000000..56956ee9d Binary files /dev/null and b/docs/light/pics/loadbalanceDiagram.png differ diff --git a/docs/light/pics/simpleMerkleTree.png b/docs/light/pics/simpleMerkleTree.png new file mode 100755 index 000000000..5c4e2b76e Binary files /dev/null and b/docs/light/pics/simpleMerkleTree.png differ diff --git a/docs/light/pics/substoreProof.png b/docs/light/pics/substoreProof.png new file mode 100755 index 000000000..90dadaef3 Binary files /dev/null and b/docs/light/pics/substoreProof.png differ diff --git a/docs/light/pics/transfer-tokens.png b/docs/light/pics/transfer-tokens.png new file mode 100644 index 000000000..c6635a30c Binary files /dev/null and b/docs/light/pics/transfer-tokens.png differ diff --git a/docs/light/pics/transfer.png b/docs/light/pics/transfer.png new file mode 100644 index 000000000..7642e996c Binary files /dev/null and b/docs/light/pics/transfer.png differ diff --git a/docs/light/pics/trustPropagate.png b/docs/light/pics/trustPropagate.png new file mode 100755 index 000000000..a743cfc72 Binary files /dev/null and b/docs/light/pics/trustPropagate.png differ diff --git a/docs/light/pics/updateValidatorToHeight.png b/docs/light/pics/updateValidatorToHeight.png new file mode 100755 index 000000000..b2c9349b6 Binary files /dev/null and b/docs/light/pics/updateValidatorToHeight.png differ diff --git a/docs/light/pics/validatorSetChange.png b/docs/light/pics/validatorSetChange.png new file mode 100755 index 000000000..16dbf39be Binary files /dev/null and b/docs/light/pics/validatorSetChange.png differ diff --git a/docs/light/pics/withdraw.png b/docs/light/pics/withdraw.png new file mode 100644 index 000000000..2249b5e34 Binary files /dev/null and b/docs/light/pics/withdraw.png differ diff --git a/docs/light/readme.md b/docs/light/readme.md new file mode 100644 index 000000000..a9cdb2fff --- /dev/null +++ b/docs/light/readme.md @@ -0,0 +1,100 @@ +# Cosmos-Sdk Light Client + +## Introduction + +A light client allows clients, such as mobile phones, to receive proofs of the state of the +blockchain from any full node. Light clients do not have to trust any full node, since they are able +to verify any proof they receive and hence full nodes cannot lie about the state of the network. + +A light client can provide the same security as a full node with the minimal requirements on +bandwidth, computing and storage resource. Besides, it can also provide modular functionality +according to users' configuration. These fantastic features allow developers to build fully secure, +efficient and usable mobile apps, websites or any other applications without deploying or +maintaining any full blockchain nodes. + +LCD will be used in the Cosmos Hub, the first Hub in the Cosmos network. + +## Contents + +1. [**Overview**](##Overview) +2. [**Get Started**](getting_started.md) +3. [**API**](api.md) +4. [**Specifications**](specification.md) + +## Overview + +### What is a Light Client + +The LCD is split into two separate components. The first component is generic for any Tendermint +based application. It handles the security and connectivity aspects of following the header chain +and verify proofs from full nodes against locally trusted validator set. Furthermore it exposes +exactly the same API as any Tendermint Core node. The second component is specific for the Cosmos +Hub (Gaiad). It works as a query endpoint and exposes the application specific functionality, which +can be arbitrary. All queries against the application state have to go through the query endpoint. +The advantage of the query endpoint is that it can verify the proofs that the application returns. + +### High-Level Architecture + +An application developer that would like to build a third party integration can ship his application +with the LCD for the Cosmos Hub (or any other zone) and only needs to initialise it. Afterwards his +application can interact with the zone as if it was running against a full node. + +![high-level](pics/high-level.png) + +An application developer that wants to build an third party application for the Cosmos Hub (or any +other zone) should build it against it's canonical API. That API is a combination of multiple parts. +All zones have to expose ICS0 (TendermintAPI). Beyond that any zone is free to choose any +combination of module APIs, depending on which modules the state machine uses. The Cosmos Hub will +initially support ICS0 (TendermintAPI), ICS1 (KeyAPI), ICS20 (TokenAPI), ICS21 (StakingAPI) and +ICS22 (GovernanceAPI). + +All applications are expected to only run against the LCD. The LCD is the only piece of software +that offers stability guarantees around the zone API. + +### Comparision + +A full node of ABCI is different from its light client in the following ways: + +|| Full Node | LCD | Description| +|-| ------------- | ----- | -------------- | +| Execute and verify transactions|Yes|No|Full node will execute and verify all transactions while LCD won't| +| Verify and save blocks|Yes|No|Full node will verify and save all blocks while LCD won't| +| Participate consensus| Yes|No|Only when the full node is a validtor, it will participate consensus. LCD nodes never participate consensus| +| Bandwidth cost|Huge|Little|Full node will receive all blocks. if the bandwidth is limited, it will fall behind the main network. What's more, if it happens to be a validator,it will slow down the consensus process. LCD requires little bandwidth. Only when serving local request, it will cost bandwidth| +| Computing resource|Huge|Little|Full node will execute all transactions and verify all blocks which require much computing resource| +| Storage resource|Huge|Little|Full node will save all blocks and ABCI states. LCD just saves validator sets and some checkpoints| +| Power consume|Huge|Little|Full nodes have to be deployed on machines which have high performance and will be running all the time. So power consume will be huge. LCD can be deployed on the same machines as users' applications, or on independent machines but with poor performance. Besides, LCD can be shutdown anytime when necessary. So LCD only consume very little power, even mobile devices can meet the power requirement| +| Provide APIs|All cosmos APIs|Modular APIs|Full node supports all cosmos APIs. LCD provides modular APIs according to users' configuration| +| Secuity level| High|High|Full node will verify all transactions and blocks by itself. LCD can't do this, but it can query any data from other full nodes and verify the data independently. So both full node and LCD don't need to trust any third nodes, they all can achieve high security| + +According to the above table, LCD can meet all users' functionality and security requirements, but +only requires little resource on bandwidth, computing, storage and power. + +## How does LCD achieve high security? + +### Trusted validator set + +The base design philosophy of lcd follows the two rules: + +1. **Doesn't trust any blockchain nodes, including validator nodes and other full nodes** +2. **Only trusts the whole validator set** + +The original trusted validator set should be prepositioned into its trust store, usually this +validator set comes from genesis file. During running time, if LCD detects different validator set, +it will verify it and save new validated validator set to trust store. + +![validator-set-change](pics/validatorSetChange.png) + +### Trust propagation + +From the above section, we come to know how to get trusted validator set and how lcd keeps track of +validator set evolution. Validator set is the foundation of trust, and the trust can propagate to +other blockchain data, such as block and transaction. The propagate architecture is shown as +follows: + +![change-process](pics/trustPropagate.png) + +In general, by trusted validator set, LCD can verify each block commit which contains all pre-commit +data and block header data. Then the block hash, data hash and appHash are trusted. Based on this +and merkle proof, all transactions data and ABCI states can be verified too. Detailed implementation +will be posted on technical specification. diff --git a/docs/light/specification.md b/docs/light/specification.md new file mode 100644 index 000000000..d8897b244 --- /dev/null +++ b/docs/light/specification.md @@ -0,0 +1,348 @@ +# Specifications + +This specification describes how to implement the LCD. LCD supports modular APIs. Currently, only +ICS0 (TendermintAPI), ICS1 (Key API) and ICS20 (Token API) are supported. Later, if necessary, more +APIs can be included. + +## Build and Verify Proof of ABCI States + +As we all know, storage of cosmos-sdk based application contains multi-substores. Each substore is +implemented by a IAVL store. These substores are organized by simple Merkle tree. To build the tree, +we need to extract name, height and store root hash from these substores to build a set of simple +Merkle leaf nodes, then calculate hash from leaf nodes to root. The root hash of the simple Merkle +tree is the AppHash which will be included in block header. + +![Simple Merkle Tree](pics/simpleMerkleTree.png) + +As we have discussed in [LCD trust-propagation](https://github.com/irisnet/cosmos-sdk/tree/bianjie/lcd_spec/docs/spec/lcd#trust-propagation), +the AppHash can be verified by checking voting power against a trusted validator set. Here we just +need to build proof from ABCI state to AppHash. The proof contains two parts: + +* IAVL proof +* Substore to AppHash proof + +### IAVL Proof + +The proof has two types: existance proof and absence proof. If the query key exists in the IAVL +store, then it returns key-value and its existance proof. On the other hand, if the key doesn't +exist, then it only returns absence proof which can demostrate the key definitely doesn't exist. + +### IAVL Existance Proof + +```go +type CommitID struct { + Version int64 + Hash []byte +} + +type storeCore struct { + CommitID CommitID +} + +type MultiStoreCommitID struct { + Name string + Core storeCore +} + +type proofInnerNode struct { + Height int8 + Size int64 + Version int64 + Left []byte + Right []byte +} + +type KeyExistsProof struct { + MultiStoreCommitInfo []MultiStoreCommitID //All substore commitIDs + StoreName string //Current substore name + Height int64 //The commit height of current substore + RootHash cmn.HexBytes //The root hash of this IAVL tree + Version int64 //The version of the key-value in this IAVL tree + InnerNodes []proofInnerNode //The path from to root node to key-value leaf node +} +``` + +The data structure of exist proof is shown as above. The process to build and verify existance proof +is shown as follows: + +![Exist Proof](pics/existProof.png) + +Steps to build proof: + +* Access the IAVL tree from the root node. +* Record the visited nodes in InnerNodes, +* Once the target leaf node is found, assign leaf node version to proof version +* Assign the current IAVL tree height to proof height +* Assign the current IAVL tree rootHash to proof rootHash +* Assign the current substore name to proof StoreName +* Read multistore commitInfo from db by height and assign it to proof StoreCommitInfo + +Steps to verify proof: + +* Build leaf node with key, value and proof version. +* Calculate leaf node hash +* Assign the hash to the first innerNode's rightHash, then calculate first innerNode hash +* Propagate the hash calculation process. If prior innerNode is the left child of next innerNode, then assign the prior innerNode hash to the left hash of next innerNode. Otherwise, assign the prior innerNode hash to the right hash of next innerNode. +* The hash of last innerNode should be equal to the rootHash of this proof. Otherwise, the proof is invalid. + +### IAVL Absence Proof + +As we all know, all IAVL leaf nodes are sorted by the key of each leaf nodes. So we can calculate +the postition of the target key in the whole key set of this IAVL tree. As shown below, we can find +out the left key and the right key. If we can demonstrate that both left key and right key +definitely exist, and they are adjacent nodes. Thus the target key definitely doesn't exist. + +![Absence Proof1](pics/absence1.png) + +If the target key is larger than the right most leaf node or less than the left most key, then the +target key definitely doesn't exist. + +![Absence Proof2](pics/absence2.png)![Absence Proof3](pics/absence3.png) + +```go +type proofLeafNode struct { + KeyBytes cmn.HexBytes + ValueBytes cmn.HexBytes + Version int64 +} + +type pathWithNode struct { + InnerNodes []proofInnerNode + Node proofLeafNode +} + +type KeyAbsentProof struct { + MultiStoreCommitInfo []MultiStoreCommitID + StoreName string + Height int64 + RootHash cmn.HexBytes + Left *pathWithNode // Proof the left key exist + Right *pathWithNode //Proof the right key exist +} +``` + +The above is the data structure of absence proof. Steps to build proof: + +* Access the IAVL tree from the root node. +* Get the deserved index(Marked as INDEX) of the key in whole key set. +* If the returned index equals to 0, the right index should be 0 and left node doesn't exist +* If the returned index equals to the size of the whole key set, the left node index should be INDEX-1 and the right node doesn't exist. +* Otherwise, the right node index should be INDEX and the left node index should be INDEX-1 +* Assign the current IAVL tree height to proof height +* Assign the current IAVL tree rootHash to proof rootHash +* Assign the current substore name to proof StoreName +* Read multistore commitInfo from db by height and assign it to proof StoreCommitInfo + +Steps to verify proof: + +* If only right node exist, verify its exist proof and verify if it is the left most node +* If only left node exist, verify its exist proof and verify if it is the right most node. +* If both right node and left node exist, verify if they are adjacent. + +### Substores to AppHash Proof + +After verify the IAVL proof, then we can start to verify substore proof against AppHash. Firstly, +iterate MultiStoreCommitInfo and find the substore commitID by proof StoreName. Verify if yhe Hash +in commitID equals to proof RootHash. If not, the proof is invalid. Then sort the substore +commitInfo array by the hash of substore name. Finally, build the simple Merkle tree with all +substore commitInfo array and verify if the Merkle root hash equal to appHash. + +![substore proof](pics/substoreProof.png) + +```go +func SimpleHashFromTwoHashes(left []byte, right []byte) []byte { + var hasher = ripemd160.New() + + err := encodeByteSlice(hasher, left) + if err != nil { + panic(err) + } + + err = encodeByteSlice(hasher, right) + if err != nil { + panic(err) + } + + return hasher.Sum(nil) +} + +func SimpleHashFromHashes(hashes [][]byte) []byte { + // Recursive impl. + switch len(hashes) { + case 0: + return nil + case 1: + return hashes[0] + default: + left := SimpleHashFromHashes(hashes[:(len(hashes)+1)/2]) + right := SimpleHashFromHashes(hashes[(len(hashes)+1)/2:]) + return SimpleHashFromTwoHashes(left, right) + } +} +``` + +## Verify block header against validator set + +Above sections refer appHash frequently. But where does the trusted appHash come from? Actually, +appHash exist in block header, so next we need to verify blocks header at specific height against +LCD trusted validator set. The validation flow is shown as follows: + +![commit verification](pics/commitValidation.png) + +When the trusted validator set doesn't match the block header, we need to try to update our +validator set to the height of this block. LCD have a rule that each validator set change should not +affact more than 1/3 voting power. Compare with the trusted validator set, if the voting power of +target validator set changes more than 1/3. We have to verify if there are hidden validator set +change before the target validator set. Only when all validator set changes obey this rule, can our +validator set update be accomplished. + +For instance: + +![Update validator set to height](pics/updateValidatorToHeight.png) + +* Update to 10000, tooMuchChangeErr +* Update to 5050, tooMuchChangeErr +* Update to 2575, Success +* Update to 5050, Success +* Update to 10000,tooMuchChangeErr +* Update to 7525, Success +* Update to 10000, Success + +## Load Balancing + +To improve LCD reliability and TPS, we recommend to connect LCD to more than one fullnode. But the +complexity will increase a lot. So load balancing module will be imported as the adapter. Please +refer to this link for detailed description: [load balancer](load_balancer.md) + +## ICS1 (KeyAPI) + +### [/keys - GET](api.md#keys---get) + +Load the key store: + +```go +db, err := dbm.NewGoLevelDB(KeyDBName, filepath.Join(rootDir, "keys")) +if err != nil { + return nil, err +} + +keybase = client.GetKeyBase(db) +``` + +Iterate through the key store. + +```go +var res []Info +iter := kb.db.Iterator(nil, nil) +defer iter.Close() + +for ; iter.Valid(); iter.Next() { + // key := iter.Key() + info, err := readInfo(iter.Value()) + if err != nil { + return nil, err + } + res = append(res, info) +} + +return res, nil +``` + +Encode the addresses and public keys in bech32. + +```go +bechAccount, err := sdk.Bech32ifyAcc(sdk.Address(info.PubKey.Address().Bytes())) +if err != nil { + return KeyOutput{}, err +} + +bechPubKey, err := sdk.Bech32ifyAccPub(info.PubKey) +if err != nil { + return KeyOutput{}, err +} + +return KeyOutput{ + Name: info.Name, + Address: bechAccount, + PubKey: bechPubKey, +}, nil +``` + +### [/keys/recover - POST](api.md#keys/recover---get) + +1. Load the key store. +2. Parameter checking. Name, password and seed should not be empty. +3. Check for keys with the same name. +4. Build the key from the name, password and seed. +5. Persist the key to key store. + +### [/keys/create - GET](api.md#keys/create---get)** + +1. Load the key store. +2. Create a new key in the key store. +3. Save the key to disk. +4. Return the seed. + +### [/keys/{name} - GET](api.md#keysname---get) + +1. Load the key store. +2. Iterate the whole key store to find the key by name. +3. Encode address and public key in bech32. + +### [/keys/{name} - PUT](api.md#keysname---put) + +1. Load the key store. +2. Iterate the whole key store to find the key by name. +3. Verify if that the old-password matches the current key password. +4. Re-persist the key with the new password. + +### [/keys/{name} - DELETE](api.md#keysname---delete) + +1. Load the key store. +2. Iterate the whole key store to find the key by name. +3. Verify that the specified password matches the current key password. +4. Delete the key from the key store. + +## ICS20 (TokenAPI) + +### [/bank/balance/{account}](api.md#bankbalanceaccount---get) + +1. Decode the address from bech32 to hex. +2. Send a query request to a full node. Ask for proof if required by Gaia Light. +3. Verify the proof against the root of trust. + +### [/bank/create_transfer](api.md#bankcreate_transfer---post) + +1. Check the parameters. +2. Build the transaction with the specified parameters. +3. Serialise the transaction and return the JSON encoded sign bytes. + +## ICS21 (StakingAPI) + +### [/stake/delegators/{delegatorAddr}](api.md#stakedelegatorsdelegatorAddr---get) + +TODO + +### [/stake/delegators/{delegatorAddr}/txs](api.md#stakedelegatorsdelegatorAddrtxs---get) + +TODO + +### [/stake/delegators/{delegatorAddr}/delegations](api.md#stakedelegatorsdelegatorAddrdelegations---post) + +TODO + +### [/stake/delegators/{delegatorAddr}/delegations/{validatorAddr}](api.md#stakedelegatorsdelegatorAddrdelegationsvalidatorAddr---get) + +TODO + +### [/stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr}](api.md#stakedelegatorsdelegatorAddrunbonding_delegationsvalidatorAddr---get) + +TODO + +### [/stake/validators](api.md#stakevalidators---get) + +TODO + +### [/stake/validators/{validatorAddr}](api.md#stakevalidatorsvalidatorAddr---get) + +TODO diff --git a/docs/light/todo.md b/docs/light/todo.md new file mode 100644 index 000000000..ce1f8508a --- /dev/null +++ b/docs/light/todo.md @@ -0,0 +1,16 @@ +# TODO + +This document is a place to gather all points for future development. + +## API + +* finalise ICS0 - TendermintAPI + * make sure that the explorer and voyager can use it +* add ICS21 - StakingAPI +* add ICS22 - GovernanceAPI +* split Gaia Light into reusable components that other zones can leverage + * it should be possible to register extra standards on the light client + * the setup should be similar to how the app is currently started +* implement Gaia light and the general light client in Rust + * export the API as a C interface + * write thin wrappers around the C interface in JS, Swift and Kotlin/Java diff --git a/docs/sdk/clients.md b/docs/sdk/clients.md index 46a4756f1..846cc3b2a 100644 --- a/docs/sdk/clients.md +++ b/docs/sdk/clients.md @@ -12,27 +12,25 @@ `gaiacli` is the command line interface to manage accounts and transactions on Cosmos testnets. Here is a list of useful `gaiacli` commands, including usage examples. -### Key Types +### Keys + +#### Key Types There are three types of key representations that are used: - `cosmosaccaddr` - - Derived from account keys generated by `gaiacli keys add` - Used to receive funds - e.g. `cosmosaccaddr15h6vd5f0wqps26zjlwrc6chah08ryu4hzzdwhc` - - `cosmosaccpub` - - Derived from account keys generated by `gaiacli keys add` - e.g. `cosmosaccpub1zcjduc3q7fu03jnlu2xpl75s2nkt7krm6grh4cc5aqth73v0zwmea25wj2hsqhlqzm` - - `cosmosvalpub` - Generated when the node is created with `gaiad init`. - Get this value with `gaiad tendermint show_validator` - e.g. `cosmosvalpub1zcjduc3qcyj09qc03elte23zwshdx92jm6ce88fgc90rtqhjx8v0608qh5ssp0w94c` -### Generate Keys +#### Generate Keys You'll need an account private and public key pair \(a.k.a. `sk, pk` respectively\) to be able to receive funds, send txs, bond tx, etc. @@ -66,10 +64,14 @@ gaiad tendermint show_validator We strongly recommend _NOT_ using the same passphrase for multiple keys. The Tendermint team and the Interchain Foundation will not be responsible for the loss of funds. ::: -### Get Tokens +### Account + +#### Get Tokens The best way to get tokens is from the [Cosmos Testnet Faucet](https://faucetcosmos.network). If the faucet is not working for you, try asking [#cosmos-validators](https://riot.im/app/#/room/#cosmos-validators:matrix.org). The faucet needs the `cosmosaccaddr` from the account you wish to use for staking. +#### Query Account balance + After receiving tokens to your address, you can view your account's balance by typing: ```bash @@ -79,7 +81,6 @@ gaiacli account ::: warning Note When you query an account balance with zero tokens, you will get this error: `No account with address was found in the state.` This can also happen if you fund the account before your node has fully synced with the chain. These are both normal. -We're working on improving our error messages! ::: ### Send Tokens @@ -87,7 +88,7 @@ We're working on improving our error messages! ```bash gaiacli send \ --amount=10faucetToken \ - --chain-id=gaia-7005 \ + --chain-id= \ --name= \ --to= ``` @@ -109,21 +110,40 @@ You can also check your balance at a given block by using the `--block` flag: gaiacli account --block= ``` -### Delegate +### Staking + +#### Set up a Validator + +Please refer to the [Validator Setup](https://cosmos.network/docs/validators/validator-setup.html) section for a more complete guide on how to set up a validator-candidate. + +#### Delegate to a Validator On the upcoming mainnet, you can delegate `atom` to a validator. These [delegators](/resources/delegators-faq) can receive part of the validator's fee revenue. Read more about the [Cosmos Token Model](https://github.com/cosmos/cosmos/raw/master/Cosmos_Token_Model.pdf). -### Bond Tokens +##### Query Validators -On the testnet, we delegate `steak` instead of `atom`. Here's how you can bond tokens to a testnet validator: +You can query the list of all validators of a specific chain: + +```bash +gaiacli stake validators +``` + +If you want to get the information of a single validator you can check it with: + +```bash +gaiacli stake validator +``` + +#### Bond Tokens + +On the testnet, we delegate `steak` instead of `atom`. Here's how you can bond tokens to a testnet validator (*i.e.* delegate): ```bash gaiacli stake delegate \ --amount=10steak \ - --address-delegator= \ --address-validator=$(gaiad tendermint show_validator) \ --name= \ - --chain-id=gaia-7005 + --chain-id= ``` While tokens are bonded, they are pooled with all the other bonded tokens in the network. Validators and delegators obtain a percentage of shares that equal their stake in this pool. @@ -132,32 +152,197 @@ While tokens are bonded, they are pooled with all the other bonded tokens in the Don't use more `steak` thank you have! You can always get more by using the [Faucet](https://faucetcosmos.network/)! ::: -### Unbond Tokens +##### Query Delegations -If for any reason the validator misbehaves, or you want to unbond a certain amount of tokens, use this following command. You can unbond a specific amount of`shares`\(eg:`12.1`\) or all of them \(`MAX`\). +Once submitted a delegation to a validator, you can see it's information by using the following command: ```bash -gaiacli stake unbond \ - --address-delegator= \ - --address-validator=$(gaiad tendermint show_validator) \ - --shares=MAX \ - --name= \ - --chain-id=gaia-7005 -``` - -You can check your balance and your stake delegation to see that the unbonding went through successfully. - -```bash -gaiacli account - gaiacli stake delegation \ - --address-delegator= \ - --address-validator=$(gaiad tendermint show_validator) \ - --chain-id=gaia-7005 + --address-delegator= \ + --address-validator=$(gaiad tendermint show-validator) ``` -## Light Client Daemon +Or if you want to check all your current delegations with disctinct validators: + +```bash +gaiacli stake delegations +``` + +You can also get previous delegation(s) status by adding the `--height` flag. + +#### Unbond Tokens + +If for any reason the validator misbehaves, or you just want to unbond a certain amount of tokens, use this following command. You can unbond a specific `shares-amount` (eg:`12.1`\) or a `shares-percent` (eg:`25`) with the corresponding flags. + +```bash +gaiacli stake unbond begin \ + --address-validator=$(gaiad tendermint show-validator) \ + --shares-percent=100 \ + --from= \ + --chain-id= +``` + +Later you must complete the unbonding process by using the `gaiacli stake unbond complete` command: + +```bash +gaiacli stake unbond complete \ + --address-validator=$(gaiad tendermint show-validator) \ + --from= \ + --chain-id= +``` + +##### Query Unbonding-Delegations + +Once you begin an unbonding-delegation, you can see it's information by using the following command: + +```bash +gaiacli stake unbonding-delegation \ + --address-delegator= \ + --address-validator=$(gaiad tendermint show-validator) \ +``` + +Or if you want to check all your current unbonding-delegations with disctinct validators: + +```bash +gaiacli stake unbonding-delegations +``` + +You can also get previous unbonding-delegation(s) status by adding the `--height` flag. + +#### Redelegate Tokens + +A redelegation is a type delegation that allows you to bond illiquid tokens from one validator to another: + +```bash +gaiacli stake redelegate begin \ + --address-validator-source=$(gaiad tendermint show-validator) \ + --address-validator-dest= \ + --shares-percent=50 \ + --from= \ + --chain-id= +``` + +Here you can also redelegate a specific `shares-amount` or a `shares-percent` with the corresponding flags. + +Later you must complete the redelegation process by using the `gaiacli stake redelegate complete` command: + +```bash +gaiacli stake unbond complete \ + --address-validator=$(gaiad tendermint show-validator) \ + --from= \ + --chain-id= +``` + +##### Query Redelegations + +Once you begin an redelegation, you can see it's information by using the following command: + +```bash +gaiacli stake redelegation \ + --address-delegator= \ + --address-validator-source=$(gaiad tendermint show-validator) \ + --address-validator-dest= \ +``` + +Or if you want to check all your current unbonding-delegations with disctinct validators: + +```bash +gaiacli stake redelegations +``` + +You can also get previous redelegation(s) status by adding the `--height` flag. + +### Governance + +Governance is the process from which users in the Cosmos Hub can come to consensus on software upgrades, parameters of the mainnet or on custom text proposals. This is done through voting on proposals, which will be submitted by `Atom` holders on the mainnet. + +Some considerations about the voting process: + +- Voting is done by bonded `Atom` holders on a 1 bonded `Atom` 1 vote basis +- Delegators inherit the vote of their validator if they don't vote +- **Validators MUST vote on every proposal**. If a validator does not vote on a proposal, they will be **partially slashed** +- Votes are tallied at the end of the voting period (2 weeks on mainnet). Each address can vote multiple times to update its `Option` value (paying the transaction fee each time), only the last casted vote will count as valid +- Voters can choose between options `Yes`, `No`, `NoWithVeto` and `Abstain` + At the end of the voting period, a proposal is accepted if `(YesVotes/(YesVotes+NoVotes+NoWithVetoVotes))>1/2` and `(NoWithVetoVotes/(YesVotes+NoVotes+NoWithVetoVotes))<1/3`. It is rejected otherwise + +For more information about the governance process and how it works, please check out the Governance module [specification](https://github.com/cosmos/cosmos-sdk/tree/develop/docs/spec/governance). + +#### Create a Governance proposal + +In order to create a governance proposal, you must submit an initial deposit along with the proposal details: + +- `title`: Title of the proposal +- `description`: Description of the proposal +- `type`: Type of proposal. Must be of value _Text_ (types _SoftwareUpgrade_ and _ParameterChange_ not supported yet). + +```bash +gaiacli gov submit-proposal \ + --title= \ + --description=<description> \ + --type=<Text/ParameterChange/SoftwareUpgrade> \ + --proposer=<account_cosmosaccaddr> \ + --deposit=<40steak> \ + --from=<name> \ + --chain-id=<chain_id> +``` + +##### Query proposals + +Once created, you can now query information of the proposal: + +```bash +gaiacli gov query-proposal \ + --proposal-id=<proposal_id> +``` + +Or query all available proposals: + +```bash +gaiacli gov query-proposals +``` + +You can also query proposals filtered by `voter` or `depositer` by using the corresponding flags. + +#### Increase deposit + +In order for a proposal to be broadcasted to the network, the amount deposited must be above a `minDeposit` value (default: `10 steak`). If the proposal you previously created didn't meet this requirement, you can still increase the total amount deposited to activate it. Once the minimum deposit is reached, the proposal enters voting period: + +```bash +gaiacli gov deposit \ + --proposal-id=<proposal_id> \ + --depositer=<account_cosmosaccaddr> \ + --deposit=<200steak> \ + --from=<name> \ + --chain-id=<chain_id> +``` + +> _NOTE_: Proposals that don't meet this requirement will be deleted after `MaxDepositPeriod` is reached. + +#### Vote on a proposal + +After a proposal's deposit reaches the `MinDeposit` value, the voting period opens. Bonded `Atom` holders can then cast vote on it: + +```bash +gaiacli gov vote \ + --proposal-id=<proposal_id> \ + --voter=<account_cosmosaccaddr> \ + --option=<Yes/No/NoWithVeto/Abstain> \ + --from=<name> \ + --chain-id=<chain_id> +``` + +##### Query vote + +Check the vote with the option you just submitted: + +```bash +gaiacli gov query-vote \ + --proposal-id=<proposal_id> \ + --voter=<account_cosmosaccaddr> +``` + +## Gaia-Lite ::: tip Note -🚧 We are actively working on documentation for the LCD. +🚧 We are actively working on documentation for Gaia-lite. ::: diff --git a/docs/sdk/core/app1.md b/docs/sdk/core/app1.md index 6977d2ddc..54121d05b 100644 --- a/docs/sdk/core/app1.md +++ b/docs/sdk/core/app1.md @@ -27,7 +27,7 @@ type Msg interface { // This is what is signed. GetSignBytes() []byte - // Signers returns the addrs of signers that must sign. + // GetSigners returns the addrs of signers that must sign. // CONTRACT: All signatures must be present to be valid. // CONTRACT: Returns addrs in some deterministic order. GetSigners() []AccAddress @@ -49,7 +49,7 @@ type MsgSend struct { } // Implements Msg. -func (msg MsgSend) Type() string { return "bank" } +func (msg MsgSend) Type() string { return "send" } ``` It specifies that the message should be JSON marshaled and signed by the sender: @@ -421,22 +421,18 @@ Here is the complete setup for App1: ```go func NewApp1(logger log.Logger, db dbm.DB) *bapp.BaseApp { - cdc := wire.NewCodec() // Create the base application object. - app := bapp.NewBaseApp(app1Name, cdc, logger, db) + app := bapp.NewBaseApp(app1Name, logger, db, tx1Decoder) // Create a capability key for accessing the account store. keyAccount := sdk.NewKVStoreKey("acc") - // Determine how transactions are decoded. - app.SetTxDecoder(txDecoder) - // Register message routes. // Note the handler receives the keyAccount and thus // gets access to the account store. app.Router(). - AddRoute("bank", NewApp1Handler(keyAccount)) + AddRoute("send", NewApp1Handler(keyAccount)) // Mount stores and load the latest state. app.MountStoresIAVL(keyAccount) @@ -454,11 +450,11 @@ We'll talk about how to connect this app object with the CLI, a REST API, the logger, and the filesystem later in the tutorial. For now, note that this is where we register handlers for messages and grant them access to stores. -Here, we have only a single Msg type, `bank`, a single store for accounts, and a single handler. +Here, we have only a single Msg type, `send`, a single store for accounts, and a single handler. The handler is granted access to the store by giving it the capability key. In future apps, we'll have multiple stores and handlers, and not every handler will get access to every store. -After setting the transaction decoder and the message handling routes, the final +After setting the message handling routes, the final step is to mount the stores and load the latest version. Since we only have one store, we only mount one. diff --git a/docs/sdk/core/app2.md b/docs/sdk/core/app2.md index 0158976cd..9a689cca6 100644 --- a/docs/sdk/core/app2.md +++ b/docs/sdk/core/app2.md @@ -1,6 +1,6 @@ # Transactions -In the previous app we built a simple `bank` with one message type for sending +In the previous app we built a simple bank with one message type `send` for sending coins and one store for storing accounts. Here we build `App2`, which expands on `App1` by introducing @@ -144,10 +144,14 @@ func NewCodec() *wire.Codec { cdc.RegisterInterface((*sdk.Msg)(nil), nil) cdc.RegisterConcrete(MsgSend{}, "example/MsgSend", nil) cdc.RegisterConcrete(MsgIssue{}, "example/MsgIssue", nil) + crypto.RegisterAmino(cdc) return cdc } ``` +Note: We also register the types in the `tendermint/tendermint/crypto` module so that `crypto.PubKey` +is encoded/decoded correctly. + Amino supports encoding and decoding in both a binary and JSON format. See the [codec API docs](https://godoc.org/github.com/tendermint/go-amino#Codec) for more details. @@ -162,17 +166,26 @@ type app2Tx struct { sdk.Msg PubKey crypto.PubKey - Signature crypto.Signature + Signature []byte } // This tx only has one Msg. func (tx app2Tx) GetMsgs() []sdk.Msg { return []sdk.Msg{tx.Msg} } -``` -We don't need a custom TxDecoder function anymore, since we're just using the -Amino codec! +// Amino decode app2Tx. Capable of decoding both MsgSend and MsgIssue +func tx2Decoder(cdc *wire.Codec) sdk.TxDecoder { + return func(txBytes []byte) (sdk.Tx, sdk.Error) { + var tx app2Tx + err := cdc.UnmarshalBinary(txBytes, &tx) + if err != nil { + return nil, sdk.ErrTxDecode(err.Error()) + } + return tx, nil + } +} +``` ## AnteHandler @@ -210,28 +223,22 @@ func antehandler(ctx sdk.Context, tx sdk.Tx) (_ sdk.Context, _ sdk.Result, abort return ctx, sdk.ErrTxDecode("Tx must be of format app2Tx").Result(), true } - // expect only one msg in app2Tx + // expect only one msg and one signer in app2Tx msg := tx.GetMsgs()[0] - - signerAddrs := msg.GetSigners() - - if len(signerAddrs) != len(appTx.GetSignatures()) { - return ctx, sdk.ErrUnauthorized("Number of signatures do not match required amount").Result(), true - } + signerAddr := msg.GetSigners()[0] signBytes := msg.GetSignBytes() - for i, addr := range signerAddrs { - sig := appTx.GetSignatures()[i] - // check that submitted pubkey belongs to required address - if !bytes.Equal(sig.PubKey.Address(), addr) { - return ctx, sdk.ErrUnauthorized("Provided Pubkey does not match required address").Result(), true - } + sig := appTx.GetSignature() - // check that signature is over expected signBytes - if !sig.PubKey.VerifyBytes(signBytes, sig.Signature) { - return ctx, sdk.ErrUnauthorized("Signature verification failed").Result(), true - } + // check that submitted pubkey belongs to required address + if !bytes.Equal(appTx.PubKey.Address(), signerAddr) { + return ctx, sdk.ErrUnauthorized("Provided Pubkey does not match required address").Result(), true + } + + // check that signature is over expected signBytes + if !appTx.PubKey.VerifyBytes(signBytes, sig) { + return ctx, sdk.ErrUnauthorized("Signature verification failed").Result(), true } // authentication passed, app to continue processing by sending msg to handler @@ -249,7 +256,7 @@ func NewApp2(logger log.Logger, db dbm.DB) *bapp.BaseApp { cdc := NewCodec() // Create the base application object. - app := bapp.NewBaseApp(app2Name, cdc, logger, db) + app := bapp.NewBaseApp(app2Name, logger, db, txDecoder(cdc)) // Create a key for accessing the account store. keyAccount := sdk.NewKVStoreKey("acc") @@ -280,9 +287,8 @@ key for a second store that is *only* passed to a second handler, the `handleMsgIssue`. The first `handleMsgSend` has no access to this second store and cannot read or write to it, ensuring a strong separation of concerns. -Note also that we do not need to use `SetTxDecoder` here - now that we're using -Amino, we simply create a codec, register our types on the codec, and pass the -codec into `NewBaseApp`. The SDK takes care of the rest for us! +Note now that we're using Amino, we create a codec, register our types on the codec, and pass the +codec into our TxDecoder constructor, `tx2Decoder`. The SDK takes care of the rest for us! ## Conclusion diff --git a/docs/sdk/core/app3.md b/docs/sdk/core/app3.md index 459f48c83..203f61e44 100644 --- a/docs/sdk/core/app3.md +++ b/docs/sdk/core/app3.md @@ -160,7 +160,7 @@ The standard form for signatures is `StdSignature`: // the first transaction made by the account. type StdSignature struct { crypto.PubKey `json:"pub_key"` // optional - crypto.Signature `json:"signature"` + []byte `json:"signature"` AccountNumber int64 `json:"account_number"` Sequence int64 `json:"sequence"` } @@ -328,7 +328,7 @@ func NewApp3(logger log.Logger, db dbm.DB) *bapp.BaseApp { cdc := NewCodec() // Create the base application object. - app := bapp.NewBaseApp(app3Name, cdc, logger, db) + app := bapp.NewBaseApp(app3Name, logger, db, auth.DefaultTxDecoder(cdc)) // Create a key for accessing the account store. keyAccount := sdk.NewKVStoreKey("acc") @@ -361,6 +361,9 @@ and receives only the `bank.Keeper`. See the [x/bank API docs](https://godoc.org/github.com/cosmos/cosmos-sdk/x/bank) for more details. +We also use the default txDecoder in `x/auth`, which decodes amino-encoded +`auth.StdTx` transactions. + ## Conclusion Armed with native modules for authentication and coin transfer, diff --git a/docs/sdk/core/examples/app1.go b/docs/sdk/core/examples/app1.go index b208f75cf..ba33c6120 100644 --- a/docs/sdk/core/examples/app1.go +++ b/docs/sdk/core/examples/app1.go @@ -9,7 +9,6 @@ import ( bapp "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/wire" ) const ( @@ -18,17 +17,12 @@ const ( func NewApp1(logger log.Logger, db dbm.DB) *bapp.BaseApp { - cdc := wire.NewCodec() - // Create the base application object. - app := bapp.NewBaseApp(app1Name, cdc, logger, db) + app := bapp.NewBaseApp(app1Name, logger, db, tx1Decoder) // Create a key for accessing the account store. keyAccount := sdk.NewKVStoreKey("acc") - // Determine how transactions are decoded. - app.SetTxDecoder(txDecoder) - // Register message routes. // Note the handler gets access to the account store. app.Router(). @@ -225,7 +219,7 @@ func (tx app1Tx) GetMsgs() []sdk.Msg { } // JSON decode MsgSend. -func txDecoder(txBytes []byte) (sdk.Tx, sdk.Error) { +func tx1Decoder(txBytes []byte) (sdk.Tx, sdk.Error) { var tx app1Tx err := json.Unmarshal(txBytes, &tx) if err != nil { diff --git a/docs/sdk/core/examples/app2.go b/docs/sdk/core/examples/app2.go index 12eab1c51..3c7f71f6d 100644 --- a/docs/sdk/core/examples/app2.go +++ b/docs/sdk/core/examples/app2.go @@ -5,7 +5,9 @@ import ( "encoding/json" "fmt" + "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" + cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino" cmn "github.com/tendermint/tendermint/libs/common" dbm "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" @@ -13,7 +15,6 @@ import ( bapp "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" - "github.com/cosmos/cosmos-sdk/x/auth" ) const ( @@ -29,6 +30,7 @@ func NewCodec() *wire.Codec { cdc.RegisterInterface((*sdk.Msg)(nil), nil) cdc.RegisterConcrete(MsgSend{}, "example/MsgSend", nil) cdc.RegisterConcrete(MsgIssue{}, "example/MsgIssue", nil) + cryptoAmino.RegisterAmino(cdc) return cdc } @@ -37,7 +39,7 @@ func NewApp2(logger log.Logger, db dbm.DB) *bapp.BaseApp { cdc := NewCodec() // Create the base application object. - app := bapp.NewBaseApp(app2Name, cdc, logger, db) + app := bapp.NewBaseApp(app2Name, logger, db, tx2Decoder(cdc)) // Create a key for accessing the account store. keyAccount := sdk.NewKVStoreKey("acc") @@ -179,7 +181,9 @@ type coinInfo struct { // Simple tx to wrap the Msg. type app2Tx struct { sdk.Msg - Signatures []auth.StdSignature + + PubKey crypto.PubKey + Signature []byte } // This tx only has one Msg. @@ -187,8 +191,20 @@ func (tx app2Tx) GetMsgs() []sdk.Msg { return []sdk.Msg{tx.Msg} } -func (tx app2Tx) GetSignatures() []auth.StdSignature { - return tx.Signatures +func (tx app2Tx) GetSignature() []byte { + return tx.Signature +} + +// Amino decode app2Tx. Capable of decoding both MsgSend and MsgIssue +func tx2Decoder(cdc *wire.Codec) sdk.TxDecoder { + return func(txBytes []byte) (sdk.Tx, sdk.Error) { + var tx app2Tx + err := cdc.UnmarshalBinary(txBytes, &tx) + if err != nil { + return nil, sdk.ErrTxDecode(err.Error()) + } + return tx, nil + } } //------------------------------------------------------------------ @@ -202,28 +218,22 @@ func antehandler(ctx sdk.Context, tx sdk.Tx) (_ sdk.Context, _ sdk.Result, abort return ctx, sdk.ErrTxDecode("Tx must be of format app2Tx").Result(), true } - // expect only one msg in app2Tx + // expect only one msg and one signer in app2Tx msg := tx.GetMsgs()[0] - - signerAddrs := msg.GetSigners() - - if len(signerAddrs) != len(appTx.GetSignatures()) { - return ctx, sdk.ErrUnauthorized("Number of signatures do not match required amount").Result(), true - } + signerAddr := msg.GetSigners()[0] signBytes := msg.GetSignBytes() - for i, addr := range signerAddrs { - sig := appTx.GetSignatures()[i] - // check that submitted pubkey belongs to required address - if !bytes.Equal(sig.PubKey.Address(), addr) { - return ctx, sdk.ErrUnauthorized("Provided Pubkey does not match required address").Result(), true - } + sig := appTx.GetSignature() - // check that signature is over expected signBytes - if !sig.PubKey.VerifyBytes(signBytes, sig.Signature) { - return ctx, sdk.ErrUnauthorized("Signature verification failed").Result(), true - } + // check that submitted pubkey belongs to required address + if !bytes.Equal(appTx.PubKey.Address(), signerAddr) { + return ctx, sdk.ErrUnauthorized("Provided Pubkey does not match required address").Result(), true + } + + // check that signature is over expected signBytes + if !appTx.PubKey.VerifyBytes(signBytes, sig) { + return ctx, sdk.ErrUnauthorized("Signature verification failed").Result(), true } // authentication passed, app to continue processing by sending msg to handler diff --git a/docs/sdk/core/examples/app2_test.go b/docs/sdk/core/examples/app2_test.go new file mode 100644 index 000000000..913903488 --- /dev/null +++ b/docs/sdk/core/examples/app2_test.go @@ -0,0 +1,84 @@ +package app + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/crypto/ed25519" + + "github.com/stretchr/testify/require" +) + +// Test encoding of app2Tx is correct with both msg types +func TestEncoding(t *testing.T) { + // Create privkeys and addresses + priv1 := ed25519.GenPrivKey() + priv2 := ed25519.GenPrivKey() + addr1 := priv1.PubKey().Address().Bytes() + addr2 := priv2.PubKey().Address().Bytes() + + sendMsg := MsgSend{ + From: addr1, + To: addr2, + Amount: sdk.Coins{{"testCoins", sdk.NewInt(100)}}, + } + + // Construct transaction + signBytes := sendMsg.GetSignBytes() + sig, err := priv1.Sign(signBytes) + if err != nil { + panic(err) + } + + sendTxBefore := app2Tx{ + Msg: sendMsg, + PubKey: priv1.PubKey(), + Signature: sig, + } + + cdc := NewCodec() + testTxDecoder := tx2Decoder(cdc) + + encodedSendTx, err := cdc.MarshalBinary(sendTxBefore) + + require.Nil(t, err, "Error encoding sendTx") + + var tx1 sdk.Tx + tx1, err = testTxDecoder(encodedSendTx) + require.Nil(t, err, "Error decoding sendTx") + + sendTxAfter := tx1.(app2Tx) + + require.Equal(t, sendTxBefore, sendTxAfter, "Transaction changed after encoding/decoding") + + issueMsg := MsgIssue{ + Issuer: addr1, + Receiver: addr2, + Coin: sdk.Coin{"testCoin", sdk.NewInt(100)}, + } + + signBytes = issueMsg.GetSignBytes() + sig, err = priv1.Sign(signBytes) + if err != nil { + panic(err) + } + + issueTxBefore := app2Tx{ + Msg: issueMsg, + PubKey: priv1.PubKey(), + Signature: sig, + } + + encodedIssueTx, err2 := cdc.MarshalBinary(issueTxBefore) + + require.Nil(t, err2, "Error encoding issueTx") + + var tx2 sdk.Tx + tx2, err2 = testTxDecoder(encodedIssueTx) + require.Nil(t, err2, "Error decoding issue Tx") + + issueTxAfter := tx2.(app2Tx) + + require.Equal(t, issueTxBefore, issueTxAfter, "Transaction changed after encoding/decoding") + +} diff --git a/docs/sdk/core/examples/app3.go b/docs/sdk/core/examples/app3.go index 853ad687e..f7ae88c42 100644 --- a/docs/sdk/core/examples/app3.go +++ b/docs/sdk/core/examples/app3.go @@ -1,12 +1,14 @@ package app import ( + cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino" cmn "github.com/tendermint/tendermint/libs/common" dbm "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" bapp "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/bank" ) @@ -18,10 +20,10 @@ const ( func NewApp3(logger log.Logger, db dbm.DB) *bapp.BaseApp { // Create the codec with registered Msg types - cdc := NewCodec() + cdc := UpdatedCodec() // Create the base application object. - app := bapp.NewBaseApp(app3Name, cdc, logger, db) + app := bapp.NewBaseApp(app3Name, logger, db, auth.DefaultTxDecoder(cdc)) // Create a key for accessing the account store. keyAccount := sdk.NewKVStoreKey("acc") @@ -37,7 +39,7 @@ func NewApp3(logger log.Logger, db dbm.DB) *bapp.BaseApp { // Register message routes. // Note the handler gets access to app.Router(). - AddRoute("send", bank.NewHandler(coinKeeper)) + AddRoute("bank", bank.NewHandler(coinKeeper)) // Mount stores and load the latest state. app.MountStoresIAVL(keyAccount, keyFees) @@ -47,3 +49,14 @@ func NewApp3(logger log.Logger, db dbm.DB) *bapp.BaseApp { } return app } + +// Update codec from app2 to register imported modules +func UpdatedCodec() *wire.Codec { + cdc := wire.NewCodec() + cdc.RegisterInterface((*sdk.Msg)(nil), nil) + cdc.RegisterConcrete(MsgSend{}, "example/MsgSend", nil) + cdc.RegisterConcrete(MsgIssue{}, "example/MsgIssue", nil) + auth.RegisterWire(cdc) + cryptoAmino.RegisterAmino(cdc) + return cdc +} diff --git a/docs/sdk/core/examples/app4.go b/docs/sdk/core/examples/app4.go index a8ef37cee..a4432b3da 100644 --- a/docs/sdk/core/examples/app4.go +++ b/docs/sdk/core/examples/app4.go @@ -19,10 +19,10 @@ const ( func NewApp4(logger log.Logger, db dbm.DB) *bapp.BaseApp { - cdc := NewCodec() + cdc := UpdatedCodec() // Create the base application object. - app := bapp.NewBaseApp(app3Name, cdc, logger, db) + app := bapp.NewBaseApp(app4Name, logger, db, auth.DefaultTxDecoder(cdc)) // Create a key for accessing the account store. keyAccount := sdk.NewKVStoreKey("acc") @@ -43,7 +43,7 @@ func NewApp4(logger log.Logger, db dbm.DB) *bapp.BaseApp { // Register message routes. // Note the handler gets access to the account store. app.Router(). - AddRoute("send", bank.NewHandler(coinKeeper)) + AddRoute("bank", bank.NewHandler(coinKeeper)) // Mount stores and load the latest state. app.MountStoresIAVL(keyAccount, keyFees) diff --git a/docs/sdk/core/examples/app4_test.go b/docs/sdk/core/examples/app4_test.go new file mode 100644 index 000000000..7d95d7b57 --- /dev/null +++ b/docs/sdk/core/examples/app4_test.go @@ -0,0 +1,142 @@ +package app + +import ( + "encoding/json" + "os" + "testing" + + "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto/ed25519" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" + + bapp "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/bank" +) + +// Create and return App4 instance +func newTestChain() *bapp.BaseApp { + logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app") + db := dbm.NewMemDB() + return NewApp4(logger, db) +} + +// Initialize all provided addresses with 100 testCoin +func InitTestChain(bc *bapp.BaseApp, chainID string, addrs ...sdk.AccAddress) { + var accounts []*GenesisAccount + for _, addr := range addrs { + acc := GenesisAccount{ + Address: addr, + Coins: sdk.Coins{{"testCoin", sdk.NewInt(100)}}, + } + accounts = append(accounts, &acc) + } + accountState := GenesisState{accounts} + genState, err := json.Marshal(accountState) + if err != nil { + panic(err) + } + bc.InitChain(abci.RequestInitChain{ChainId: chainID, AppStateBytes: genState}) +} + +// Generate basic SpendMsg with one input and output +func GenerateSpendMsg(sender, receiver sdk.AccAddress, amount sdk.Coins) bank.MsgSend { + return bank.MsgSend{ + Inputs: []bank.Input{{sender, amount}}, + Outputs: []bank.Output{{receiver, amount}}, + } +} + +// Test spending nonexistent funds fails +func TestBadMsg(t *testing.T) { + bc := newTestChain() + + // Create privkeys and addresses + priv1 := ed25519.GenPrivKey() + priv2 := ed25519.GenPrivKey() + addr1 := priv1.PubKey().Address().Bytes() + addr2 := priv2.PubKey().Address().Bytes() + + // Attempt to spend non-existent funds + msg := GenerateSpendMsg(addr1, addr2, sdk.Coins{{"testCoin", sdk.NewInt(100)}}) + + // Construct transaction + fee := auth.StdFee{ + Gas: 1000000000000000, + Amount: sdk.Coins{{"testCoin", sdk.NewInt(0)}}, + } + signBytes := auth.StdSignBytes("test-chain", 0, 0, fee, []sdk.Msg{msg}, "") + sig, err := priv1.Sign(signBytes) + if err != nil { + panic(err) + } + sigs := []auth.StdSignature{{ + PubKey: priv1.PubKey(), + Signature: sig, + AccountNumber: 0, + Sequence: 0, + }} + + tx := auth.StdTx{ + Msgs: []sdk.Msg{msg}, + Fee: fee, + Signatures: sigs, + Memo: "", + } + + bc.BeginBlock(abci.RequestBeginBlock{Header: abci.Header{ChainID: "test-chain"}}) + + // Deliver the transaction + res := bc.Deliver(tx) + + // Check that tx failed + require.False(t, res.IsOK(), "Invalid tx passed") + +} + +func TestMsgSend(t *testing.T) { + bc := newTestChain() + + priv1 := ed25519.GenPrivKey() + priv2 := ed25519.GenPrivKey() + addr1 := priv1.PubKey().Address().Bytes() + addr2 := priv2.PubKey().Address().Bytes() + + InitTestChain(bc, "test-chain", addr1) + + // Send funds to addr2 + msg := GenerateSpendMsg(addr1, addr2, sdk.Coins{{"testCoin", sdk.NewInt(100)}}) + + fee := auth.StdFee{ + Gas: 1000000000000000, + Amount: sdk.Coins{{"testCoin", sdk.NewInt(0)}}, + } + signBytes := auth.StdSignBytes("test-chain", 0, 0, fee, []sdk.Msg{msg}, "") + sig, err := priv1.Sign(signBytes) + if err != nil { + panic(err) + } + sigs := []auth.StdSignature{{ + PubKey: priv1.PubKey(), + Signature: sig, + AccountNumber: 0, + Sequence: 0, + }} + + tx := auth.StdTx{ + Msgs: []sdk.Msg{msg}, + Fee: fee, + Signatures: sigs, + Memo: "", + } + + bc.BeginBlock(abci.RequestBeginBlock{}) + + res := bc.Deliver(tx) + + require.True(t, res.IsOK(), res.Log) + +} diff --git a/docs/sdk/cosmos-sdk-cli.md b/docs/sdk/cosmos-sdk-cli.md new file mode 100644 index 000000000..615d72252 --- /dev/null +++ b/docs/sdk/cosmos-sdk-cli.md @@ -0,0 +1,34 @@ +# cosmos-sdk-cli +Create a new blockchain project based on cosmos-sdk with a single command. + +--- + +# Installation + +```shell +$ go get github.com/cosmos/cosmos-sdk +$ cd $GOPATH/src/github.com/cosmos/cosmos-sdk +$ make install_cosmos-sdk-cli +``` + +This will install a binary cosmos-sdk-cli + +# Creating a new project + +**$cosmos-sdk-cli init** _Your-Project-Name_ + +This will initialize a project, the dependencies, directory structures with the specified project name. + +### Example: +```shell +$ cosmos-sdk-cli init testzone -p github.com/your_user_name/testzone +``` +`-p [remote-project-path]`. If this is not provided, it creates testzone under $GOPATH/src/ + + +```shell +$ cd $GOPATH/src/github.com/your_user_name/testzone +$ make +``` +This will create two binaries(testzonecli and testzoned) under bin folder. testzoned is the full node of the application which you can run, and testzonecli is your light client. + diff --git a/docs/sdk/gaiacli.md b/docs/sdk/gaiacli.md deleted file mode 100644 index d1b0261a0..000000000 --- a/docs/sdk/gaiacli.md +++ /dev/null @@ -1,147 +0,0 @@ -# Gaia CLI - -`gaiacli` is the command line interface to manage accounts and transactions on Cosmos testnets. Here is a list of useful `gaiacli` commands, including usage examples. - -## Key Types - -There are three types of key representations that are used: - -- `cosmosaccaddr` - - - Derived from account keys generated by `gaiacli keys add` - - Used to receive funds - - e.g. `cosmosaccaddr15h6vd5f0wqps26zjlwrc6chah08ryu4hzzdwhc` - -- `cosmosaccpub` - - - Derived from account keys generated by `gaiacli keys add` - - e.g. `cosmosaccpub1zcjduc3q7fu03jnlu2xpl75s2nkt7krm6grh4cc5aqth73v0zwmea25wj2hsqhlqzm` - -- `cosmosvalpub` - - Generated when the node is created with `gaiad init`. - - Get this value with `gaiad tendermint show_validator` - - e.g. `cosmosvalpub1zcjduc3qcyj09qc03elte23zwshdx92jm6ce88fgc90rtqhjx8v0608qh5ssp0w94c` - -## Generate Keys - -You'll need an account private and public key pair \(a.k.a. `sk, pk` respectively\) to be able to receive funds, send txs, bond tx, etc. - -To generate a new key \(default _ed25519_ elliptic curve\): - -```bash -gaiacli keys add <account_name> -``` - -Next, you will have to create a passphrase to protect the key on disk. The output of the above command will contain a _seed phrase_. Save the _seed phrase_ in a safe place in case you forget the password! - -If you check your private keys, you'll now see `<account_name>`: - -```bash -gaiacli keys show <account_name> -``` - -You can see all your available keys by typing: - -```bash -gaiacli keys list -``` - -View the validator pubkey for your node by typing: - -```bash -gaiad tendermint show_validator -``` - -::: danger Warning -We strongly recommend _NOT_ using the same passphrase for multiple keys. The Tendermint team and the Interchain Foundation will not be responsible for the loss of funds. -::: - -## Get Tokens - -The best way to get tokens is from the [Cosmos Testnet Faucet](https://faucetcosmos.network). If the faucet is not working for you, try asking [#cosmos-validators](https://riot.im/app/#/room/#cosmos-validators:matrix.org). The faucet needs the `cosmosaccaddr` from the account you wish to use for staking. - -After receiving tokens to your address, you can view your account's balance by typing: - -```bash -gaiacli account <account_cosmosaccaddr> -``` - -::: warning Note -When you query an account balance with zero tokens, you will get this error: `No account with address <account_cosmosaccaddr> was found in the state.` This can also happen if you fund the account before your node has fully synced with the chain. These are both normal. - -We're working on improving our error messages! -::: - -## Send Tokens - -```bash -gaiacli send \ - --amount=10faucetToken \ - --chain-id=gaia-7005 \ - --name=<key_name> \ - --to=<destination_cosmosaccaddr> -``` - -::: warning Note -The `--amount` flag accepts the format `--amount=<value|coin_name>`. -::: - -Now, view the updated balances of the origin and destination accounts: - -```bash -gaiacli account <account_cosmosaccaddr> -gaiacli account <destination_cosmosaccaddr> -``` - -You can also check your balance at a given block by using the `--block` flag: - -```bash -gaiacli account <account_cosmosaccaddr> --block=<block_height> -``` - -## Delegate - -On the upcoming mainnet, you can delegate `atom` to a validator. These [delegators](/resources/delegators-faq) can receive part of the validator's fee revenue. Read more about the [Cosmos Token Model](https://github.com/cosmos/cosmos/raw/master/Cosmos_Token_Model.pdf). - -### Bond Tokens - -On the testnet, we delegate `steak` instead of `atom`. Here's how you can bond tokens to a testnet validator: - -```bash -gaiacli stake delegate \ - --amount=10steak \ - --address-delegator=<account_cosmosaccaddr> \ - --address-validator=$(gaiad tendermint show_validator) \ - --name=<key_name> \ - --chain-id=gaia-7005 -``` - -While tokens are bonded, they are pooled with all the other bonded tokens in the network. Validators and delegators obtain a percentage of shares that equal their stake in this pool. - -::: tip Note -Don't use more `steak` thank you have! You can always get more by using the [Faucet](https://faucetcosmos.network/)! -::: - -### Unbond Tokens - -If for any reason the validator misbehaves, or you want to unbond a certain amount of tokens, use this following command. You can unbond a specific amount of`shares`\(eg:`12.1`\) or all of them \(`MAX`\). - -```bash -gaiacli stake unbond \ - --address-delegator=<account_cosmosaccaddr> \ - --address-validator=$(gaiad tendermint show_validator) \ - --shares=MAX \ - --name=<key_name> \ - --chain-id=gaia-7005 -``` - -You can check your balance and your stake delegation to see that the unbonding went through successfully. - -```bash -gaiacli account <account_cosmosaccaddr> - -gaiacli stake delegation \ - --address-delegator=<account_cosmosaccaddr> \ - --address-validator=$(gaiad tendermint show_validator) \ - --chain-id=gaia-7005 -``` diff --git a/docs/sdk/overview.md b/docs/sdk/overview.md index 40d1e0bb5..905982f62 100644 --- a/docs/sdk/overview.md +++ b/docs/sdk/overview.md @@ -1,14 +1,16 @@ # Cosmos SDK Overview -The Cosmos-SDK is a framework for building Tendermint ABCI applications in -Golang. It is designed to allow developers to easily create custom interoperable -blockchain applications within the Cosmos Network. +The [Cosmos-SDK](https://github.com/cosmos/cosmos-sdk) is a framework for building multi-asset Proof-of-Stake (PoS) blockchains, like the Cosmos Hub, as well as Proof-Of-Authority (PoA) blockchains. -To achieve its goals of flexibility and security, the SDK makes extensive use of -the [object-capability -model](https://en.wikipedia.org/wiki/Object-capability_model) -and the [principle of least -privilege](https://en.wikipedia.org/wiki/Principle_of_least_privilege). +The goal of the Cosmos-SDK is to allow developers to easily create custom interoperable blockchain applications within the Cosmos Network without having to recreate common blockchain functionality, thus removing the complexity of building a Tendermint ABCI application. We envision the SDK as the npm-like framework to build secure blockchain applications on top of Tendermint. + +In terms of its design, the SDK optimizes flexibility and security. The framework is designed around a modular execution stack which allows applications to mix and match elements as desired. In addition, all modules are sandboxed for greater application security. + +It is based on two major principles: + +- **Composability:** Anyone can create a module for the Cosmos-SDK and integrating the already-built modules is as simple as importing them into your blockchain application. + +- **Capabilities:** The SDK is inspired by capabilities-based security, and informed by years of wrestling with blockchain state-machines. Most developers will need to access other 3rd party modules when building their own modules. Given that the Cosmos-SDK is an open framework and that we assume that some of those modules may be malicious, we designed the SDK using object-capabilities (ocaps) based principles. In practice, this means that instead of having each module keep an access control list for other modules, each module implements special objects called keepers that can be passed to other modules to grant a pre-defined set of capabilities. For example, if an instance of module A's keepers is passed to module B, the latter will be able to call a restricted set of module A's functions. The capabilities of each keeper are defined by the module's developer, and it's the developer's job to understand and audit the safety of foreign code from 3rd party modules based on the capabilities they are passing into each 3rd party module. For a deeper look at capabilities, you can read this [article](http://habitatchronicles.com/2017/05/what-are-capabilities/). For an introduction to object-capabilities, see this [article](http://habitatchronicles.com/2017/05/what-are-capabilities/). diff --git a/docs/sdk/sdk-by-examples/intro.md b/docs/sdk/sdk-by-examples/intro.md new file mode 100644 index 000000000..6404cead6 --- /dev/null +++ b/docs/sdk/sdk-by-examples/intro.md @@ -0,0 +1,7 @@ +**SDK by Examples** offers an alternative and complementary way to learn about the Cosmos-SDK. It contains several examples that showcase how to build a decentralised application on top of the Cosmos-SDK from start to finish. + +Without further ado, let us get into it! + +- [Simple governance example](./simple-governance/intro.md) + +If you have an example you would like to add to the list, feel free to open a PR [here](https://github.com/cosmos/cosmos-sdk/pulls). diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-cli.md b/docs/sdk/sdk-by-examples/simple-governance/app-cli.md new file mode 100644 index 000000000..52590c62f --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-cli.md @@ -0,0 +1,23 @@ +## Application CLI + +**File: [`cmd/simplegovcli/maing.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/cmd/simplegovcli/main.go)** + +To interact with our application, let us add the commands from the `simple_governance` module to our `simpleGov` application, as well as the pre-built SDK commands: + +```go +// cmd/simplegovcli/main.go +... + rootCmd.AddCommand( + client.GetCommands( + simplegovcmd.GetCmdQueryProposal("proposals", cdc), + simplegovcmd.GetCmdQueryProposals("proposals", cdc), + simplegovcmd.GetCmdQueryProposalVotes("proposals", cdc), + simplegovcmd.GetCmdQueryProposalVote("proposals", cdc), + )...) + rootCmd.AddCommand( + client.PostCommands( + simplegovcmd.PostCmdPropose(cdc), + simplegovcmd.PostCmdVote(cdc), + )...) +... +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-codec.md b/docs/sdk/sdk-by-examples/simple-governance/app-codec.md new file mode 100644 index 000000000..9d35b4363 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-codec.md @@ -0,0 +1,21 @@ +## Application codec + +**File: [`app/app.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/app/app.go)** + +Finally, we need to define the `MakeCodec()` function and register the concrete types and interface from the various modules. + +```go +func MakeCodec() *wire.Codec { + var cdc = wire.NewCodec() + wire.RegisterCrypto(cdc) // Register crypto. + sdk.RegisterWire(cdc) // Register Msgs + bank.RegisterWire(cdc) + simplestake.RegisterWire(cdc) + simpleGov.RegisterWire(cdc) + + // Register AppAccount + cdc.RegisterInterface((*auth.Account)(nil), nil) + cdc.RegisterConcrete(&types.AppAccount{}, "simpleGov/Account", nil) + return cdc +} +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-commands.md b/docs/sdk/sdk-by-examples/simple-governance/app-commands.md new file mode 100644 index 000000000..4eb2f9221 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-commands.md @@ -0,0 +1,9 @@ +## App commands + +We will need to add the newly created commands to our application. To do so, go to the `cmd` folder inside your root directory: + +```bash +// At root level of directory +cd cmd +``` +`simplegovd` is the folder that stores the command for running the server daemon, whereas `simplegovcli` defines the commands of your application. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-constructor.md b/docs/sdk/sdk-by-examples/simple-governance/app-constructor.md new file mode 100644 index 000000000..84858edf4 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-constructor.md @@ -0,0 +1,61 @@ +## Application constructor + +**File: [`app/app.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/app/app.go)** + +Now, we need to define the constructor for our application. + +```go +func NewSimpleGovApp(logger log.Logger, db dbm.DB) *SimpleGovApp +``` + +In this function, we will: + +- Create the codec + +```go +var cdc = MakeCodec() +``` + +- Instantiate our application. This includes creating the keys to access each of the substores. + +```go +// Create your application object. + var app = &SimpleGovApp{ + BaseApp: bam.NewBaseApp(appName, cdc, logger, db), + cdc: cdc, + capKeyMainStore: sdk.NewKVStoreKey("main"), + capKeyAccountStore: sdk.NewKVStoreKey("acc"), + capKeyStakingStore: sdk.NewKVStoreKey("stake"), + capKeySimpleGovStore: sdk.NewKVStoreKey("simpleGov"), + } +``` + +- Instantiate the keepers. Note that keepers generally need access to other module's keepers. In this case, make sure you only pass an instance of the keeper for the functionality that is needed. If a keeper only needs to read in another module's store, a read-only keeper should be passed to it. + +```go +app.coinKeeper = bank.NewKeeper(app.accountMapper) +app.stakeKeeper = simplestake.NewKeeper(app.capKeyStakingStore, app.coinKeeper,app.RegisterCodespace(simplestake.DefaultCodespace)) +app.simpleGovKeeper = simpleGov.NewKeeper(app.capKeySimpleGovStore, app.coinKeeper, app.stakeKeeper, app.RegisterCodespace(simpleGov.DefaultCodespace)) +``` + +- Declare the handlers. + +```go +app.Router(). + AddRoute("bank", bank.NewHandler(app.coinKeeper)). + AddRoute("simplestake", simplestake.NewHandler(app.stakeKeeper)). + AddRoute("simpleGov", simpleGov.NewHandler(app.simpleGovKeeper)) +``` + +- Initialize the application. + +```go +// Initialize BaseApp. + app.MountStoresIAVL(app.capKeyMainStore, app.capKeyAccountStore, app.capKeySimpleGovStore, app.capKeyStakingStore) + app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, app.feeCollectionKeeper)) + err := app.LoadLatestVersion(app.capKeyMainStore) + if err != nil { + cmn.Exit(err.Error()) + } + return app +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-design.md b/docs/sdk/sdk-by-examples/simple-governance/app-design.md new file mode 100644 index 000000000..fcc050979 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-design.md @@ -0,0 +1,78 @@ +## Application design + +### Application description + +For this tutorial, we will code a **simple governance application**, accompagnied by a **simple governance module**. It will allow us to explain most of the basic notions required to build a functioning application on the Cosmos-SDK. Note that this is not the governance module used for the Cosmos Hub. A much more [advanced governance module](https://github.com/cosmos/cosmos-sdk/tree/develop/x/gov) will be used instead. + +All the code for the `simple_governance` application can be found [here](https://github.com/gamarin2/cosmos-sdk/tree/module_tutorial/examples/simpleGov/x/simple_governance). You'll notice that the module and app aren't located at the root level of the repo but in the examples directory. This is just for convenience, you can code your module and application directly in the root directory. + +Without further talk, let's get into it! + +### Requirements + +We will start by writting down your module's requirements. We are designing a simple governance module, in which we want: + +- Simple text proposals, that any coin holder can submit. +- Proposals must be submitted with a deposit in Atoms. If the deposit is larger than a `MinDeposit`, the associated proposal enters the voting period. Otherwise it is rejected. +- Bonded Atom holders can vote on proposal on a 1 bonded Atom 1 vote basis +- Bonded Atom holders can choose between 3 options when casting a vote: `Yes`, `No` and `Abstain`. +- If, at the end of the voting period, there are more `Yes` votes than `No` votes, the proposal is accepted. Otherwise, it is rejected. +- Voting period is 2 weeks + +When designing a module, it is good to adopt a certain methodology. Remember that a blockchain application is just a replicated state-machine. The state is the representation of the application at a given time. It is up to the application developer to define what the state represents, depending on the goal of the application. For example, the state of a simple cryptocurrency application will be a mapping of addresses to balances. + +The state can be updated according to predefined rules. Given a state and a transaction, the state-machine (i.e. the application) will return a new state. In a blockchain application, transactions are bundled in blocks, but the logic is the same. Given a state and a set of transactions (a block), the application returns a new state. A SDK-module is just a subset of the application, but it is based on the same principles. As a result, module developers only have to define a subset of the state and a subset of the transaction types, which trigger state transitions. + +In summary, we have to define: + +- A `State`, which represents a subset of the current state of the application. +- `Transactions`, which contain messages that trigger state transitions. + +### State + +Here, we will define the types we need (excluding transaction types), as well as the stores in the multistore. + +Our voting module is very simple, we only need a single type: `Proposal`. `Proposals` are item to be voted upon. They can be submitted by any user. A deposit has to be provided. + +```go +type Proposal struct { + Title string // Title of the proposal + Description string // Description of the proposal + Submitter sdk.Address // Address of the submitter. Needed to refund deposit if proposal is accepted. + SubmitBlock int64 // Block at which proposal is submitted. Also the block at which voting period begins. + State string // State can be either "Open", "Accepted" or "Rejected" + + YesVotes int64 // Total number of Yes votes + NoVotes int64 // Total number of No votes + AbstainVotes int64 // Total number of Abstain votes +} +``` + +In terms of store, we will just create one [KVStore](#kvstore) in the multistore to store `Proposals`. We will also store the `Vote` (`Yes`, `No` or `Abstain`) chosen by each voter on each proposal. + + +### Messages + +As a module developer, what you have to define are not `Transactions`, but `Messages`. Both transactions and messages exist in the Cosmos-SDK, but a transaction differs from a message in that a message is contained in a transaction. Transactions wrap around messages and add standard information like signatures and fees. As a module developer, you do not have to worry about transactions, only messages. + +Let us define the messages we need in order to modify the state. Based on the requirements above, we need to define two types of messages: + +- `SubmitProposalMsg`: to submit proposals +- `VoteMsg`: to vote on proposals + +```go +type SubmitProposalMsg struct { + Title string // Title of the proposal + Description string // Description of the proposal + Deposit sdk.Coins // Deposit paid by submitter. Must be > MinDeposit to enter voting period + Submitter sdk.Address // Address of the submitter +} +``` + +```go +type VoteMsg struct { + ProposalID int64 // ID of the proposal + Option string // Option chosen by voter + Voter sdk.Address // Address of the voter +} +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-init.md b/docs/sdk/sdk-by-examples/simple-governance/app-init.md new file mode 100644 index 000000000..a71be2bed --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-init.md @@ -0,0 +1,11 @@ +## Application initialization + +In the root of your fork of the SDK, create an `app` and `cmd` folder. In this folder, we will create the main file for our application, `app.go` and the repository to handle REST and CLI commands for our app. + +```bash +mkdir app cmd +mkdir -p cmd/simplegovcli cmd/simplegovd +touch app/app.go cmd/simplegovcli/main.go cmd/simplegovd/main.go +``` + +We will take care of these files later in the tutorial. The first step is to take care of our simple governance module. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-makefile.md b/docs/sdk/sdk-by-examples/simple-governance/app-makefile.md new file mode 100644 index 000000000..b7502d339 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-makefile.md @@ -0,0 +1,22 @@ +## Makefile + +The [Makefile](https://en.wikipedia.org/wiki/Makefile) compiles the Go program by defining a set of rules with targets and recipes. We'll need to add our application commands to it: + +``` +// Makefile +build_examples: +ifeq ($(OS),Windows_NT) + ... + go build $(BUILD_FLAGS) -o build/simplegovd.exe ./examples/simpleGov/cmd/simplegovd + go build $(BUILD_FLAGS) -o build/simplegovcli.exe ./examples/simpleGov/cmd/simplegovcli +else + ... + go build $(BUILD_FLAGS) -o build/simplegovd ./examples/simpleGov/cmd/simplegovd + go build $(BUILD_FLAGS) -o build/simplegovcli ./examples/simpleGov/cmd/simplegovcli +endif +... +install_examples: + ... + go install $(BUILD_FLAGS) ./examples/simpleGov/cmd/simplegovd + go install $(BUILD_FLAGS) ./examples/simpleGov/cmd/simplegovcli +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-rest.md b/docs/sdk/sdk-by-examples/simple-governance/app-rest.md new file mode 100644 index 000000000..7e8469ad6 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-rest.md @@ -0,0 +1,57 @@ +##### Rest server + +**File: [`cmd/simplegovd/main.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/cmd/simplegovd/main.go)** + +The `simplegovd` command will run the daemon server as a background process. First, let us create some `utils` functions: + +```go +// cmd/simplegovd/main.go +// SimpleGovAppInit initial parameters +var SimpleGovAppInit = server.AppInit{ + AppGenState: SimpleGovAppGenState, + AppGenTx: server.SimpleAppGenTx, +} + +// SimpleGovAppGenState sets up the app_state and appends the simpleGov app state +func SimpleGovAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (appState json.RawMessage, err error) { + appState, err = server.SimpleAppGenState(cdc, appGenTxs) + if err != nil { + return + } + return +} + +func newApp(logger log.Logger, db dbm.DB) abci.Application { + return app.NewSimpleGovApp(logger, db) +} + +func exportAppState(logger log.Logger, db dbm.DB) (json.RawMessage, error) { + dapp := app.NewSimpleGovApp(logger, db) + return dapp.ExportAppStateJSON() +} +``` + +Now, let us define the command for the daemon server within the `main()` function: + +```go +// cmd/simplegovd/main.go +func main() { + cdc := app.MakeCodec() + ctx := server.NewDefaultContext() + + rootCmd := &cobra.Command{ + Use: "simplegovd", + Short: "Simple Governance Daemon (server)", + PersistentPreRunE: server.PersistentPreRunEFn(ctx), + } + + server.AddCommands(ctx, cdc, rootCmd, SimpleGovAppInit, + server.ConstructAppCreator(newApp, "simplegov"), + server.ConstructAppExporter(exportAppState, "simplegov")) + + // prepare and add flags + rootDir := os.ExpandEnv("$HOME/.simplegovd") + executor := cli.PrepareBaseCmd(rootCmd, "BC", rootDir) + executor.Execute() +} +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/app-structure.md b/docs/sdk/sdk-by-examples/simple-governance/app-structure.md new file mode 100644 index 000000000..c213b673b --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/app-structure.md @@ -0,0 +1,55 @@ +## Application structure + +Now, that we have built all the pieces we need, it is time to integrate them into the application. Let us exit the `/x` director go back at the root of the SDK directory. + + +```bash +// At root level of directory +cd app +``` + +We are ready to create our simple governance application! + +*Note: You can check the full file (with comments!) [here](link)* + +The `app.go` file is the main file that defines your application. In it, you will declare all the modules you need, their keepers, handlers, stores, etc. Let us take a look at each section of this file to see how the application is constructed. + +Secondly, we need to define the name of our application. + +```go +const ( + appName = "SimpleGovApp" +) +``` + +Then, let us define the structure of our application. + +```go +// Extended ABCI application +type SimpleGovApp struct { + *bam.BaseApp + cdc *wire.Codec + + // keys to access the substores + capKeyMainStore *sdk.KVStoreKey + capKeyAccountStore *sdk.KVStoreKey + capKeyStakingStore *sdk.KVStoreKey + capKeySimpleGovStore *sdk.KVStoreKey + + // keepers + feeCollectionKeeper auth.FeeCollectionKeeper + coinKeeper bank.Keeper + stakeKeeper simplestake.Keeper + simpleGovKeeper simpleGov.Keeper + + // Manage getting and setting accounts + accountMapper auth.AccountMapper +} +``` + +- Each application builds on top of the `BaseApp` template, hence the pointer. +- `cdc` is the codec used in our application. +- Then come the keys to the stores we need in our application. For our simple governance app, we need 3 stores + the main store. +- Then come the keepers and mappers. + +Let us do a quick reminder so that it is clear why we need these stores and keepers. Our application is primarily based on the `simple_governance` module. However, we have established in section [Keepers for our app](module-keeper.md) that our module needs access to two other modules: the `bank` module and the `stake` module. We also need the `auth` module for basic account functionalities. Finally, we need access to the main multistore to declare the stores of each of the module we use. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/cast-vote.md b/docs/sdk/sdk-by-examples/simple-governance/cast-vote.md new file mode 100644 index 000000000..f16f2b4e6 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/cast-vote.md @@ -0,0 +1,19 @@ +## Cast a vote to an existing proposal + +Let's cast a vote on the created proposal: + +```bash +simplegovcli vote --proposal-id=1 --option="No" +``` + +Get the value of the option from your casted vote : + +```bash +simplegovcli proposal-vote 1 <your_address> +``` + +You can also check all the casted votes of a proposal: + +```bash +simplegovcli proposals-votes 1 +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/intro.md b/docs/sdk/sdk-by-examples/simple-governance/intro.md new file mode 100644 index 000000000..ab4b5b6a5 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/intro.md @@ -0,0 +1,58 @@ +# SDK By Examples - Simple Governance Application + +In this tutorial, you will learn the basics of coding an application with the Cosmos-SDK. Applications built on top of the SDK are called *Application-specific blockchains*. They are decentralised applications running on their own blockchains. The application we will build in this tutorial is a simple governance application. + +Before getting in the bulk of the code, we will start by some introductory content on Tendermint, Cosmos and the programming philosophy of the SDK. Let us get started! + +## Table of contents: + +### Introduction - Prerequsite reading + +- [Intro to Tendermint and Cosmos](../../../introduction/tendermint-cosmos.md) +- [Tendermint Core and ABCI](../../../introduction/tendermint.md) +- [Intro to Cosmos-SDK](../../overview.md) +- [Starting your own project](start.md) + +### Setup and design phase + +- [Setup](setup.md) +- [Application design](app-design.md) + +### Implementation of the application + +**Important note: All the code for this application can be found [here](https://github.com/cosmos/cosmos-sdk/tree/fedekunze/module_tutorial/examples/simpleGov). Snippets will be provided throughout the tutorial, but please refer to the provided link for the full implementation details** + +- [Application initialization](app-init.md) +- Simple Governance module + + [Module initialization](module-init.md) + + [Types](module-types.md) + + [Keeper](module-keeper.md) + + [Handler](module-handler.md) + + [Wire](module-wire.md) + + [Errors](module-errors.md) + + Command-Line Interface and Rest API + * [Command-Line Interface](module-cli.md) + * [Rest API](module-rest.md) +- Bridging it all together + + [Application structure](app-structure.md) + + [Application CLI and Rest Server](app-commands.md) + * [Application CLI](app-cli.md) + * [Rest Server](app-rest.md) + + [Makefile](app-makefile.md) + + [Application constructor](app-constructor.md) + + [Application codec](app-codec.md) +- Running the application + + [Installation](run-install.md) + + [Submit a proposal](submit-proposal.md) + + [Cast a vote](cast-vote.md) + +## Useful links + +If you have any question regarding this tutorial or about development on the SDK, please reach out us through our official communication channels: + +- [Cosmos-SDK Riot Channel](https://riot.im/app/#/room/#cosmos-sdk:matrix.org) +- [Telegram](https://t.me/cosmosproject) + +Or open an issue on the SDK repo: + +- [Cosmos-SDK repo](https://github.com/cosmos/cosmos-sdk/) diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-cli.md b/docs/sdk/sdk-by-examples/simple-governance/module-cli.md new file mode 100644 index 000000000..b7e3143e3 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-cli.md @@ -0,0 +1,33 @@ +## Command-Line Interface (CLI) + +**File: [`x/simple_governance/client/cli/simple_governance.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/x/simple_governance/client/cli/simple_governance.go)** + +Go in the `cli` folder and create a `simple_governance.go` file. This is where we will define the commands for our module. + +The CLI builds on top of [Cobra](https://github.com/spf13/cobra). Here is the schema to build a command on top of Cobra: + +```go + // Declare flags + const( + Flag = "flag" + ... + ) + + // Main command function. One function for each command. + func Command(codec *wire.Codec) *cobra.Command { + // Create the command to return + command := &cobra.Command{ + Use: "actual command", + Short: "Short description", + Run: func(cmd *cobra.Command, args []string) error { + // Actual function to run when command is used + }, + } + + // Add flags to the command + command.Flags().<Type>(FlagNameConstant, <example_value>, "<Description>") + + return command + } +``` + diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-errors.md b/docs/sdk/sdk-by-examples/simple-governance/module-errors.md new file mode 100644 index 000000000..5597792a4 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-errors.md @@ -0,0 +1,7 @@ +## Errors + +**File: [`x/simple_governance/errors.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/x/simple_governance/errors.go)** + +The `error.go` file allows us to define custom error messages for our module. Declaring errors should be relatively similar in all modules. You can look in the `error.go` file directly for a concrete example. The code is self-explanatory. + +Note that the errors of our module inherit from the `sdk.Error` interface and therefore possess the method `Result()`. This method is useful when there is an error in the `handler` and an error has to be returned in place of an actual result. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-handler.md b/docs/sdk/sdk-by-examples/simple-governance/module-handler.md new file mode 100644 index 000000000..fc142e0fa --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-handler.md @@ -0,0 +1,73 @@ +## Handler + +**File: [`x/simple_governance/handler.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/x/simple_governance/handler.go)** + +### Constructor and core handlers + +Handlers implement the core logic of the state-machine. When a transaction is routed from the app to the module, it is run by the `handler` function. + +In practice, one `handler` will be implemented for each message of the module. In our case, we have two message types. We will therefore need two `handler` functions. We will also need a constructor function to route the message to the correct `handler`: + +```go +func NewHandler(k Keeper) sdk.Handler { + return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { + switch msg := msg.(type) { + case SubmitProposalMsg: + return handleSubmitProposalMsg(ctx, k, msg) + case VoteMsg: + return handleVoteMsg(ctx, k, msg) + default: + errMsg := "Unrecognized gov Msg type: " + reflect.TypeOf(msg).Name() + return sdk.ErrUnknownRequest(errMsg).Result() + } + } +} +``` + +The messages are routed to the appropriate `handler` depending on their type. For our simple governance module, we only have two `handlers`, that correspond to our two message types. They have similar signatures: + +```go +func handleSubmitProposalMsg(ctx sdk.Context, k Keeper, msg SubmitProposalMsg) sdk.Result +``` + +Let us take a look at the parameters of this function: + +- The context `ctx` to access the stores. +- The keeper `k` allows the handler to read and write from the different stores, including the module's store (`SimpleGovernance` in our case) and all the stores from other modules that the keeper `k` has been granted an access to (`stake` and `bank` in our case). +- The message `msg` that holds all the information provided by the sender of the transaction. + +The function returns a `Result` that is returned to the application. It contains several useful information such as the amount of `Gas` for this transaction and wether the message was succesfully processed or not. At this point, we exit the boundaries of our simple governance module and go back to root application level. The `Result` will differ from application to application. You can check the `sdk.Result` type directly [here](https://github.com/cosmos/cosmos-sdk/blob/develop/types/result.go) for more info. + +### BeginBlocker and EndBlocker + +In contrast to most smart-contracts platform, it is possible to perform automatic (i.e. not triggered by a transaction sent by an end-user) execution of logic in Cosmos-SDK applications. + +This automatic execution of code takes place in the `BeginBlock` and `EndBlock` functions that are called at the beginning and at the end of every block. They are powerful tools, but it is important for application developers to be careful with them. For example, it is crutial that developers control the amount of computing that happens in these functions, as expensive computation could delay the block time, and never-ending loop freeze the chain altogether. + +`BeginBlock` and `EndBlock` are composable functions, meaning that each module can implement its own `BeginBlock` and `EndBlock` logic. When needed, `BeginBlock` and `EndBlock` logic is implemented in the module's `handler`. Here is the standard way to proceed for `EndBlock` (`BeginBlock` follows the exact same pattern): + +```go +func NewEndBlocker(k Keeper) sdk.EndBlocker { + return func(ctx sdk.Context, req abci.RequestEndBlock) (res abci.ResponseEndBlock) { + err := checkProposal(ctx, k) + if err != nil { + panic(err) + } + return + } +} +``` + +Do not forget that each module need to declare its `BeginBlock` and `EndBlock` constructors at application level. See the [Application - Bridging it all together](app-structure.md). + +For the purpose of our simple governance application, we will use `EndBlock` to automatically tally the results of the vote. Here are the different steps that will be performed: + +1. Get the oldest proposal from the `ProposalProcessingQueue` +2. Check if the `CurrentBlock` is the block at which the voting period for this proposal ends. If Yes, go to 3.. If no, exit. +3. Check if proposal is accepted or rejected. Update the proposal status. +4. Pop the proposal from the `ProposalProcessingQueue` and go back to 1. + +Let us perform a quick safety analysis on this process. +- The loop will not run forever because the number of proposals in `ProposalProcessingQueue` is finite +- The computation should not be too expensive because tallying of individual proposals is not expensive and the number of proposals is expected be relatively low. That is because proposals require a `Deposit` to be accepted. `MinDeposit` should be high enough so that we don't have too many `Proposals` in the queue. +- In the eventuality that the application becomes so successful that the `ProposalProcessingQueue` ends up containing so many proposals that the blockchain starts slowing down, the module should be modified to mitigate the situation. One clever way of doing it is to cap the number of iteration per individual `EndBlock` at `MaxIteration`. This way, tallying will be spread over many blocks if the number of proposals is too important and block time should remain stable. This would require to modify the current check `if (CurrentBlock == Proposal.SubmitBlock + VotingPeriod)` to `if (CurrentBlock > Proposal.SubmitBlock + VotingPeriod) AND (Proposal.Status == ProposalStatusActive)`. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-init.md b/docs/sdk/sdk-by-examples/simple-governance/module-init.md new file mode 100644 index 000000000..d018b512f --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-init.md @@ -0,0 +1,31 @@ +## Module initialization + +First, let us go into the module's folder and create a folder for our module. + +```bash +cd x/ +mkdir simple_governance +cd simple_governance +mkdir -p client/cli client/rest +touch client/cli/simple_governance.go client/rest/simple_governance.go errors.go handler.go handler_test.go keeper_keys.go keeper_test.go keeper.go test_common.go test_types.go types.go wire.go +``` + +Let us start by adding the files we will need. Your module's folder should look something like that: + +``` +x +└─── simple_governance + ├─── client + │ ├─── cli + │ │ └─── simple_governance.go + │ └─── rest + │ └─── simple_governance.go + ├─── errors.go + ├─── handler.go + ├─── keeper_keys.go + ├─── keeper.go + ├─── types.go + └─── wire.go +``` + +Let us go into the detail of each of these files. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-keeper.md b/docs/sdk/sdk-by-examples/simple-governance/module-keeper.md new file mode 100644 index 000000000..851593a78 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-keeper.md @@ -0,0 +1,96 @@ +## Keeper + +**File: [`x/simple_governance/keeper.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/x/simple_governance/keeper.go)** + +### Short intro to keepers + +`Keepers` are a module abstraction that handle reading/writing to the module store. This is a practical implementation of the **Object Capability Model** for Cosmos. + + +As module developers, we have to define keepers to interact with our module's store(s) not only from within our module, but also from other modules. When another module wants to access one of our module's store(s), a keeper for this store has to be passed to it at the application level. In practice, it will look like that: + +```go +// in app.go + +// instanciate keepers +keeperA = moduleA.newKeeper(app.moduleAStoreKey) +keeperB = moduleB.newKeeper(app.moduleBStoreKey) + +// pass instance of keeperA to handler of module B +app.Router(). + AddRoute("moduleA", moduleA.NewHandler(keeperA)). + AddRoute("moduleB", moduleB.NewHandler(keeperB, keeperA)) // Here module B can access one of module A's store via the keeperA instance +``` + +`KeeperA` grants a set of capabilities to the handler of module B. When developing a module, it is good practice to think about the sensitivity of the different capabilities that can be granted through keepers. For example, some module may need to read and write to module A's main store, while others only need to read it. If a module has multiple stores, then some keepers could grant access to all of them, while others would only grant access to specific sub-stores. It is the job of the module developer to make sure it is easy for application developers to instanciate a keeper with the right capabilities. Of course, the handler of a module will most likely get an unrestricted instance of that module's keeper. + +### Store for our app + +Before we delve into the keeper itself, let us see what objects we need to store in our governance sub-store, and how to index them. + +- `Proposals` will be indexed by `'proposals'|<proposalID>`. +- `Votes` (`Yes`, `No`, `Abstain`) will be indexed by `'proposals'|<proposalID>|'votes'|<voterAddress>`. + +Notice the quote mark on `'proposals'` and `'votes'`. They indicate that these are constant keywords. So, for example, the option casted by voter with address `0x01` on proposal `0101` will be stored at index `'proposals'|0101|'votes'|0x01`. + +These keywords are used to faciliate range queries. Range queries (TODO: Link to formal spec) allow developer to query a subspace of the store, and return an iterator. They are made possible by the nice properties of the [IAVL+ tree](https://github.com/tendermint/iavl) that is used in the background. In practice, this means that it is possible to store and query a Key-Value pair in O(1), while still being able to iterate over a given subspace of Key-Value pairs. For example, we can query all the addresses that voted on a given proposal, along with their votes, by calling `rangeQuery(SimpleGovStore, <proposalID|'addresses'>)`. + +### Keepers for our app + +In our case, we only have one store to access, the `SimpleGov` store. We will need to set and get values inside this store via our keeper. However, these two actions do not have the same impact in terms of security. While there should no problem in granting read access to our store to other modules, write access is way more sensitive. So ideally application developers should be able to create either a governance mapper that can only get values from the store, or one that can both get and set values. To this end, we will introduce two keepers: `Keeper` and `KeeperRead`. When application developers create their application, they will be able to decide which of our module's keeper to use. + +Now, let us try to think about which keeper from **external** modules our module's keepers need access to. +Each proposal requires a deposit. This means our module needs to be able to both read and write to the module that handles tokens, which is the `bank` module. We also need to be able to determine the voting power of each voter based on their stake. To this end, we need read access to the store of the `staking` module. However, we don't need write access to this store. We should therefore indicate that in our module, and the application developer should be careful to only pass a read-only keeper of the `staking` module to our module's handler. + +With all that in mind, we can define the structure of our `Keeper`: + +```go + type Keeper struct { + SimpleGov sdk.StoreKey // Key to our module's store + cdc *wire.Codec // Codec to encore/decode structs + ck bank.Keeper // Needed to handle deposits. This module onlyl requires read/writes to Atom balance + sm stake.Keeper // Needed to compute voting power. This module only needs read access to the staking store. + codespace sdk.CodespaceType // Reserves space for error codes + } +``` + +And the structure of our `KeeperRead`: + +```go +type KeeperRead struct { + Keeper +} +``` + +`KeeperRead` will inherit all methods from `Keeper`, except those that we override. These will be the methods that perform writes to the store. + +### Functions and Methods + +The first function we have to create is the constructor. + +```go +func NewKeeper(SimpleGov sdk.StoreKey, ck bank.Keeper, sm stake.Keeper, codespace sdk.CodespaceType) Keeper +``` + +This function is called from the main [`app.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/app/app.go) file to instanciate a new `Keeper`. A similar function exits for `KeeperRead`. + +```go +func NewKeeperRead(SimpleGov sdk.StoreKey, ck bank.Keeper, sm stake.Keeper, codespace sdk.CodespaceType) KeeperRead +``` + +Depending on the needs of the application and its modules, either `Keeper`, `KeeperRead`, or both, will be instanciated at application level. + +*Note: Both the `Keeper` type name and `NewKeeper()` function's name are standard names used in every module. It is no requirement to follow this standard, but doing so can facilitate the life of application developers* + +Now, let us describe the methods we need for our module's `Keeper`. For the full implementation, please refer to `keeper.go`. + +- `GetProposal`: Get a `Proposal` given a `proposalID`. Proposals need to be decoded from `byte` before they can be read. +- `SetProposal`: Set a `Proposal` at index `'proposals'|<proposalID>`. Proposals need to be encoded to `byte` before they can be stored. +- `NewProposalID`: A function to generate a new unique `proposalID`. +- `GetVote`: Get a vote `Option` given a `proposalID` and a `voterAddress`. +- `SetVote`: Set a vote `Option` given a `proposalID` and a `voterAddress`. +- Proposal Queue methods: These methods implement a standard proposal queue to store `Proposals` on a First-In First-Out basis. It is used to tally the votes at the end of the voting period. + +The last thing that needs to be done is to override certain methods for the `KeeperRead` type. `KeeperRead` should not have write access to the stores. Therefore, we will override the methods `SetProposal()`, `SetVote()` and `NewProposalID()`, as well as `setProposalQueue()` from the Proposal Queue's methods. For `KeeperRead`, these methods will just throw an error. + +*Note: If you look at the code, you'll notice that the context `ctx` is a parameter of many of the methods. The context `ctx` provides useful information on the current state such as the current block height and allows the keeper `k` to access the `KVStore`. You can check all the methods of `ctx` [here](https://github.com/cosmos/cosmos-sdk/blob/develop/types/context.go#L144-L168)*. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-rest.md b/docs/sdk/sdk-by-examples/simple-governance/module-rest.md new file mode 100644 index 000000000..51758f2f4 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-rest.md @@ -0,0 +1,32 @@ +## Rest API + +**File: [`x/simple_governance/client/rest/simple_governance.goo`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/x/simple_governance/client/rest/simple_governance.go)** + +The Rest Server, also called [Light-Client Daemon (LCD)](https://github.com/cosmos/cosmos-sdk/tree/master/client/lcd), provides support for **HTTP queries**. + +________________________________________________________ + +USER INTERFACE <=======> REST SERVER <=======> FULL-NODE + +________________________________________________________ + +It allows end-users that do not want to run full-nodes themselves to interract with the chain. The LCD can be configured to perform **Light-Client verification** via the flag `--trust-node`, which can be set to `true` or `false`. + +- If *light-client verification* is enabled, the Rest Server acts as a light-client and needs to be run on the end-user's machine. It allows them to interract with the chain in a trustless way without having to store the whole chain locally. + +- If *light-client verification* is disabled, the Rest Server acts as a simple relayer for HTTP calls. In this setting, the Rest server needs not be run on the end-user's machine. Instead, it will probably be run by the same entity that operates the full-node the server connects to. This mode is useful if end-users trust the full-node operator and do not want to store anything locally. + +Now, let us define endpoints that will be available for users to query through HTTP requests. These endpoints will be defined in a `simple_governance.go` file stored in the `rest` folder. + +| Method | URL | Description | +|--------|---------------------------------|-------------------------------------------------------------| +| GET | /proposals | Range query to get all submitted proposals | +| POST | /proposals | Submit a new proposal | +| GET | /proposals/{id} | Returns a proposal given its ID | +| GET | /proposals/{id}/votes | Range query to get all the votes casted on a given proposal | +| POST | /proposals/{id}/votes | Cast a vote on a given proposal | +| GET | /proposals/{id}/votes/{address} | Returns the vote of a given address on a given proposal | + +It is the job of module developers to provide sensible endpoints so that front-end developers and service providers can properly interact with it. + +Additionaly, here is a [link](https://hackernoon.com/restful-api-designing-guidelines-the-best-practices-60e1d954e7c9) for REST APIs best practices. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-types.md b/docs/sdk/sdk-by-examples/simple-governance/module-types.md new file mode 100644 index 000000000..3b08448a6 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-types.md @@ -0,0 +1,23 @@ +## Types + +**File: [`x/simple_governance/types.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/x/simple_governance/types.go)** + +In this file, we define the custom types for our module. This includes the types from the [State](app-design.md#State) section and the custom message types defined in the [Messages](app-design#Messages) section. + +For each new type that is not a message, it is possible to add methods that make sense in the context of the application. In our case, we will implement an `updateTally` function to easily update the tally of a given proposal as vote messages come in. + +Messages are a bit different. They implement the `Message` interface defined in the SDK's `types` folder. Here are the methods you need to implement when you define a custom message type: + +- `Type()`: This function returns the name of our module's route. When messages are processed by the application, they are routed using the string returned by the `Type()` method. +- `GetSignBytes()`: Returns the byte representation of the message. It is used to sign the message. +- `GetSigners()`: Returns address(es) of the signer(s). +- `ValidateBasic()`: This function is used to discard obviously invalid messages. It is called at the beginning of `runTx()` in the baseapp file. If `ValidateBasic()` does not return `nil`, the app stops running the transaction. +- `Get()`: A basic getter, returns some property of the message. +- `String()`: Returns a human-readable version of the message + +For our simple governance messages, this means: + +- `Type()` will return `"simpleGov"` +- For `SubmitProposalMsg`, we need to make sure that the attributes are not empty and that the deposit is both valid and positive. Note that this is only basic validation, we will therefore not check in this method that the sender has sufficient funds to pay for the deposit +- For `VoteMsg`, we check that the address and option are valid and that the proposalID is not negative. +- As for other methods, less customization is required. You can check the code to see a standard way of implementing these. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/module-wire.md b/docs/sdk/sdk-by-examples/simple-governance/module-wire.md new file mode 100644 index 000000000..f889db91a --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/module-wire.md @@ -0,0 +1,13 @@ +## Wire + +**File: [`x/simple_governance/wire.go`](https://github.com/cosmos/cosmos-sdk/blob/fedekunze/module_tutorial/examples/simpleGov/x/simple_governance/wire.go)** + +The `wire.go` file allows developers to register the concrete message types of their module into the codec. In our case, we have two messages to declare: + +```go +func RegisterWire(cdc *wire.Codec) { + cdc.RegisterConcrete(SubmitProposalMsg{}, "simple_governance/SubmitProposalMsg", nil) + cdc.RegisterConcrete(VoteMsg{}, "simple_governance/VoteMsg", nil) +} +``` +Don't forget to call this function in `app.go` (see [Application - Bridging it all together](app-structure.md)) for more). \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/run-install.md b/docs/sdk/sdk-by-examples/simple-governance/run-install.md new file mode 100644 index 000000000..dbbf203de --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/run-install.md @@ -0,0 +1,18 @@ +## Installation + +Once you have finallized your application, install it using `go get`. The following commands will install the pre-built modules and examples of the SDK as well as your `simpleGov` application: + +```bash +go get github.com/<your_username>/cosmos-sdk +cd $GOPATH/src/github.com/<your_username>/cosmos-sdk +make get_vendor_deps +make install +make install_examples +``` + +Check that the app is correctly installed by typing: + +```bash +simplegovcli -h +simplegovd -h +``` \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/setup.md b/docs/sdk/sdk-by-examples/simple-governance/setup.md new file mode 100644 index 000000000..963c7bf81 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/setup.md @@ -0,0 +1,32 @@ +## Setup + +### Prerequisites + +- Have [go](https://golang.org/dl/) and [git](https://git-scm.com/downloads) installed +- Don't forget to set your `PATH` and `GOPATH` + +### Setup work environment + +Go to the [Cosmos-SDK repo](https://githum.com/cosmos/cosmos-sdk) and fork it. Then open a terminal and: + +```bash +cd $GOPATH/src/github.com/your_username +git clone github.com/your_username/cosmos-sdk +cd cosmos-sdk +``` + +Now we'll add the origin Cosmos-SDK as upstream in case some cool feature or module gets merged: + +```bash +git remote add upstream github.com/cosmos/cosmos-sdk +git fetch upstream +git rebase upstream/master +``` + +We will also create a branch dedicated to our module: + +```bash +git checkout -b my_new_application +``` + +We are all set! \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/start.md b/docs/sdk/sdk-by-examples/simple-governance/start.md new file mode 100644 index 000000000..8461c84d9 --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/start.md @@ -0,0 +1,10 @@ +## Starting your own project + +To get started, you just have to follow these simple steps: + +1. Clone the [Cosmos-SDK](https://github.com/cosmos/cosmos-sdk/tree/develop)repo +2. Code the modules needed by your application that do not already exist. +3. Create your app directory. In the app main file, import the module you need and instantiate the different stores. +4. Launch your blockchain. + +Easy as pie! With the introduction over, let us delve into practice and learn how to code a SDK application with an example. \ No newline at end of file diff --git a/docs/sdk/sdk-by-examples/simple-governance/submit-proposal.md b/docs/sdk/sdk-by-examples/simple-governance/submit-proposal.md new file mode 100644 index 000000000..bb9eb289f --- /dev/null +++ b/docs/sdk/sdk-by-examples/simple-governance/submit-proposal.md @@ -0,0 +1,19 @@ +## Submit a proposal + +Uuse the CLI to create a new proposal: + +```bash +simplegovcli propose --title="Voting Period update" --description="Should we change the proposal voting period to 3 weeks?" --deposit=300Atoms +``` + +Get the details of your newly created proposal: + +```bash +simplegovcli proposal 1 +``` + +You can also check all the existing open proposals: + +```bash +simplegovcli proposals --active=true +``` \ No newline at end of file diff --git a/docs/spec/README.md b/docs/spec/README.md index 0b708aba2..49ea67b7a 100644 --- a/docs/spec/README.md +++ b/docs/spec/README.md @@ -17,7 +17,8 @@ said, they provide a detailed resource for understanding the Cosmos-SDK. - [Governance](governance) - Proposals and voting. - [Staking](staking) - Proof-of-stake bonding, delegation, etc. - [Slashing](slashing) - Validator punishment mechanisms. -- [Provisioning](provisioning) - Fee distribution, and atom provision distribution +- [Distribution](distribution) - Fee distribution, and atom provision distribution +- [Inflation](inflation) - Atom provision creation - [IBC](ibc) - Inter-Blockchain Communication (IBC) protocol. - [Other](other) - Other components of the Cosmos Hub, including the reserve pool, All in Bits vesting, etc. diff --git a/docs/spec/distribution/end_block.md b/docs/spec/distribution/end_block.md new file mode 100644 index 000000000..bc6847ef4 --- /dev/null +++ b/docs/spec/distribution/end_block.md @@ -0,0 +1,36 @@ +# End Block + +At each endblock, the fees received are sorted to the proposer, community fund, +and global pool. When the validator is the proposer of the round, that +validator (and their delegators) receives between 1% and 5% of fee rewards, the +reserve tax is then charged, then the remainder is distributed proportionally +by voting power to all bonded validators independent of whether they voted +(social distribution). Note the social distribution is applied to proposer +validator in addition to the proposer reward. + +The amount of proposer reward is calculated from pre-commits Tendermint +messages in order to incentivize validators to wait and include additional +pre-commits in the block. All provision rewards are added to a provision reward +pool which validator holds individually +(`ValidatorDistribution.ProvisionsRewardPool`). + +``` +func SortFees(feesCollected sdk.Coins, global Global, proposer ValidatorDistribution, + sumPowerPrecommitValidators, totalBondedTokens, communityTax sdk.Dec) + + feesCollectedDec = MakeDecCoins(feesCollected) + proposerReward = feesCollectedDec * (0.01 + 0.04 + * sumPowerPrecommitValidators / totalBondedTokens) + proposer.ProposerPool += proposerReward + + communityFunding = feesCollectedDec * communityTax + global.CommunityFund += communityFunding + + poolReceived = feesCollectedDec - proposerReward - communityFunding + global.Pool += poolReceived + global.EverReceivedPool += poolReceived + global.LastReceivedPool = poolReceived + + SetValidatorDistribution(proposer) + SetGlobal(global) +``` diff --git a/docs/spec/provisioning/fee_distribution_model.xlsx b/docs/spec/distribution/example_sheet/distribution.xlsx similarity index 100% rename from docs/spec/provisioning/fee_distribution_model.xlsx rename to docs/spec/distribution/example_sheet/distribution.xlsx diff --git a/docs/spec/distribution/future_improvements.md b/docs/spec/distribution/future_improvements.md new file mode 100644 index 000000000..954fb4d62 --- /dev/null +++ b/docs/spec/distribution/future_improvements.md @@ -0,0 +1,16 @@ +## Future Improvements + +### Power Change + +Within the current implementation all power changes ever made are indefinitely stored +within the current state. In the future this state should be trimmed on an epoch basis. Delegators +which will have not withdrawn their fees will be penalized in some way, depending on what is +computationally feasible this may include: + - burning non-withdrawn fees + - requiring more expensive withdrawal costs which include proofs from archive nodes of historical state + +In addition or as an alternative it may make sense to implement a "rolling" epoch which cycles through +all the delegators in small groups (for example 5 delegators per block) and just runs the withdrawal transaction +at standard rates and takes transaction fees from the withdrawal amount. + + diff --git a/docs/spec/distribution/overview.md b/docs/spec/distribution/overview.md new file mode 100644 index 000000000..5e28e8b3b --- /dev/null +++ b/docs/spec/distribution/overview.md @@ -0,0 +1,54 @@ +# Distribution + +## Overview + +Collected fees are pooled globally and divided out passively to validators and +delegators. Each validator has the opportunity to charge commission to the +delegators on the fees collected on behalf of the delegators by the validators. +Fees are paid directly into a global fee pool, and validator proposer-reward +pool. Due to the nature of passive accounting whenever changes to parameters +which affect the rate of fee distribution occurs, withdrawal of fees must also +occur when: + + - withdrawing one must withdrawal the maximum amount they are entitled + too, leaving nothing in the pool, + - bonding, unbonding, or re-delegating tokens to an existing account a + full withdrawal of the fees must occur (as the rules for lazy accounting + change), + - a validator chooses to change the commission on fees, all accumulated + commission fees must be simultaneously withdrawn. + +The above scenarios are covered in `triggers.md`. + +The distribution mechanism outlines herein is used to lazily distribute the +following between validators and associated delegators: + - multi-token fees to be socially distributed, + - proposer reward pool, + - inflated atom provisions, and + - validator commission on all rewards earned by their delegators stake + +Fees are pooled within a global pool, as well as validator specific +proposer-reward pools. The mechanisms used allow for validators and delegators +to independently and lazily withdrawn their rewards. As a part of the lazy +computations adjustment factors must be maintained for each validator and +delegator to determine the true proportion of fees in each pool which they are +entitled too. Adjustment factors are updated every time a validator or +delegator's voting power changes. Validators and delegators must withdraw all +fees they are entitled too before they can change their portion of bonded +Atoms. + +## Affect on Staking + + +Charging commission on Atom provisions while also allowing for Atom-provisions +to be auto-bonded (distributed directly to the validators bonded stake) is +problematic within DPoS. Fundamentally these two mechnisms are mutually +exclusive. If there are atoms commissions and auto-bonding Atoms, the portion +of Atoms the fee distribution calculation would become very large as the Atom +portion for each delegator would change each block making a withdrawal of fees +for a delegator require a calculation for every single block since the last +withdrawal. In conclusion we can only have atom commission and unbonded atoms +provisions, or bonded atom provisions with no Atom commission, and we elect to +implement the former. Stakeholders wishing to rebond their provisions may elect +to set up a script to periodically withdraw and rebond fees. + diff --git a/docs/spec/distribution/state.md b/docs/spec/distribution/state.md new file mode 100644 index 000000000..7865c085e --- /dev/null +++ b/docs/spec/distribution/state.md @@ -0,0 +1,100 @@ +## State + +### Global + +All globally tracked parameters for distribution are stored within +`Global`. Rewards are collected and added to the reward pool and +distributed to validators/delegators from here. + +Note that the reward pool holds decimal coins (`DecCoins`) to allow +for fractions of coins to be received from operations like inflation. +When coins are distributed from the pool they are truncated back to +`sdk.Coins` which are non-decimal. + + - Global: `0x00 -> amino(global)` + +```golang +// coins with decimal +type DecCoins []DecCoin + +type DecCoin struct { + Amount sdk.Dec + Denom string +} + +type Global struct { + PrevBondedTokens sdk.Dec // bonded token amount for the global pool on the previous block + Adjustment sdk.Dec // global adjustment factor for lazy calculations + Pool DecCoins // funds for all validators which have yet to be withdrawn + PrevReceivedPool DecCoins // funds added to the pool on the previous block + EverReceivedPool DecCoins // total funds ever added to the pool + CommunityFund DecCoins // pool for community funds yet to be spent +} +``` + +### Validator Distribution + +Validator distribution information for the relevant validator is updated each time: + 1. delegation amount to a validator are updated, + 2. a validator successfully proposes a block and receives a reward, + 3. any delegator withdraws from a validator, or + 4. the validator withdraws it's commission. + + - ValidatorDistribution: `0x02 | ValOwnerAddr -> amino(validatorDistribution)` + +```golang +type ValidatorDistribution struct { + CommissionWithdrawalHeight int64 // last time this validator withdrew commission + Adjustment sdk.Dec // global pool adjustment factor + ProposerAdjustment DecCoins // proposer pool adjustment factor + ProposerPool DecCoins // reward pool collected from being the proposer + EverReceivedProposerReward DecCoins // all rewards ever collected from being the proposer + PrevReceivedProposerReward DecCoins // previous rewards collected from being the proposer + PrevBondedTokens sdk.Dec // bonded token amount on the previous block + PrevDelegatorShares sdk.Dec // amount of delegator shares for the validator on the previous block +} +``` + +### Delegation Distribution + +Each delegation holds multiple adjustment factors to specify its entitlement to +the rewards from a validator. `AdjustmentPool` is used to passively calculate +each bonds entitled fees from the `RewardPool`. `AdjustmentPool` is used to +passively calculate each bonds entitled fees from +`ValidatorDistribution.ProposerRewardPool` + + - DelegatorDistribution: ` 0x02 | DelegatorAddr | ValOwnerAddr -> amino(delegatorDist)` + +```golang +type DelegatorDist struct { + WithdrawalHeight int64 // last time this delegation withdrew rewards + Adjustment sdk.Dec // fee provisioning adjustment factor + AdjustmentProposer DecCoins // proposers pool adjustment factor + PrevTokens sdk.Dec // bonded tokens held by the delegation on the previous block + PrevShares sdk.Dec // delegator shares held by the delegation on the previous block +} +``` + +### Power Change + +Every instance that the voting power changes, information about the state of +the validator set during the change must be recorded as a `PowerChange` for +other validators to run through. Each power change is indexed by its block +height. + + - PowerChange: `0x03 | amino(Height) -> amino(validatorDist)` + +```golang +type PowerChange struct { + Height int64 // block height at change + ValidatorBondedTokens sdk.Dec // following used to create distribution scenarios + ValidatorDelegatorShares sdk.Dec + ValidatorDelegatorShareExRate sdk.Dec + ValidatorCommission sdk.Dec + PoolBondedTokens sdk.Dec + Global Global + ValDistr ValidatorDistribution + DelegationShares sdk.Dec + DelDistr DelegatorDistribution +} +``` diff --git a/docs/spec/distribution/transactions.md b/docs/spec/distribution/transactions.md new file mode 100644 index 000000000..1401c3b85 --- /dev/null +++ b/docs/spec/distribution/transactions.md @@ -0,0 +1,399 @@ +# Transactions + +## TxWithdrawDelegation + +When a delegator wishes to withdraw their transaction fees it must send +`TxWithdrawDelegation`. Note that parts of this transaction logic are also +triggered each with any change in individual delegations, such as an unbond, +redelegation, or delegation of additional tokens to a specific validator. + +Each time a withdrawal is made by a recipient the adjustment term must be +modified for each block with a change in distributors shares since the time of +last withdrawal. This is accomplished by iterating over all relevant +`PowerChange`'s stored in distribution state. + + +```golang +type TxWithdrawDelegation struct { + delegatorAddr sdk.AccAddress + withdrawAddr sdk.AccAddress // address to make the withdrawal to +} + +func WithdrawDelegator(delegatorAddr, withdrawAddr sdk.AccAddress) + entitlement = GetDelegatorEntitlement(delegatorAddr) + AddCoins(withdrawAddr, totalEntitlment.TruncateDecimal()) + +func GetDelegatorEntitlement(delegatorAddr sdk.AccAddress) DecCoins + + // compile all the distribution scenarios + delegations = GetDelegations(delegatorAddr) + DelDistr = GetDelegationDistribution(delegation.DelegatorAddr, + delegation.ValidatorAddr) + pcs = GetPowerChanges(DelDistr.WithdrawalHeight) + + // update all adjustment factors for each delegation since last withdrawal + for pc = range pcs + for delegation = range delegations + DelDistr = GetDelegationDistribution(delegation.DelegatorAddr, + delegation.ValidatorAddr) + pc.ProcessPowerChangeDelegation(delegation, DelDistr) + + // collect all entitled fees + entitlement = 0 + for delegation = range delegations + global = GetGlobal() + pool = GetPool() + DelDistr = GetDelegationDistribution(delegation.DelegatorAddr, + delegation.ValidatorAddr) + ValDistr = GetValidatorDistribution(delegation.ValidatorAddr) + validator = GetValidator(delegation.ValidatorAddr) + + scenerio1 = NewDelegationFromGlobalPool(delegation, validator, + pool, global, ValDistr, DelDistr) + scenerio2 = NewDelegationFromProvisionPool(delegation, validator, + ValDistr, DelDistr) + entitlement += scenerio1.WithdrawalEntitlement() + entitlement += scenerio2.WithdrawalEntitlement() + + return entitlement + +func (pc PowerChange) ProcessPowerChangeDelegation(delegation sdk.Delegation, + DelDistr DelegationDistribution) + + // get the historical scenarios + scenario1 = pc.DelegationFromGlobalPool(delegation, DelDistr) + scenario2 = pc.DelegationFromProvisionPool(delegation, DelDistr) + + // process the adjustment factors + scenario1.UpdateAdjustmentForPowerChange(pc.Height) + scenario2.UpdateAdjustmentForPowerChange(pc.Height) +``` + +## TxWithdrawValidator + +When a validator wishes to withdraw their transaction fees it must send +`TxWithdrawDelegation`. Note that parts of this transaction logic is also +triggered each with any change in individual delegations, such as an unbond, +redelegation, or delegation of additional tokens to a specific validator. This +transaction withdraws the validators commission rewards, as well as any rewards +earning on their self-delegation. + +```golang +type TxWithdrawValidator struct { + ownerAddr sdk.AccAddress // validator address to withdraw from + withdrawAddr sdk.AccAddress // address to make the withdrawal to +} + +func WithdrawalValidator(ownerAddr, withdrawAddr sdk.AccAddress) + + // update the delegator adjustment factors and also withdrawal delegation fees + entitlement = GetDelegatorEntitlement(ownerAddr) + + // update the validator adjustment factors for commission + ValDistr = GetValidatorDistribution(ownerAddr.ValidatorAddr) + pcs = GetPowerChanges(ValDistr.CommissionWithdrawalHeight) + for pc = range pcs + pc.ProcessPowerChangeCommission() + + // withdrawal validator commission rewards + global = GetGlobal() + pool = GetPool() + ValDistr = GetValidatorDistribution(delegation.ValidatorAddr) + validator = GetValidator(delegation.ValidatorAddr) + + scenerio1 = NewCommissionFromGlobalPool(validator, + pool, global, ValDistr) + scenerio2 = CommissionFromProposerPool(validator, ValDistr) + entitlement += scenerio1.WithdrawalEntitlement() + entitlement += scenerio2.WithdrawalEntitlement() + + AddCoins(withdrawAddr, totalEntitlment.TruncateDecimal()) + +func (pc PowerChange) ProcessPowerChangeCommission() + + // get the historical scenarios + scenario1 = pc.CommissionFromGlobalPool() + scenario2 = pc.CommissionFromProposerPool() + + // process the adjustment factors + scenario1.UpdateAdjustmentForPowerChange(pc.Height) + scenario2.UpdateAdjustmentForPowerChange(pc.Height) +``` + +## Common Calculations + +### Distribution scenario + +A common form of abstracted calculations exists between validators and +delegations attempting to withdrawal their rewards, either from `Global.Pool` +or from `ValidatorDistribution.ProposerPool`. With the following interface +fulfilled the entitled fees for the various scenarios can be calculated. + +```golang +type DistributionScenario interface { + DistributorTokens() DecCoins // current tokens from distributor + DistributorCumulativeTokens() DecCoins // total tokens ever received + DistributorPrevReceivedTokens() DecCoins // last value of tokens received + DistributorShares() sdk.Dec // current shares + DistributorPrevShares() sdk.Dec // shares last block + + RecipientAdjustment() sdk.Dec + RecipientShares() sdk.Dec // current shares + RecipientPrevShares() sdk.Dec // shares last block + + ModifyAdjustments(withdrawal sdk.Dec) // proceedure to modify adjustment factors +} +``` + +#### Entitled reward from distribution scenario + +The entitlement to the distributor's tokens held can be accounted for lazily. +To begin this calculation we must determine the recipient's _simple pool_ and +_projected pool_. The simple pool represents a lazy accounting of what a +recipient's entitlement to the distributor's tokens would be if all recipients +for that distributor had static shares (equal to the current shares), and no +recipients had ever withdrawn their entitled rewards. The projected pool +represents the anticipated recipient's entitlement to the distributors tokens +based on the current blocks token input (for example fees reward received) to +the distributor, and the distributor's tokens and shares of the previous block +assuming that neither had changed in the current block. Using the simple and +projected pools we can determine all cumulative changes which have taken place +outside of the recipient and adjust the recipient's _adjustment factor_ to +account for these changes and ultimately keep track of the correct entitlement +to the distributors tokens. + +``` +func (d DistributionScenario) RecipientCount(height int64) sdk.Dec + return v.RecipientShares() * height + +func (d DistributionScenario) GlobalCount(height int64) sdk.Dec + return d.DistributorShares() * height + +func (d DistributionScenario) SimplePool() DecCoins + return d.RecipientCount() / d.GlobalCount() * d.DistributorCumulativeTokens + +func (d DistributionScenario) ProjectedPool(height int64) DecCoins + return d.RecipientPrevShares() * (height-1) + / (d.DistributorPrevShares() * (height-1)) + * d.DistributorCumulativeTokens + + d.RecipientShares() / d.DistributorShares() + * d.DistributorPrevReceivedTokens() +``` + +The `DistributionScenario` _adjustment_ terms account for changes in +recipient/distributor shares and recipient withdrawals. The adjustment factor +must be modified whenever the recipient withdraws from the distributor or the +distributor's/recipient's shares are changed. + - When the shares of the recipient is changed the adjustment factor is + increased/decreased by the difference between the _simple_ and _projected_ + pools. In other words, the cumulative difference in the shares if the shares + has been the new shares as opposed to the old shares for the entire duration of + the blockchain up the previous block. + - When a recipient makes a withdrawal the adjustment factor is increased by the + withdrawal amount. + +``` +func (d DistributionScenario) UpdateAdjustmentForPowerChange(height int64) + simplePool = d.SimplePool() + projectedPool = d.ProjectedPool(height) + AdjustmentChange = simplePool - projectedPool + if AdjustmentChange > 0 + d.ModifyAdjustments(AdjustmentChange) + +func (d DistributionScenario) WithdrawalEntitlement() DecCoins + entitlement = d.SimplePool() - d.RecipientAdjustment() + d.ModifyAdjustments(entitlement) + return entitlement +``` + +### Distribution scenarios + +Note that the distribution scenario structures are found in `state.md`. + +#### Delegation's entitlement to Global.Pool + +For delegations (including validator's self-delegation) all fees from fee pool +are subject to commission rate from the owner of the validator. The global +shares should be taken as true number of global bonded shares. The recipients +shares should be taken as the bonded tokens less the validator's commission. + +``` +type DelegationFromGlobalPool struct { + DelegationShares sdk.Dec + ValidatorCommission sdk.Dec + ValidatorBondedTokens sdk.Dec + ValidatorDelegatorShareExRate sdk.Dec + PoolBondedTokens sdk.Dec + Global Global + ValDistr ValidatorDistribution + DelDistr DelegatorDistribution +} + +func (d DelegationFromGlobalPool) DistributorTokens() DecCoins + return d.Global.Pool + +func (d DelegationFromGlobalPool) DistributorCumulativeTokens() DecCoins + return d.Global.EverReceivedPool + +func (d DelegationFromGlobalPool) DistributorPrevReceivedTokens() DecCoins + return d.Global.PrevReceivedPool + +func (d DelegationFromGlobalPool) DistributorShares() sdk.Dec + return d.PoolBondedTokens + +func (d DelegationFromGlobalPool) DistributorPrevShares() sdk.Dec + return d.Global.PrevBondedTokens + +func (d DelegationFromGlobalPool) RecipientShares() sdk.Dec + return d.DelegationShares * d.ValidatorDelegatorShareExRate() * + d.ValidatorBondedTokens() * (1 - d.ValidatorCommission) + +func (d DelegationFromGlobalPool) RecipientPrevShares() sdk.Dec + return d.DelDistr.PrevTokens + +func (d DelegationFromGlobalPool) RecipientAdjustment() sdk.Dec + return d.DelDistr.Adjustment + +func (d DelegationFromGlobalPool) ModifyAdjustments(withdrawal sdk.Dec) + d.ValDistr.Adjustment += withdrawal + d.DelDistr.Adjustment += withdrawal + d.global.Adjustment += withdrawal + SetValidatorDistribution(d.ValDistr) + SetDelegatorDistribution(d.DelDistr) + SetGlobal(d.Global) +``` + +#### Delegation's entitlement to ValidatorDistribution.ProposerPool + +Delegations (including validator's self-delegation) are still subject +commission on the rewards gained from the proposer pool. Global shares in this +context is actually the validators total delegations shares. The recipient's +shares is taken as the effective delegation shares less the validator's +commission. + +``` +type DelegationFromProposerPool struct { + DelegationShares sdk.Dec + ValidatorCommission sdk.Dec + ValidatorDelegatorShares sdk.Dec + ValDistr ValidatorDistribution + DelDistr DelegatorDistribution +} + +func (d DelegationFromProposerPool) DistributorTokens() DecCoins + return d.ValDistr.ProposerPool + +func (d DelegationFromProposerPool) DistributorCumulativeTokens() DecCoins + return d.ValDistr.EverReceivedProposerReward + +func (d DelegationFromProposerPool) DistributorPrevReceivedTokens() DecCoins + return d.ValDistr.PrevReceivedProposerReward + +func (d DelegationFromProposerPool) DistributorShares() sdk.Dec + return d.ValidatorDelegatorShares + +func (d DelegationFromProposerPool) DistributorPrevShares() sdk.Dec + return d.ValDistr.PrevDelegatorShares + +func (d DelegationFromProposerPool) RecipientShares() sdk.Dec + return d.DelegationShares * (1 - d.ValidatorCommission) + +func (d DelegationFromProposerPool) RecipientPrevShares() sdk.Dec + return d.DelDistr.PrevShares + +func (d DelegationFromProposerPool) RecipientAdjustment() sdk.Dec + return d.DelDistr.AdjustmentProposer + +func (d DelegationFromProposerPool) ModifyAdjustments(withdrawal sdk.Dec) + d.ValDistr.AdjustmentProposer += withdrawal + d.DelDistr.AdjustmentProposer += withdrawal + SetValidatorDistribution(d.ValDistr) + SetDelegatorDistribution(d.DelDistr) +``` + +#### Validators's commission entitlement to Global.Pool + +Similar to a delegator's entitlement, but with recipient shares based on the +commission portion of bonded tokens. + +``` +type CommissionFromGlobalPool struct { + ValidatorBondedTokens sdk.Dec + ValidatorCommission sdk.Dec + PoolBondedTokens sdk.Dec + Global Global + ValDistr ValidatorDistribution +} + +func (c CommissionFromGlobalPool) DistributorTokens() DecCoins + return c.Global.Pool + +func (c CommissionFromGlobalPool) DistributorCumulativeTokens() DecCoins + return c.Global.EverReceivedPool + +func (c CommissionFromGlobalPool) DistributorPrevReceivedTokens() DecCoins + return c.Global.PrevReceivedPool + +func (c CommissionFromGlobalPool) DistributorShares() sdk.Dec + return c.PoolBondedTokens + +func (c CommissionFromGlobalPool) DistributorPrevShares() sdk.Dec + return c.Global.PrevBondedTokens + +func (c CommissionFromGlobalPool) RecipientShares() sdk.Dec + return c.ValidatorBondedTokens() * c.ValidatorCommission + +func (c CommissionFromGlobalPool) RecipientPrevShares() sdk.Dec + return c.ValDistr.PrevBondedTokens * c.ValidatorCommission + +func (c CommissionFromGlobalPool) RecipientAdjustment() sdk.Dec + return c.ValDistr.Adjustment + +func (c CommissionFromGlobalPool) ModifyAdjustments(withdrawal sdk.Dec) + c.ValDistr.Adjustment += withdrawal + c.Global.Adjustment += withdrawal + SetValidatorDistribution(c.ValDistr) + SetGlobal(c.Global) +``` + +#### Validators's commission entitlement to ValidatorDistribution.ProposerPool + +Similar to a delegators entitlement to the proposer pool, but with recipient +shares based on the commission portion of the total delegator shares. + +``` +type CommissionFromProposerPool struct { + ValidatorDelegatorShares sdk.Dec + ValidatorCommission sdk.Dec + ValDistr ValidatorDistribution +} + +func (c CommissionFromProposerPool) DistributorTokens() DecCoins + return c.ValDistr.ProposerPool + +func (c CommissionFromProposerPool) DistributorCumulativeTokens() DecCoins + return c.ValDistr.EverReceivedProposerReward + +func (c CommissionFromProposerPool) DistributorPrevReceivedTokens() DecCoins + return c.ValDistr.PrevReceivedProposerReward + +func (c CommissionFromProposerPool) DistributorShares() sdk.Dec + return c.ValidatorDelegatorShares + +func (c CommissionFromProposerPool) DistributorPrevShares() sdk.Dec + return c.ValDistr.PrevDelegatorShares + +func (c CommissionFromProposerPool) RecipientShares() sdk.Dec + return c.ValidatorDelegatorShares * (c.ValidatorCommission) + +func (c CommissionFromProposerPool) RecipientPrevShares() sdk.Dec + return c.ValDistr.PrevDelegatorShares * (c.ValidatorCommission) + +func (c CommissionFromProposerPool) RecipientAdjustment() sdk.Dec + return c.ValDistr.AdjustmentProposer + +func (c CommissionFromProposerPool) ModifyAdjustments(withdrawal sdk.Dec) + c.ValDistr.AdjustmentProposer += withdrawal + SetValidatorDistribution(c.ValDistr) +``` + diff --git a/docs/spec/distribution/triggers.md b/docs/spec/distribution/triggers.md new file mode 100644 index 000000000..8800609a4 --- /dev/null +++ b/docs/spec/distribution/triggers.md @@ -0,0 +1,31 @@ +# Triggers + +## Create validator distribution + + - triggered-by: validator entering bonded validator group (`stake.bondValidator()`) + +Whenever a new validator is added to the Tendermint validator set they are +entitled to begin earning rewards of atom provisions and fees. At this point +`ValidatorDistribution.Pool()` must be zero (as the validator has not yet +earned any rewards) meaning that the initial value for `validator.Adjustment` +must be set to the value of `validator.SimplePool()` for the height which the +validator is added on the validator set. + +## Create or modify delegation distribution + + - triggered-by: `stake.TxDelegate`, `stake.TxBeginRedelegate`, `stake.TxBeginUnbonding` + +The pool of a new delegator bond will be 0 for the height at which the bond was +added. This is achieved by setting `DelegationDistribution.WithdrawalHeight` to +the height which the bond was added. Additionally the `AdjustmentPool` and +`AdjustmentProposerPool` must be set to the equivalent values of +`DelegationDistribution.SimplePool()` and +`DelegationDistribution.SimpleProposerPool()` for the height of delegation. + +## Commission rate change + + - triggered-by: `stake.TxEditValidator` + +If a validator changes its commission rate, all commission on fees must be +simultaneously withdrawn using the transaction `TxWithdrawValidator` + diff --git a/docs/spec/inflation/end_block.md b/docs/spec/inflation/end_block.md new file mode 100644 index 000000000..49408a3f0 --- /dev/null +++ b/docs/spec/inflation/end_block.md @@ -0,0 +1,52 @@ +# End Block + +Validator provisions are minted on an hourly basis (the first block of a new +hour). The annual target of between 7% and 20%. The long-term target ratio of +bonded tokens to unbonded tokens is 67%. + +The target annual inflation rate is recalculated for each provisions cycle. The +inflation is also subject to a rate change (positive or negative) depending on +the distance from the target ratio (67%). The maximum rate change possible is +defined to be 13% per year, however the annual inflation is capped as between +7% and 20%. + +Within the inflation module the tokens are created, and fed to the distribution +module to be further processed and distributed similarly to fee distribution (with +the exception that there are no special rewards for the block proposer) + +Note that params are global params (TODO: link to the global params spec) + +``` +EndBlock(): + + //process provisions + hrsPerYr = 8766 // as defined by a julian year of 365.25 days + precision = 10000 + + time = BFTTime() // time is in seconds + if time > GetInflationLastTime() + 3600 + SetInflationLastTime(InflationLastTime + 3600) + inflation = nextInflation(hrsPerYr).Round(precision) + SetInflation(inflation) + + provisions = inflation * (pool.TotalSupply() / hrsPerYr) + pool.LooseTokens += provisions + + distribution.AddInflation(provisions) + +nextInflation(hrsPerYr rational.Rat): + + bondedRatio = pool.BondedPool / pool.TotalSupply() + + inflationRateChangePerYear = (1 - bondedRatio / params.GoalBonded) * params.InflationRateChange + inflationRateChange = inflationRateChangePerYear / hrsPerYr + + inflation = GetInflation() + inflationRateChange + switch inflation + case > params.InflationMax + return params.InflationMax + case < params.InflationMin + return params.InflationMin + default + return inflation +``` diff --git a/docs/spec/inflation/state.md b/docs/spec/inflation/state.md new file mode 100644 index 000000000..dea10c046 --- /dev/null +++ b/docs/spec/inflation/state.md @@ -0,0 +1,21 @@ +## State + +### Inflation + - key: `0x00` + - value: `amino(Inflation)` + +The current annual inflation rate. + +```golang +type Inflation sdk.Rat +``` + +### InflationLastTime + - key: `0x01` + - value: `amino(InflationLastTime)` + +The last unix time which the inflation was processed for. + +```golang +type InflationLastTime int64 +``` diff --git a/docs/spec/provisioning/overview.md b/docs/spec/provisioning/overview.md deleted file mode 100644 index 046223a4b..000000000 --- a/docs/spec/provisioning/overview.md +++ /dev/null @@ -1,229 +0,0 @@ -# Fee Distribution - -## Overview - -Fees are pooled separately and withdrawn lazily, at any time. They are not -bonded, and can be paid in multiple tokens. An adjustment factor is maintained -for each validator and delegator to determine the true proportion of fees in -the pool they are entitled too. Adjustment factors are updated every time a -validator or delegator's voting power changes. Validators and delegators must -withdraw all fees they are entitled too before they can bond or unbond Atoms. - -## Affect on Staking - -Because fees are optimized to note - -Commission on Atom Provisions and having atoms autobonded are mutually -exclusive (we can’t have both). The reason for this is that if there are atoms -commissions and autobonding, the portion of atoms the fee distribution -calculation would become very large as the atom portion for each delegator -would change each block making a withdrawal of fees for a delegator require a -calculation for every single block since the last withdrawal. Conclusion we can -only have atom commission and unbonded atoms provisions, or bonded atom -provisions and no atom commission - -## Fee Calculations - -Collected fees are pooled globally and divided out passively to validators and -delegators. Each validator has the opportunity to charge commission to the -delegators on the fees collected on behalf of the delegators by the validators. -Fees are paid directly into a global fee pool. Due to the nature of of passive -accounting whenever changes to parameters which affect the rate of fee -distribution occurs, withdrawal of fees must also occur. - - - when withdrawing one must withdrawal the maximum amount they are entitled - too, leaving nothing in the pool, - - when bonding, unbonding, or re-delegating tokens to an existing account a - full withdrawal of the fees must occur (as the rules for lazy accounting - change), - - when a validator chooses to change the commission on fees, all accumulated - commission fees must be simultaneously withdrawn. - -When the validator is the proposer of the round, that validator (and their -delegators) receives between 1% and 5% of fee rewards, the reserve tax is then -charged, then the remainder is distributed socially by voting power to all -validators including the proposer validator. The amount of proposer reward is -calculated from pre-commits Tendermint messages. All provision rewards are -added to a provision reward pool which validator holds individually. Here note -that `BondedShares` represents the sum of all voting power saved in the -`GlobalState` (denoted `gs`). - -``` -proposerReward = feesCollected * (0.01 + 0.04 - * sumOfVotingPowerOfPrecommitValidators / gs.BondedShares) -validator.ProposerRewardPool += proposerReward - -reserveTaxed = feesCollected * params.ReserveTax -gs.ReservePool += reserveTaxed - -distributedReward = feesCollected - proposerReward - reserveTaxed -gs.FeePool += distributedReward -gs.SumFeesReceived += distributedReward -gs.RecentFee = distributedReward -``` - -The entitlement to the fee pool held by the each validator can be accounted for -lazily. First we must account for a validator's `count` and `adjustment`. The -`count` represents a lazy accounting of what that validators entitlement to the -fee pool would be if there `VotingPower` was to never change and they were to -never withdraw fees. - -``` -validator.count = validator.VotingPower * BlockHeight -``` - -Similarly the GlobalState count can be passively calculated whenever needed, -where `BondedShares` is the updated sum of voting powers from all validators. - -``` -gs.count = gs.BondedShares * BlockHeight -``` - -The `adjustment` term accounts for changes in voting power and withdrawals of -fees. The adjustment factor must be persisted with the validator and modified -whenever fees are withdrawn from the validator or the voting power of the -validator changes. When the voting power of the validator changes the -`Adjustment` factor is increased/decreased by the cumulative difference in the -voting power if the voting power has been the new voting power as opposed to -the old voting power for the entire duration of the blockchain up the previous -block. Each time there is an adjustment change the GlobalState (denoted `gs`) -`Adjustment` must also be updated. - -``` -simplePool = validator.count / gs.count * gs.SumFeesReceived -projectedPool = validator.PrevPower * (height-1) - / (gs.PrevPower * (height-1)) * gs.PrevFeesReceived - + validator.Power / gs.Power * gs.RecentFee - -AdjustmentChange = simplePool - projectedPool -validator.AdjustmentRewardPool += AdjustmentChange -gs.Adjustment += AdjustmentChange -``` - -Every instance that the voting power changes, information about the state of -the validator set during the change must be recorded as a `powerChange` for -other validators to run through. Before any validator modifies its voting power -it must first run through the above calculation to determine the change in -their `caandidate.AdjustmentRewardPool` for all historical changes in the set -of `powerChange` which they have not yet synced to. The set of all -`powerChange` may be trimmed from its oldest members once all validators have -synced past the height of the oldest `powerChange`. This trim procedure will -occur on an epoch basis. - -```golang -type powerChange struct { - height int64 // block height at change - power rational.Rat // total power at change - prevpower rational.Rat // total power at previous height-1 - feesin coins.Coin // fees in at block height - prevFeePool coins.Coin // total fees in at previous block height -} -``` - -Note that the adjustment factor may result as negative if the voting power of a -different validator has decreased. - -``` -validator.AdjustmentRewardPool += withdrawn -gs.Adjustment += withdrawn -``` - -Now the entitled fee pool of each validator can be lazily accounted for at -any given block: - -``` -validator.feePool = validator.simplePool - validator.Adjustment -``` - -So far we have covered two sources fees which can be withdrawn from: Fees from -proposer rewards (`validator.ProposerRewardPool`), and fees from the fee pool -(`validator.feePool`). However we should note that all fees from fee pool are -subject to commission rate from the owner of the validator. These next -calculations outline the math behind withdrawing fee rewards as either a -delegator to a validator providing commission, or as the owner of a validator -who is receiving commission. - -### Calculations For Delegators and Validators - -The same mechanism described to calculate the fees which an entire validator is -entitled to is be applied to delegator level to determine the entitled fees for -each delegator and the validators entitled commission from `gs.FeesPool` and -`validator.ProposerRewardPool`. - -The calculations are identical with a few modifications to the parameters: - - Delegator's entitlement to `gs.FeePool`: - - entitled party voting power should be taken as the effective voting power - after commission is retrieved, - `bond.Shares/validator.TotalDelegatorShares * validator.VotingPower * (1 - validator.Commission)` - - Delegator's entitlement to `validator.ProposerFeePool` - - global power in this context is actually shares - `validator.TotalDelegatorShares` - - entitled party voting power should be taken as the effective shares after - commission is retrieved, `bond.Shares * (1 - validator.Commission)` - - Validator's commission entitlement to `gs.FeePool` - - entitled party voting power should be taken as the effective voting power - of commission portion of total voting power, - `validator.VotingPower * validator.Commission` - - Validator's commission entitlement to `validator.ProposerFeePool` - - global power in this context is actually shares - `validator.TotalDelegatorShares` - - entitled party voting power should be taken as the of commission portion - of total delegators shares, - `validator.TotalDelegatorShares * validator.Commission` - -For more implementation ideas see spreadsheet `spec/AbsoluteFeeDistrModel.xlsx` - -As mentioned earlier, every time the voting power of a delegator bond is -changing either by unbonding or further bonding, all fees must be -simultaneously withdrawn. Similarly if the validator changes the commission -rate, all commission on fees must be simultaneously withdrawn. - -### Other general notes on fees accounting - -- When a delegator chooses to re-delegate shares, fees continue to accumulate - until the re-delegation queue reaches maturity. At the block which the queue - reaches maturity and shares are re-delegated all available fees are - simultaneously withdrawn. -- Whenever a totally new validator is added to the validator set, the `accum` - of the entire validator must be 0, meaning that the initial value for - `validator.Adjustment` must be set to the value of `canidate.Count` for the - height which the validator is added on the validator set. -- The feePool of a new delegator bond will be 0 for the height at which the bond - was added. This is achieved by setting `DelegatorBond.FeeWithdrawalHeight` to - the height which the bond was added. - -### Atom provisions - -Validator provisions are minted on an hourly basis (the first block of a new -hour). The annual target of between 7% and 20%. The long-term target ratio of -bonded tokens to unbonded tokens is 67%. - -The target annual inflation rate is recalculated for each provisions cycle. The -inflation is also subject to a rate change (positive or negative) depending on -the distance from the desired ratio (67%). The maximum rate change possible is -defined to be 13% per year, however the annual inflation is capped as between -7% and 20%. - -```go -inflationRateChange(0) = 0 -Inflation(0) = 0.07 - -bondedRatio = Pool.BondedTokens / Pool.TotalSupplyTokens -AnnualInflationRateChange = (1 - bondedRatio / 0.67) * 0.13 - -annualInflation += AnnualInflationRateChange - -if annualInflation > 0.20 then Inflation = 0.20 -if annualInflation < 0.07 then Inflation = 0.07 - -provisionTokensHourly = Pool.TotalSupplyTokens * Inflation / (365.25*24) -``` - -Because the validators hold a relative bonded share (`GlobalStakeShares`), when -more bonded tokens are added proportionally to all validators, the only term -which needs to be updated is the `GlobalState.BondedPool`. So for each -provisions cycle: - -```go -Pool.BondedPool += provisionTokensHourly -``` diff --git a/docs/spec/provisioning/state.md b/docs/spec/provisioning/state.md deleted file mode 100644 index 0711b01aa..000000000 --- a/docs/spec/provisioning/state.md +++ /dev/null @@ -1,13 +0,0 @@ - - -Validator - -* Adjustment factor used to passively calculate each validators entitled fees - from `GlobalState.FeePool` - -Delegation Shares - -* AdjustmentFeePool: Adjustment factor used to passively calculate each bonds - entitled fees from `GlobalState.FeePool` -* AdjustmentRewardPool: Adjustment factor used to passively calculate each - bonds entitled fees from `Validator.ProposerRewardPool` diff --git a/docs/spec/staking/README.md b/docs/spec/staking/README.md index 30dbf1dd3..16ce96a05 100644 --- a/docs/spec/staking/README.md +++ b/docs/spec/staking/README.md @@ -20,22 +20,19 @@ The following specification uses *Atom* as the native staking token. The module can be adapted to any Proof-Of-Stake blockchain by replacing *Atom* with the native staking token of the chain. -1. **[Design overview](overview.md)** -2. **Implementation** - 1. **[State](state.md)** - 1. Params - 1. Pool - 2. Validators - 3. Delegations - 2. **[Transactions](transactions.md)** - 1. Create-Validator - 2. Edit-Validator - 3. Repeal-Revocation - 4. Delegate - 5. Unbond - 6. Redelegate - 3. **[Validator Set Changes](valset-changes.md)** - 1. Validator set updates - 2. Slashing - 3. Automatic Unbonding -3. **[Future improvements](future_improvements.md)** +1. **[State](state.md)** + 1. Params + 1. Pool + 2. Validators + 3. Delegations +2. **[Transactions](transactions.md)** + 1. Create-Validator + 2. Edit-Validator + 3. Repeal-Revocation + 4. Delegate + 5. Unbond + 6. Redelegate +3. **[Validator Set Changes](valset-changes.md)** + 1. Validator set updates + 2. Slashing + 3. Automatic Unbonding diff --git a/docs/spec/staking/end_block.md b/docs/spec/staking/end_block.md index 61643f526..b40b06b92 100644 --- a/docs/spec/staking/end_block.md +++ b/docs/spec/staking/end_block.md @@ -1,10 +1,6 @@ # End-Block -Two staking activities are intended to be processed in the application end-block. - - inform Tendermint of validator set changes - - process and set atom inflation - -# Validator Set Changes +## Validator Set Changes The Tendermint validator set may be updated by state transitions that run at the end of every block. The Tendermint validator set may be changed by @@ -21,41 +17,3 @@ EndBlock() ValidatorSetChanges return vsc ``` -# Inflation - -The atom inflation rate is changed once per hour based on the current and -historic bond ratio - -```golang -processProvisions(): - hrsPerYr = 8766 // as defined by a julian year of 365.25 days - - time = BFTTime() - if time > pool.InflationLastTime + ProvisionTimeout - pool.InflationLastTime = time - pool.Inflation = nextInflation(hrsPerYr).Round(1000000000) - - provisions = pool.Inflation * (pool.TotalSupply / hrsPerYr) - - pool.LooseTokens += provisions - feePool += LooseTokens - - setPool(pool) - -nextInflation(hrsPerYr rational.Rat): - if pool.TotalSupply > 0 - bondedRatio = pool.BondedPool / pool.TotalSupply - else - bondedRation = 0 - - inflationRateChangePerYear = (1 - bondedRatio / params.GoalBonded) * params.InflationRateChange - inflationRateChange = inflationRateChangePerYear / hrsPerYr - - inflation = pool.Inflation + inflationRateChange - if inflation > params.InflationMax then inflation = params.InflationMax - - if inflation < params.InflationMin then inflation = params.InflationMin - - return inflation -``` - diff --git a/docs/spec/staking/state.md b/docs/spec/staking/state.md index 76101e609..376a38ced 100644 --- a/docs/spec/staking/state.md +++ b/docs/spec/staking/state.md @@ -2,13 +2,12 @@ ### Pool - - key: `01` - - value: `amino(pool)` - The pool is a space for all dynamic global state of the Cosmos Hub. It tracks information about the total amounts of Atoms in all states, moving Atom inflation information, etc. + - Pool: `0x01 -> amino(pool)` + ```golang type Pool struct { LooseTokens int64 // tokens not associated with any bonded validator @@ -21,12 +20,12 @@ type Pool struct { ``` ### Params - - key: `00` - - value: `amino(params)` Params is global data structure that stores system parameters and defines overall functioning of the stake module. + - Params: `0x00 -> amino(params)` + ```golang type Params struct { InflationRateChange sdk.Rat // maximum annual change in inflation rate @@ -81,16 +80,11 @@ type Validator struct { Description Description // description terms for the validator - // Needed for ordering vals in the bypower key + // Needed for ordering vals in the by-power key BondHeight int64 // earliest height as a bonded validator BondIntraTxCounter int16 // block-local tx index of validator change - CommissionInfo CommissionInfo // info about the validator's commission - - ProposerRewardPool sdk.Coins // reward pool collected from being the proposer - - // TODO: maybe this belongs in distribution module ? - LastBondedTokens sdk.Rat // last bonded token amount + CommissionInfo CommissionInfo // info about the validator's commission } type CommissionInfo struct { diff --git a/docs/spec/staking/transactions.md b/docs/spec/staking/transactions.md index 55b1a8ed1..4f2567958 100644 --- a/docs/spec/staking/transactions.md +++ b/docs/spec/staking/transactions.md @@ -1,5 +1,4 @@ - -### Transaction Overview +## Transaction Overview In this section we describe the processing of the transactions and the corresponding updates to the state. Transactions: @@ -23,6 +22,8 @@ Other notes: ### TxCreateValidator + - triggers: `distribution.CreateValidatorDistribution` + A validator is created using the `TxCreateValidator` transaction. ```golang @@ -82,7 +83,9 @@ editCandidacy(tx TxEditCandidacy): return ``` -### TxDelegation +### TxDelegate + + - triggers: `distribution.CreateOrModDelegationDistribution` Within this transaction the delegator provides coins, and in return receives some amount of their validator's delegator-shares that are assigned to diff --git a/docs/validators/validator-faq.md b/docs/validators/validator-faq.md index eea661042..6018ac323 100644 --- a/docs/validators/validator-faq.md +++ b/docs/validators/validator-faq.md @@ -14,9 +14,9 @@ The [Cosmos Hub](/introduction/cosmos-hub.md) is based on [Tendermint](/introduc The Cosmos Hub is a public Proof-Of-Stake (PoS) blockchain, meaning that validator's weight is determined by the amount of staking tokens (Atoms) bonded as collateral. These Atoms can be staked directly by the validator or delegated to them by Atom holders. -Any user in the system can declare its intention to become a validator by sending a "declare-candidacy" transaction. From there, they become validator candidates. +Any user in the system can declare its intention to become a validator by sending a `create-validator` transaction. From there, they become validators. -The weight (i.e. total stake) of a candidate determines wether or not it is a validator, and also how frequently this node will have to propose a block and how much revenue it will obtain. Initially, only the top 100 validator candidates with the most weight will be validators. If validators double sign, are frequently offline or do not participate in governance, their staked Atoms (including Atoms of users that delegated to them) can be destroyed, or 'slashed'. +The weight (i.e. total stake) of a validator determines wether or not it is an active validator, and also how frequently this node will have to propose a block and how much revenue it will obtain. Initially, only the top 100 validators with the most weight will be active validators. If validators double sign, are frequently offline or do not participate in governance, their staked Atoms (including Atoms of users that delegated to them) can be destroyed, or 'slashed'. ### What is a full-node? @@ -28,7 +28,7 @@ Of course, it is possible and encouraged for any user to run full-nodes even if Delegators are Atom holders who cannot, or do not want to run validator operations themselves. Through [Cosmos Voyager](/getting-started/voyager.md), a user can delegate Atoms to a validator and obtain a part of its revenue in exchange (for more detail on how revenue is distributed, see **What is the incentive to stake?** and **What is a validator's commission?** sections below). -Because they share revenue with their validators, delegators also share responsibility. Should a validator misbehave, each of its delegators will be partially slashed in proportion to their stake. This is why delegators should perform due diligence on validator candidates before delegating, as well as spreading their stake over multiple validators. +Because they share revenue with their validators, delegators also share responsibility. Should a validator misbehave, each of its delegators will be partially slashed in proportion to their stake. This is why delegators should perform due diligence on validators before delegating, as well as spreading their stake over multiple validators. Delegators play a critical role in the system, as they are responsible for choosing validators. Being a delegator is not a passive role: Delegators should actively monitor the actions of their validators and participate in governance. @@ -36,21 +36,22 @@ Delegators play a critical role in the system, as they are responsible for choos ### How to become a validator? -Any participant in the network can signal that they want to become a validator by sending a "declare-candidacy" transaction, where they must fill out the following parameters: +Any participant in the network can signal that they want to become a validator by sending a `create-validator` transaction, where they must fill out the following parameters: -* Validator's PubKey: The validator must signal an account with which it will perform its validator duties. The private key associated with PubKey is used to sign _prevotes_ and _precommits_. This way, validators can have different accounts for validating and holding liquid funds. -* Validator's name +* Validator's PubKey: The private key associated with PubKey is used to sign _prevotes_ and _precommits_. This way, validators can have different accounts for validating and holding liquid funds. +* Validator's Address: Application level address. This is the address used to identify your validator publicly. The private key associated with this address is used to bond, unbond, claim rewards, and participate in governance (in MVP only). +* Validator's name (moniker) * Validator's website (Optional) * Validator's description (Optional) * Initial commission rate: The commission rate on block provisions, block rewards and fees charged to delegators -* Maximum commission: The maximum commission rate which this validator candidate can charge -* Commission change rate: The maximum daily increase of the validator candidate commission -* Minimum self-bond amount: Minimum amount of Atoms the validator candidate need to have bonded at all time. If the validator's self-bonded stake falls below this limit, its entire staking pool will unbond. -* Initial self-bond amount: Initial amount Atoms the validator candidate wants to self-bond +* Maximum commission: The maximum commission rate which this validator can charge +* Commission change rate: The maximum daily increase of the validator commission +* Minimum self-bond amount: Minimum amount of Atoms the validator need to have bonded at all time. If the validator's self-bonded stake falls below this limit, its entire staking pool will unbond. +* Initial self-bond amount: Initial amount of Atoms the validator wants to self-bond -Once a PubKey has declared candidacy, Atom holders can delegate atoms to it, effectively adding stake to this pool. The total stake of an address is the combination of Atoms bonded by delegators and Atoms self-bonded by the entity which designated itself. +Once a validator is created, Atom holders can delegate atoms to it, effectively adding stake to this pool. The total stake of an address is the combination of Atoms bonded by delegators and Atoms self-bonded by the entity which designated itself. -Out of all the candidates that signaled themselves, the 100 with the most stake are the ones who are designated as validators. If a validator's total stake falls below the top 100 then that validator loses its validator privileges. Over time, the maximum number of validators will increase, according to a predefined schedule: +Out of all validators that signaled themselves, the 100 with the most stake are the ones who are designated as validators. They become **bonded validators** If a validator's total stake falls below the top 100 then that validator loses its validator privileges, it enters **unbonding mode** and, eventually, becomes **unbonded** . Over time, the maximum number of validators will increase, according to a predefined schedule: * **Year 0:** 100 * **Year 1:** 113 @@ -64,19 +65,48 @@ Out of all the candidates that signaled themselves, the 100 with the most stake * **Year 9:** 300 * **Year 10:** 300 +## Testnet + ### How can I join the testnet? The Testnet is a great environment to test your validator setup before launch. -We view testnet participation as a great way to signal to the community that you are ready and able to operate a validator. You can find all relevant information about the [testnet and more here](/getting-started/full-node.md). +We view testnet participation as a great way to signal to the community that you are ready and able to operate a validator. You can find all relevant information about the testnet [here](https://github.com/cosmos/cosmos-sdk/tree/develop/cmd/gaia/testnets) and [here](https://github.com/cosmos/testnets). + +### What are the different types of keys? + +In short, there are two types of keys: + +- **Tendermint Key**: This is a unique key used to sign block hashes. It is associated with a public key `cosmosvalpub`. + + Generated when the node is created with gaiad init. + + Get this value with gaiad tendermint show_validator + +M e.g. cosmosvalpub1zcjduc3qcyj09qc03elte23zwshdx92jm6ce88fgc90rtqhjx8v0608qh5ssp0w94c + +- **Application keys**: These keys are created from the application and used to sign transactions. As a validator, you will probably use one key to sign staking-related transactions, and another key to sign governance-related transactions. Application keys are associated with a public key `cosmosaccpub` and an address `cosmosaccaddr`. Both are derived from account keys generated by `gaiacli keys add`. + + +### What are the different states a validator can be in? + +After a validator is created with a `create-validator` transaction, it can be in three states: + +- `bonded`: Validator is in the active set and participates in consensus. Validator is earning rewards and can be slashed for misbehaviour. +- `unbonding`: Validator is not in the active set and does not participate in consensus. Validator is not earning rewards, but can still be slashed for misbehaviour. This is a transition state from `bonded` to `unbonded`. If validator does not send a `rebond` transaction while in `unbonding` mode, it will take three weeks for the state transition to complete. +- `unbonded`: Validator is not in the active set, and therefore not signing blocs. Validator cannot be slashed, and does not earn any reward. It is still possible to delegate Atoms to this validator. Un-delegating from an `unbonded` validator is immediate. + +Delegators have the same state as their validator. + +*Note that delegation are not necessarily bonded. Atoms can be delegated and bonded, delegated and unbonding, delegated and unbonded, or liquid* + + +### What is 'self-bond'? How can I increase my 'self-bond'? ### Is there a faucet? -If you want to obtain coins for the testnet, you can do so by using [this faucet](https://faucetcosmos.network) +If you want to obtain coins for the testnet, you can do so by using [this faucet](https://gaia.faucetcosmos.network/) -### Is there a minimum amount of Atoms that must be staked to be a validator? +### Is there a minimum amount of Atoms that must be staked to be an active (=bonded) validator? -There is no minimum. The top 100 validator candidates with the highest total stake (where total stake = self-bonded stake + delegators stake) are the validators. +There is no minimum. The top 100 validators with the highest total stake (where total stake = self-bonded stake + delegators stake) are the active validators. ### How will delegators choose their validators? @@ -87,7 +117,7 @@ Delegators are free to choose validators according to their own subjective crite * **Commission rate:** Commission applied on revenue by validators before it is distributed to their delegators * **Track record:** Delegators will likely look at the track record of the validators they plan to delegate to. This includes seniority, past votes on proposals, historical average uptime and how often the node was compromised. -Apart from these criteria that will be displayed in Cosmos Voyager, there will be a possibility for validators to signal a website address to complete their resume. Validators will need to build reputation one way or another to attract delegators. For example, it would be a good practice for validators to have their setup audited by third parties. Note though, that the Tendermint team will not approve or conduct any audit itself. +Apart from these criteria that will be displayed in Cosmos Voyager, there will be a possibility for validators to signal a website address to complete their resume. Validators will need to build reputation one way or another to attract delegators. For example, it would be a good practice for validators to have their setup audited by third parties. Note though, that the Tendermint team will not approve or conduct any audit itself. For more on due diligence, see [this blog post](https://medium.com/@interchain_io/3d0faf10ce6f) ## Responsibilites @@ -199,9 +229,9 @@ If a validator misbehaves, its bonded stake along with its delegators' stake and * **Double signing:** If someone reports on chain A that a validator signed two blocks at the same height on chain A and chain B, this validator will get slashed on chain A * **Unavailability:** If a validator's signature has not been included in the last X blocks, the validator will get slashed by a marginal amount proportional to X. If X is above a certain limit Y, then the validator will get unbonded -* **Non-voting:** If a validator did not vote on a proposal and once the fault is reported by a someone, its stake will receive a minor slash. +* **Non-voting:** If a validator did not vote on a proposal, its stake will receive a minor slash. -Note that even if a validator does not intentionally misbehave, it can still be slashed if its node crashes, looses connectivity, gets DDOSed, or if its private key is compromised. A complete document on the economics of the network will be published soon. +Note that even if a validator does not intentionally misbehave, it can still be slashed if its node crashes, looses connectivity, gets DDOSed, or if its private key is compromised. ### Do validators need to self-bond Atoms? @@ -251,7 +281,6 @@ Validators should expect to run an HSM that supports ed25519 keys. Here are pote * Ledger Nano S * Ledger BOLOS SGX enclave * Thales nShield support -* Tendermint SGX enclave The Tendermint team does not recommend one solution above the other. The community is encouraged to bolster the effort to improve HSMs and the security of key management. @@ -276,3 +305,5 @@ Validator nodes should only connect to full-nodes they trust because they operat Sentry nodes can be quickly spun up or change their IP addresses. Because the links to the sentry nodes are in private IP space, an internet based attacked cannot disturb them directly. This will ensure validator block proposals and votes always make it to the rest of the network. It is expected that good operating procedures on that part of validators will completely mitigate these threats. + +For more on sentry node architecture, see [this](https://forum.cosmos.network/t/sentry-node-architecture-overview/454). diff --git a/docs/validators/validator-setup.md b/docs/validators/validator-setup.md index 8d5d045ef..f6ca97a15 100644 --- a/docs/validators/validator-setup.md +++ b/docs/validators/validator-setup.md @@ -1,7 +1,7 @@ # Validator Setup ::: warning Current Testnet -The current testnet is `gaia-7005`. +The current testnet is `gaia-8000`. ::: Before setting up your validator node, make sure you've already gone through the [Full Node Setup](/getting-started/full-node.md) guide. @@ -34,7 +34,7 @@ gaiacli stake create-validator \ --pubkey=$(gaiad tendermint show_validator) \ --address-validator=<account_cosmosaccaddr> --moniker="choose a moniker" \ - --chain-id=gaia-7005 \ + --chain-id=<chain_id> \ --name=<key_name> ``` @@ -42,16 +42,16 @@ gaiacli stake create-validator \ You can edit your validator's public description. This info is to identify your validator, and will be relied on by delegators to decide which validators to stake to. Make sure to provide input for every flag below, otherwise the field will default to empty (`--moniker` defaults to the machine name). -The `--keybase-sig` is a 16-digit string that is generated with a [keybase.io](https://keybase.io) account. It's a cryptographically secure method of verifying your identity across multiple online networks. The Keybase API allows us to retrieve your Keybase avatar. This is how you can add a logo to your validator profile. +The `--identity` can be used as to verify identity with systems like Keybase or UPort. When using with Keybase `--identity` should be populated with a 16-digit string that is generated with a [keybase.io](https://keybase.io) account. It's a cryptographically secure method of verifying your identity across multiple online networks. The Keybase API allows us to retrieve your Keybase avatar. This is how you can add a logo to your validator profile. ```bash gaiacli stake edit-validator --address-validator=<account_cosmosaccaddr> --moniker="choose a moniker" \ --website="https://cosmos.network" \ - --keybase-sig="6A0D65E29A4CBC8E" + --identity=6A0D65E29A4CBC8E --details="To infinity and beyond!" - --chain-id=gaia-7005 \ + --chain-id=<chain_id> \ --name=<key_name> ``` @@ -62,7 +62,26 @@ View the validator's information with this command: ```bash gaiacli stake validator \ --address-validator=<account_cosmosaccaddr> \ - --chain-id=gaia-7005 + --chain-id=<chain_id> +``` + +### Track Validator Signing Information + +In order to keep track of a validator's signatures in the past you can do so by using the `signing-info` command: + +```bash +gaiacli stake signing-information <validator-pubkey>\ + --chain-id=<chain_id> +``` + +### Unrevoke Validator + +When a validator is `Revoked` for downtime, you must submit an `Unrevoke` transaction in order to be able to get block proposer rewards again (depends on the zone fee distribution). + +```bash +gaiacli stake unrevoke \ + --from=<key_name> \ + --chain-id=<chain_id> ``` ### Confirm Your Validator is Running @@ -75,7 +94,6 @@ gaiacli advanced tendermint validator-set | grep "$(gaiad tendermint show_valida You should also be able to see your validator on the [Explorer](https://explorecosmos.network/validators). You are looking for the `bech32` encoded `address` in the `~/.gaiad/config/priv_validator.json` file. - ::: warning Note To be in the validator set, you need to have more total voting power than the 100th validator. ::: @@ -84,7 +102,7 @@ To be in the validator set, you need to have more total voting power than the 10 ### Problem #1: My validator has `voting_power: 0` -Your validator has become auto-unbonded. In `gaia-7005`, we unbond validators if they do not vote on `50` of the last `100` blocks. Since blocks are proposed every ~2 seconds, a validator unresponsive for ~100 seconds will become unbonded. This usually happens when your `gaiad` process crashes. +Your validator has become auto-unbonded. In `gaia-8000`, we unbond validators if they do not vote on `50` of the last `100` blocks. Since blocks are proposed every ~2 seconds, a validator unresponsive for ~100 seconds will become unbonded. This usually happens when your `gaiad` process crashes. Here's how you can return the voting power back to your validator. First, if `gaiad` is not running, start it up again: @@ -95,7 +113,7 @@ gaiad start Wait for your full node to catch up to the latest block. Next, run the following command. Note that `<cosmosaccaddr>` is the address of your validator account, and `<name>` is the name of the validator account. You can find this info by running `gaiacli keys list`. ```bash -gaiacli stake unrevoke <cosmosaccaddr> --chain-id=gaia-7005 --name=<name> +gaiacli stake unrevoke <cosmosaccaddr> --chain-id=<chain_id> --name=<name> ``` ::: danger Warning diff --git a/examples/README.md b/examples/README.md index e3016fb70..8625cead6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -279,7 +279,7 @@ type TxInput struct { Address []byte `json:"address"` // Hash of the PubKey Coins Coins `json:"coins"` // Sequence int `json:"sequence"` // Must be 1 greater than the last committed TxInput - Signature crypto.Signature `json:"signature"` // Depends on the PubKey type and the whole Tx + Signature []byte `json:"signature"` // Depends on the PubKey type and the whole Tx PubKey crypto.PubKey `json:"pub_key"` // Is present iff Sequence == 0 } diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go index 14d4550d3..17f6de87b 100644 --- a/examples/basecoin/app/app.go +++ b/examples/basecoin/app/app.go @@ -53,7 +53,7 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba // create your application type var app = &BasecoinApp{ cdc: cdc, - BaseApp: bam.NewBaseApp(appName, cdc, logger, db, baseAppOptions...), + BaseApp: bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...), keyMain: sdk.NewKVStoreKey("main"), keyAccount: sdk.NewKVStoreKey("acc"), keyIBC: sdk.NewKVStoreKey("ibc"), @@ -62,8 +62,10 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba // define and attach the mappers and keepers app.accountMapper = auth.NewAccountMapper( cdc, - app.keyAccount, // target store - auth.ProtoBaseAccount, // prototype + app.keyAccount, // target store + func() auth.Account { + return &types.AppAccount{} + }, ) app.coinKeeper = bank.NewKeeper(app.accountMapper) app.ibcMapper = ibc.NewMapper(app.cdc, app.keyIBC, app.RegisterCodespace(ibc.DefaultCodespace)) @@ -86,6 +88,8 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba cmn.Exit(err.Error()) } + app.Seal() + return app } @@ -98,9 +102,9 @@ func MakeCodec() *wire.Codec { sdk.RegisterWire(cdc) bank.RegisterWire(cdc) ibc.RegisterWire(cdc) + auth.RegisterWire(cdc) - // register custom types - cdc.RegisterInterface((*auth.Account)(nil), nil) + // register custom type cdc.RegisterConcrete(&types.AppAccount{}, "basecoin/Account", nil) cdc.Seal() diff --git a/examples/democoin/app/app.go b/examples/democoin/app/app.go index 51d10002a..d4cbac623 100644 --- a/examples/democoin/app/app.go +++ b/examples/democoin/app/app.go @@ -58,7 +58,7 @@ func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp { // Create your application object. var app = &DemocoinApp{ - BaseApp: bam.NewBaseApp(appName, cdc, logger, db), + BaseApp: bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc)), cdc: cdc, capKeyMainStore: sdk.NewKVStoreKey("main"), capKeyAccountStore: sdk.NewKVStoreKey("acc"), @@ -96,6 +96,9 @@ func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp { if err != nil { cmn.Exit(err.Error()) } + + app.Seal() + return app } diff --git a/examples/democoin/mock/validator.go b/examples/democoin/mock/validator.go index 208636de9..0ef0a2391 100644 --- a/examples/democoin/mock/validator.go +++ b/examples/democoin/mock/validator.go @@ -28,6 +28,11 @@ func (v Validator) GetPubKey() crypto.PubKey { return nil } +// Implements sdk.Validator +func (v Validator) GetTokens() sdk.Rat { + return sdk.ZeroRat() +} + // Implements sdk.Validator func (v Validator) GetPower() sdk.Rat { return v.Power diff --git a/examples/democoin/x/assoc/validator_set.go b/examples/democoin/x/assoc/validator_set.go index 94a0ef630..03ce506ea 100644 --- a/examples/democoin/x/assoc/validator_set.go +++ b/examples/democoin/x/assoc/validator_set.go @@ -11,8 +11,8 @@ import ( type ValidatorSet struct { sdk.ValidatorSet - key sdk.KVStoreGetter - cdc *wire.Codec + store sdk.KVStore + cdc *wire.Codec maxAssoc int addrLen int @@ -21,15 +21,15 @@ type ValidatorSet struct { var _ sdk.ValidatorSet = ValidatorSet{} // NewValidatorSet returns new ValidatorSet with underlying ValidatorSet -func NewValidatorSet(cdc *wire.Codec, key sdk.KVStoreGetter, valset sdk.ValidatorSet, maxAssoc int, addrLen int) ValidatorSet { +func NewValidatorSet(cdc *wire.Codec, store sdk.KVStore, valset sdk.ValidatorSet, maxAssoc int, addrLen int) ValidatorSet { if maxAssoc < 0 || addrLen < 0 { panic("Cannot use negative integer for NewValidatorSet") } return ValidatorSet{ ValidatorSet: valset, - key: key, - cdc: cdc, + store: store, + cdc: cdc, maxAssoc: maxAssoc, addrLen: addrLen, @@ -38,8 +38,7 @@ func NewValidatorSet(cdc *wire.Codec, key sdk.KVStoreGetter, valset sdk.Validato // Implements sdk.ValidatorSet func (valset ValidatorSet) Validator(ctx sdk.Context, addr sdk.AccAddress) (res sdk.Validator) { - store := valset.key.KVStore(ctx) - base := store.Get(GetBaseKey(addr)) + base := valset.store.Get(GetBaseKey(addr)) res = valset.ValidatorSet.Validator(ctx, base) if res == nil { res = valset.ValidatorSet.Validator(ctx, addr) @@ -67,13 +66,12 @@ func (valset ValidatorSet) Associate(ctx sdk.Context, base sdk.AccAddress, assoc if len(base) != valset.addrLen || len(assoc) != valset.addrLen { return false } - store := valset.key.KVStore(ctx) // If someone already owns the associated address - if store.Get(GetBaseKey(assoc)) != nil { + if valset.store.Get(GetBaseKey(assoc)) != nil { return false } - store.Set(GetBaseKey(assoc), base) - store.Set(GetAssocKey(base, assoc), []byte{0x00}) + valset.store.Set(GetBaseKey(assoc), base) + valset.store.Set(GetAssocKey(base, assoc), []byte{0x00}) return true } @@ -82,21 +80,19 @@ func (valset ValidatorSet) Dissociate(ctx sdk.Context, base sdk.AccAddress, asso if len(base) != valset.addrLen || len(assoc) != valset.addrLen { return false } - store := valset.key.KVStore(ctx) // No associated address found for given validator - if !bytes.Equal(store.Get(GetBaseKey(assoc)), base) { + if !bytes.Equal(valset.store.Get(GetBaseKey(assoc)), base) { return false } - store.Delete(GetBaseKey(assoc)) - store.Delete(GetAssocKey(base, assoc)) + valset.store.Delete(GetBaseKey(assoc)) + valset.store.Delete(GetAssocKey(base, assoc)) return true } // Associations returns all associated addresses with a validator func (valset ValidatorSet) Associations(ctx sdk.Context, base sdk.AccAddress) (res []sdk.AccAddress) { - store := valset.key.KVStore(ctx) res = make([]sdk.AccAddress, valset.maxAssoc) - iter := sdk.KVStorePrefixIterator(store, GetAssocPrefix(base)) + iter := sdk.KVStorePrefixIterator(valset.store, GetAssocPrefix(base)) i := 0 for ; iter.Valid(); iter.Next() { key := iter.Key() diff --git a/examples/democoin/x/assoc/validator_set_test.go b/examples/democoin/x/assoc/validator_set_test.go index e5932c14b..2fead3ad2 100644 --- a/examples/democoin/x/assoc/validator_set_test.go +++ b/examples/democoin/x/assoc/validator_set_test.go @@ -36,7 +36,7 @@ func TestValidatorSet(t *testing.T) { {addr2, sdk.NewRat(2)}, }} - valset := NewValidatorSet(wire.NewCodec(), sdk.NewPrefixStoreGetter(key, []byte("assoc")), base, 1, 5) + valset := NewValidatorSet(wire.NewCodec(), ctx.KVStore(key).Prefix([]byte("assoc")), base, 1, 5) require.Equal(t, base.Validator(ctx, addr1), valset.Validator(ctx, addr1)) require.Equal(t, base.Validator(ctx, addr2), valset.Validator(ctx, addr2)) diff --git a/examples/democoin/x/cool/client/cli/tx.go b/examples/democoin/x/cool/client/cli/tx.go index 3e034600b..82b46be73 100644 --- a/examples/democoin/x/cool/client/cli/tx.go +++ b/examples/democoin/x/cool/client/cli/tx.go @@ -1,78 +1,65 @@ package cli import ( - "github.com/spf13/cobra" - "github.com/spf13/viper" + "os" + + "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/utils" + "github.com/cosmos/cosmos-sdk/examples/democoin/x/cool" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" - - "github.com/cosmos/cosmos-sdk/examples/democoin/x/cool" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" ) -// take the coolness quiz transaction +// QuizTxCmd invokes the coolness quiz transaction. func QuizTxCmd(cdc *wire.Codec) *cobra.Command { return &cobra.Command{ Use: "cool [answer]", Short: "What's cooler than being cool?", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - // get the from address from the name flag - from, err := ctx.GetFromAddress() + from, err := cliCtx.GetFromAddress() if err != nil { return err } - // create the message msg := cool.NewMsgQuiz(from, args[0]) - // get account name - name := viper.GetString(client.FlagName) - - // build and sign the transaction, then broadcast to Tendermint - err = ctx.EnsureSignBuildBroadcast(name, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } } -// set a new cool trend transaction +// SetTrendTxCmd sends a new cool trend transaction. func SetTrendTxCmd(cdc *wire.Codec) *cobra.Command { return &cobra.Command{ Use: "setcool [answer]", Short: "You're so cool, tell us what is cool!", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - // get the from address from the name flag - from, err := ctx.GetFromAddress() + from, err := cliCtx.GetFromAddress() if err != nil { return err } - // get account name - name := viper.GetString(client.FlagName) - - // create the message msg := cool.NewMsgSetTrend(from, args[0]) - // build and sign the transaction, then broadcast to Tendermint - err = ctx.EnsureSignBuildBroadcast(name, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } } diff --git a/examples/democoin/x/cool/handler.go b/examples/democoin/x/cool/handler.go index 82247677c..33aa9bef4 100644 --- a/examples/democoin/x/cool/handler.go +++ b/examples/democoin/x/cool/handler.go @@ -47,11 +47,7 @@ func handleMsgQuiz(ctx sdk.Context, k Keeper, msg MsgQuiz) sdk.Result { return ErrIncorrectCoolAnswer(k.codespace, msg.CoolAnswer).Result() } - if ctx.IsCheckTx() { - return sdk.Result{} // TODO - } - - bonusCoins := sdk.Coins{sdk.NewCoin(msg.CoolAnswer, 69)} + bonusCoins := sdk.Coins{sdk.NewInt64Coin(msg.CoolAnswer, 69)} _, _, err := k.ck.AddCoins(ctx, msg.Sender, bonusCoins) if err != nil { diff --git a/examples/democoin/x/oracle/handler.go b/examples/democoin/x/oracle/handler.go index 8b94a1894..079f7680f 100644 --- a/examples/democoin/x/oracle/handler.go +++ b/examples/democoin/x/oracle/handler.go @@ -26,7 +26,7 @@ func (keeper Keeper) update(ctx sdk.Context, val sdk.Validator, valset sdk.Valid info.Power = sdk.ZeroRat() info.Hash = hash prefix := GetSignPrefix(p, keeper.cdc) - store := keeper.key.KVStore(ctx) + store := ctx.KVStore(keeper.key) iter := sdk.KVStorePrefixIterator(store, prefix) for ; iter.Valid(); iter.Next() { if valset.Validator(ctx, iter.Value()) != nil { diff --git a/examples/democoin/x/oracle/keeper.go b/examples/democoin/x/oracle/keeper.go index 97c68251b..25554faa8 100644 --- a/examples/democoin/x/oracle/keeper.go +++ b/examples/democoin/x/oracle/keeper.go @@ -8,7 +8,7 @@ import ( // Keeper of the oracle store type Keeper struct { - key sdk.KVStoreGetter + key sdk.StoreKey cdc *wire.Codec valset sdk.ValidatorSet @@ -18,7 +18,7 @@ type Keeper struct { } // NewKeeper constructs a new keeper -func NewKeeper(key sdk.KVStoreGetter, cdc *wire.Codec, valset sdk.ValidatorSet, supermaj sdk.Rat, timeout int64) Keeper { +func NewKeeper(key sdk.StoreKey, cdc *wire.Codec, valset sdk.ValidatorSet, supermaj sdk.Rat, timeout int64) Keeper { if timeout < 0 { panic("Timeout should not be negative") } @@ -64,7 +64,7 @@ func EmptyInfo(ctx sdk.Context) Info { // Info returns the information about a payload func (keeper Keeper) Info(ctx sdk.Context, p Payload) (res Info) { - store := keeper.key.KVStore(ctx) + store := ctx.KVStore(keeper.key) key := GetInfoKey(p, keeper.cdc) bz := store.Get(key) @@ -77,7 +77,7 @@ func (keeper Keeper) Info(ctx sdk.Context, p Payload) (res Info) { } func (keeper Keeper) setInfo(ctx sdk.Context, p Payload, info Info) { - store := keeper.key.KVStore(ctx) + store := ctx.KVStore(keeper.key) key := GetInfoKey(p, keeper.cdc) bz := keeper.cdc.MustMarshalBinary(info) @@ -85,21 +85,21 @@ func (keeper Keeper) setInfo(ctx sdk.Context, p Payload, info Info) { } func (keeper Keeper) sign(ctx sdk.Context, p Payload, signer sdk.AccAddress) { - store := keeper.key.KVStore(ctx) + store := ctx.KVStore(keeper.key) key := GetSignKey(p, signer, keeper.cdc) store.Set(key, signer) } func (keeper Keeper) signed(ctx sdk.Context, p Payload, signer sdk.AccAddress) bool { - store := keeper.key.KVStore(ctx) + store := ctx.KVStore(keeper.key) key := GetSignKey(p, signer, keeper.cdc) return store.Has(key) } func (keeper Keeper) clearSigns(ctx sdk.Context, p Payload) { - store := keeper.key.KVStore(ctx) + store := ctx.KVStore(keeper.key) prefix := GetSignPrefix(p, keeper.cdc) diff --git a/examples/democoin/x/oracle/oracle_test.go b/examples/democoin/x/oracle/oracle_test.go index 467035897..c476290f8 100644 --- a/examples/democoin/x/oracle/oracle_test.go +++ b/examples/democoin/x/oracle/oracle_test.go @@ -119,7 +119,7 @@ func TestOracle(t *testing.T) { require.Nil(t, err) ctx = ctx.WithBlockHeader(abci.Header{ValidatorsHash: bz}) - ork := NewKeeper(sdk.NewPrefixStoreGetter(key, []byte("oracle")), cdc, valset, sdk.NewRat(2, 3), 100) + ork := NewKeeper(key, cdc, valset, sdk.NewRat(2, 3), 100) h := seqHandler(ork, key, sdk.CodespaceRoot) // Nonmock.Validator signed, transaction failed diff --git a/examples/democoin/x/pow/app_test.go b/examples/democoin/x/pow/app_test.go index 783f13d57..dc53d1d99 100644 --- a/examples/democoin/x/pow/app_test.go +++ b/examples/democoin/x/pow/app_test.go @@ -33,6 +33,9 @@ func getMockApp(t *testing.T) *mock.App { mapp.SetInitChainer(getInitChainer(mapp, keeper)) require.NoError(t, mapp.CompleteSetup([]*sdk.KVStoreKey{keyPOW})) + + mapp.Seal() + return mapp } diff --git a/examples/democoin/x/pow/client/cli/tx.go b/examples/democoin/x/pow/client/cli/tx.go index bc958ffae..af1a8a060 100644 --- a/examples/democoin/x/pow/client/cli/tx.go +++ b/examples/democoin/x/pow/client/cli/tx.go @@ -1,16 +1,18 @@ package cli import ( + "os" "strconv" - "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/client/context" - + "github.com/cosmos/cosmos-sdk/client/utils" "github.com/cosmos/cosmos-sdk/examples/democoin/x/pow" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" + + "github.com/spf13/cobra" ) // command to mine some pow! @@ -20,9 +22,13 @@ func MineCmd(cdc *wire.Codec) *cobra.Command { Short: "Mine some coins with proof-of-work!", Args: cobra.ExactArgs(4), RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - from, err := ctx.GetFromAddress() + from, err := cliCtx.GetFromAddress() if err != nil { return err } @@ -31,29 +37,23 @@ func MineCmd(cdc *wire.Codec) *cobra.Command { if err != nil { return err } + count, err := strconv.ParseUint(args[1], 0, 64) if err != nil { return err } + nonce, err := strconv.ParseUint(args[2], 0, 64) if err != nil { return err } solution := []byte(args[3]) - msg := pow.NewMsgMine(from, difficulty, count, nonce, solution) - // get account name - name := ctx.FromAddressName - - // build and sign the transaction, then broadcast to Tendermint - err = ctx.EnsureSignBuildBroadcast(name, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + // Build and sign the transaction, then broadcast to a Tendermint + // node. + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } } diff --git a/examples/democoin/x/pow/handler.go b/examples/democoin/x/pow/handler.go index 2dd549bde..e4fa39d1d 100644 --- a/examples/democoin/x/pow/handler.go +++ b/examples/democoin/x/pow/handler.go @@ -26,14 +26,6 @@ func handleMsgMine(ctx sdk.Context, pk Keeper, msg MsgMine) sdk.Result { return err.Result() } - // commented for now, makes testing difficult - // TODO figure out a better test method that allows early CheckTx return - /* - if ctx.IsCheckTx() { - return sdk.Result{} // TODO - } - */ - err = pk.ApplyValid(ctx, msg.Sender, newDiff, newCount) if err != nil { return err.Result() diff --git a/examples/democoin/x/pow/keeper.go b/examples/democoin/x/pow/keeper.go index e276b8721..38a0d93c6 100644 --- a/examples/democoin/x/pow/keeper.go +++ b/examples/democoin/x/pow/keeper.go @@ -125,7 +125,7 @@ func (k Keeper) CheckValid(ctx sdk.Context, difficulty uint64, count uint64) (ui // Add some coins for a POW well done func (k Keeper) ApplyValid(ctx sdk.Context, sender sdk.AccAddress, newDifficulty uint64, newCount uint64) sdk.Error { - _, _, ckErr := k.ck.AddCoins(ctx, sender, []sdk.Coin{sdk.NewCoin(k.config.Denomination, k.config.Reward)}) + _, _, ckErr := k.ck.AddCoins(ctx, sender, []sdk.Coin{sdk.NewInt64Coin(k.config.Denomination, k.config.Reward)}) if ckErr != nil { return ckErr } diff --git a/examples/democoin/x/simplestake/client/cli/commands.go b/examples/democoin/x/simplestake/client/cli/commands.go index 20dc6fe97..a387dcac3 100644 --- a/examples/democoin/x/simplestake/client/cli/commands.go +++ b/examples/democoin/x/simplestake/client/cli/commands.go @@ -3,18 +3,20 @@ package cli import ( "encoding/hex" "fmt" - - "github.com/spf13/cobra" - "github.com/tendermint/tendermint/crypto/ed25519" - - "github.com/spf13/viper" + "os" "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/utils" + "github.com/cosmos/cosmos-sdk/examples/democoin/x/simplestake" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" - "github.com/cosmos/cosmos-sdk/examples/democoin/x/simplestake" + "github.com/spf13/cobra" + "github.com/spf13/viper" + + "github.com/tendermint/tendermint/crypto/ed25519" ) const ( @@ -28,9 +30,13 @@ func BondTxCmd(cdc *wire.Codec) *cobra.Command { Use: "bond", Short: "Bond to a validator", RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper() + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - from, err := ctx.GetFromAddress() + from, err := cliCtx.GetFromAddress() if err != nil { return err } @@ -60,11 +66,15 @@ func BondTxCmd(cdc *wire.Codec) *cobra.Command { msg := simplestake.NewMsgBond(from, stake, pubKeyEd) - return sendMsg(cdc, msg) + // Build and sign the transaction, then broadcast to a Tendermint + // node. + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } + cmd.Flags().String(flagStake, "", "Amount of coins to stake") cmd.Flags().String(flagValidator, "", "Validator address to stake") + return cmd } @@ -74,23 +84,23 @@ func UnbondTxCmd(cdc *wire.Codec) *cobra.Command { Use: "unbond", Short: "Unbond from a validator", RunE: func(cmd *cobra.Command, args []string) error { - from, err := context.NewCoreContextFromViper().GetFromAddress() + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout) + + from, err := cliCtx.GetFromAddress() if err != nil { return err } + msg := simplestake.NewMsgUnbond(from) - return sendMsg(cdc, msg) + + // Build and sign the transaction, then broadcast to a Tendermint + // node. + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } + return cmd } - -func sendMsg(cdc *wire.Codec, msg sdk.Msg) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - err := ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil -} diff --git a/examples/democoin/x/simplestake/keeper.go b/examples/democoin/x/simplestake/keeper.go index a6e3704db..43b1590bd 100644 --- a/examples/democoin/x/simplestake/keeper.go +++ b/examples/democoin/x/simplestake/keeper.go @@ -93,7 +93,7 @@ func (k Keeper) Unbond(ctx sdk.Context, addr sdk.AccAddress) (crypto.PubKey, int } k.deleteBondInfo(ctx, addr) - returnedBond := sdk.NewCoin(stakingToken, bi.Power) + returnedBond := sdk.NewInt64Coin(stakingToken, bi.Power) _, _, err := k.ck.AddCoins(ctx, addr, []sdk.Coin{returnedBond}) if err != nil { diff --git a/examples/democoin/x/simplestake/keeper_test.go b/examples/democoin/x/simplestake/keeper_test.go index 91e60c50d..02dbd964a 100644 --- a/examples/democoin/x/simplestake/keeper_test.go +++ b/examples/democoin/x/simplestake/keeper_test.go @@ -75,10 +75,10 @@ func TestBonding(t *testing.T) { _, _, err := stakeKeeper.unbondWithoutCoins(ctx, addr) require.Equal(t, err, ErrInvalidUnbond(DefaultCodespace)) - _, err = stakeKeeper.bondWithoutCoins(ctx, addr, pubKey, sdk.NewCoin("steak", 10)) + _, err = stakeKeeper.bondWithoutCoins(ctx, addr, pubKey, sdk.NewInt64Coin("steak", 10)) require.Nil(t, err) - power, err := stakeKeeper.bondWithoutCoins(ctx, addr, pubKey, sdk.NewCoin("steak", 10)) + power, err := stakeKeeper.bondWithoutCoins(ctx, addr, pubKey, sdk.NewInt64Coin("steak", 10)) require.Nil(t, err) require.Equal(t, int64(20), power) diff --git a/examples/democoin/x/simplestake/msgs_test.go b/examples/democoin/x/simplestake/msgs_test.go index 21f4e4abd..4eb4509d8 100644 --- a/examples/democoin/x/simplestake/msgs_test.go +++ b/examples/democoin/x/simplestake/msgs_test.go @@ -15,8 +15,8 @@ func TestBondMsgValidation(t *testing.T) { valid bool msgBond MsgBond }{ - {true, NewMsgBond(sdk.AccAddress{}, sdk.NewCoin("mycoin", 5), privKey.PubKey())}, - {false, NewMsgBond(sdk.AccAddress{}, sdk.NewCoin("mycoin", 0), privKey.PubKey())}, + {true, NewMsgBond(sdk.AccAddress{}, sdk.NewInt64Coin("mycoin", 5), privKey.PubKey())}, + {false, NewMsgBond(sdk.AccAddress{}, sdk.NewInt64Coin("mycoin", 0), privKey.PubKey())}, } for i, tc := range cases { diff --git a/examples/kvstore/kvstore b/examples/kvstore/kvstore index 43c7dc61c..5dd8b5eea 100755 Binary files a/examples/kvstore/kvstore and b/examples/kvstore/kvstore differ diff --git a/examples/kvstore/main.go b/examples/kvstore/main.go index 47416da05..125c7cd47 100644 --- a/examples/kvstore/main.go +++ b/examples/kvstore/main.go @@ -32,14 +32,11 @@ func main() { var capKeyMainStore = sdk.NewKVStoreKey("main") // Create BaseApp. - var baseApp = bam.NewBaseApp("kvstore", nil, logger, db) + var baseApp = bam.NewBaseApp("kvstore", logger, db, decodeTx) // Set mounts for BaseApp's MultiStore. baseApp.MountStoresIAVL(capKeyMainStore) - // Set Tx decoder - baseApp.SetTxDecoder(decodeTx) - // Set a handler Route. baseApp.Router().AddRoute("kvstore", Handler(capKeyMainStore)) diff --git a/networks/Makefile b/networks/Makefile new file mode 100644 index 000000000..36db88f4d --- /dev/null +++ b/networks/Makefile @@ -0,0 +1,143 @@ +######################################## +### These targets were broken out of the main Makefile to enable easy setup of testnets. +### They use a form of terraform + ansible to build full nodes in AWS. +### The shell scripts in this folder are example uses of the targets. + +# Name of the testnet. Used in chain-id. +TESTNET_NAME?=remotenet + +# Name of the servers grouped together for management purposes. Used in tagging the servers in the cloud. +CLUSTER_NAME?=$(TESTNET_NAME) + +# Number of servers to put in one availability zone in AWS. +SERVERS?=1 + +# Number of regions to use in AWS. One region usually contains 2-3 availability zones. +REGION_LIMIT?=1 + +# Path to gaiad for deployment. Must be a Linux binary. +BINARY?=$(CURDIR)/../build/gaiad +GAIACLI_BINARY?=$(CURDIR)/../build/gaiacli + +# Path to the genesis.json and config.toml files to deploy on full nodes. +GENESISFILE?=$(CURDIR)/../build/genesis.json +CONFIGFILE?=$(CURDIR)/../build/config.toml + +# Name of application for app deployments +APP_NAME ?= faucettestnet1 +# Region to deploy VPC and application in AWS +REGION ?= us-east-2 + +all: + @echo "There is no all. Only sum of the ones." + +disclaimer: + @echo "WARNING: These are example network configuration scripts only and have not undergone security review. They should not be used for production deployments." + +######################################## +### Extract genesis.json and config.toml from a node in a cluster + +extract-config: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + cd remote/ansible && \ + ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook \ + -i inventory/ec2.py \ + -l "tag_Environment_$(CLUSTER_NAME)" \ + -b -u centos \ + -e TESTNET_NAME="$(TESTNET_NAME)" \ + -e GENESISFILE="$(GENESISFILE)" \ + -e CONFIGFILE="$(CONFIGFILE)" \ + extract-config.yml + + +######################################## +### Remote validator nodes using terraform and ansible in AWS + +validators-start: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/terraform-aws && terraform init && (terraform workspace new "$(CLUSTER_NAME)" || terraform workspace select "$(CLUSTER_NAME)") && terraform apply -auto-approve -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" -var TESTNET_NAME="$(CLUSTER_NAME)" -var SERVERS="$(SERVERS)" -var REGION_LIMIT="$(REGION_LIMIT)" + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b -e BINARY=$(BINARY) -e TESTNET_NAME="$(TESTNET_NAME)" setup-validators.yml + cd remote/ansible && ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b start.yml + +validators-stop: disclaimer + cd remote/terraform-aws && terraform workspace select "$(CLUSTER_NAME)" && terraform destroy -force -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" && terraform workspace select default && terraform workspace delete "$(CLUSTER_NAME)" + rm -rf remote/ansible/keys/ remote/ansible/files/ + +validators-status: disclaimer + cd remote/ansible && ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" status.yml + +#validators-clear: +# cd remote/ansible && ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b clear-config.yml + + +######################################## +### Remote full nodes using terraform and ansible in Amazon AWS + +fullnodes-start: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/terraform-aws && terraform init && (terraform workspace new "$(CLUSTER_NAME)" || terraform workspace select "$(CLUSTER_NAME)") && terraform apply -auto-approve -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" -var TESTNET_NAME="$(CLUSTER_NAME)" -var SERVERS="$(SERVERS)" -var REGION_LIMIT="$(REGION_LIMIT)" + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b -e BINARY=$(BINARY) -e TESTNET_NAME="$(TESTNET_NAME)" -e GENESISFILE="$(GENESISFILE)" -e CONFIGFILE="$(CONFIGFILE)" setup-fullnodes.yml + cd remote/ansible && ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b start.yml + +fullnodes-stop: disclaimer + cd remote/terraform-aws && terraform workspace select "$(CLUSTER_NAME)" && terraform destroy -force -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" && terraform workspace select default && terraform workspace delete "$(CLUSTER_NAME)" + rm -rf remote/ansible/keys/ remote/ansible/files/ + +fullnodes-status: disclaimer + cd remote/ansible && ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" status.yml + +######################################## +### Other calls + +upgrade-gaiad: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b -e BINARY=$(BINARY) upgrade-gaiad.yml + +UNSAFE_RESET_ALL?=no +upgrade-seeds: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + @if [ -z "`file $(GAIACLI_BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b -e BINARY=$(BINARY) -e GAIACLI_BINARY=$(GAIACLI_BINARY) -e UNSAFE_RESET_ALL=$(UNSAFE_RESET_ALL) upgrade-gaia.yml + + +list: + remote/ansible/inventory/ec2.py | python -c 'import json,sys ; print "\n".join(json.loads("".join(sys.stdin.readlines()))["tag_Environment_$(CLUSTER_NAME)"])' + +install-datadog: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + @if [ -z "$(DD_API_KEY)" ]; then echo "DD_API_KEY environment variable not set." ; false ; fi + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b -e DD_API_KEY="$(DD_API_KEY)" -e TESTNET_NAME="$(TESTNET_NAME)" -e CLUSTER_NAME="$(CLUSTER_NAME)" install-datadog-agent.yml + +remove-datadog: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(CLUSTER_NAME)" -u centos -b remove-datadog-agent.yml + + +######################################## +### Application infrastructure setup + +app-start: disclaimer + #Make sure you have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or your IAM roles set for AWS API access. + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/terraform-app && terraform init && (terraform workspace new "$(APP_NAME)" || terraform workspace select "$(APP_NAME)") && terraform apply -auto-approve -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" -var APP_NAME="$(APP_NAME)" -var SERVERS="$(SERVERS)" -var REGION="$(REGION)" + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(APP_NAME)" -u centos -b -e BINARY=$(BINARY) -e TESTNET_NAME="$(TESTNET_NAME)" -e GENESISFILE="$(GENESISFILE)" -e CONFIGFILE="$(CONFIGFILE)" setup-fullnodes.yml + cd remote/ansible && ansible-playbook -i inventory/ec2.py -l "tag_Environment_$(APP_NAME)" -u centos -b start.yml + +app-stop: disclaimer + cd remote/terraform-app && terraform workspace select "$(APP_NAME)" && terraform destroy -force -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" -var APP_NAME=$(APP_NAME) && terraform workspace select default && terraform workspace delete "$(APP_NAME)" + rm -rf remote/ansible/keys/ remote/ansible/files/ + +# To avoid unintended conflicts with file names, always add to .PHONY +# unless there is a reason not to. +# https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html +.PHONY: all extract-config validators-start validators-stop validators-status fullnodes-start fullnodes-stop fullnodes-status upgrade-gaiad list install-datadog remove-datadog app-start app-stop diff --git a/networks/README.md b/networks/README.md new file mode 100644 index 000000000..322d37340 --- /dev/null +++ b/networks/README.md @@ -0,0 +1,65 @@ +# Terraform & Ansible + +Automated deployments are done using [Terraform](https://www.terraform.io/) to create servers on AWS then +[Ansible](http://www.ansible.com/) to create and manage testnets on those servers. + +## Prerequisites + +- Install [Terraform](https://www.terraform.io/downloads.html) and [Ansible](http://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) on a Linux machine. +- Create an [AWS API token](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html) with EC2 create capability. +- Create SSH keys + +``` +export AWS_ACCESS_KEY_ID="2345234jk2lh4234" +export AWS_SECRET_ACCESS_KEY="234jhkg234h52kh4g5khg34" +export TESTNET_NAME="remotenet" +export CLUSTER_NAME= "remotenetvalidators" +export SSH_PRIVATE_FILE="$HOME/.ssh/id_rsa" +export SSH_PUBLIC_FILE="$HOME/.ssh/id_rsa.pub" +``` + +These will be used by both `terraform` and `ansible`. + +## Create a remote network + +``` +SERVERS=1 REGION_LIMIT=1 make validators-start +``` + +The testnet name is what's going to be used in --chain-id, while the cluster name is the administrative tag in AWS for the servers. The code will create SERVERS amount of servers in each availability zone up to the number of REGION_LIMITs, starting at us-east-2. (us-east-1 is excluded.) The below BaSH script does the same, but sometimes it's more comfortable for input. + +``` +./new-testnet.sh "$TESTNET_NAME" "$CLUSTER_NAME" 1 1 +``` + +## Quickly see the /status endpoint + +``` +make validators-status +``` + +## Delete servers + +``` +make validators-stop +``` + +## Logging + +You can ship logs to Logz.io, an Elastic stack (Elastic search, Logstash and Kibana) service provider. You can set up your nodes to log there automatically. Create an account and get your API key from the notes on [this page](https://app.logz.io/#/dashboard/data-sources/Filebeat), then: + +``` +yum install systemd-devel || echo "This will only work on RHEL-based systems." +apt-get install libsystemd-dev || echo "This will only work on Debian-based systems." + +go get github.com/mheese/journalbeat +ansible-playbook -i inventory/digital_ocean.py -l remotenet logzio.yml -e LOGZIO_TOKEN=ABCDEFGHIJKLMNOPQRSTUVWXYZ012345 +``` + +## Monitoring + +You can install the DataDog agent with: + +``` +make datadog-install +``` diff --git a/networks/add-cluster.sh b/networks/add-cluster.sh new file mode 100755 index 000000000..a8936a099 --- /dev/null +++ b/networks/add-cluster.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# add-cluster - example make call to add a set of nodes to an existing testnet in AWS +# WARNING: Run it from the current directory - it uses relative paths to ship the binary and the genesis.json,config.toml files + +if [ $# -ne 4 ]; then + echo "Usage: ./add-cluster.sh <testnetname> <clustername> <regionlimit> <numberofnodesperavailabilityzone>" + exit 1 +fi +set -eux + +# The testnet name is the same on all nodes +export TESTNET_NAME=$1 +export CLUSTER_NAME=$2 +export REGION_LIMIT=$3 +export SERVERS=$4 + +# Build the AWS full nodes +rm -rf remote/ansible/keys +make fullnodes-start + +# Save the private key seed words from the nodes +SEEDFOLDER="${TESTNET_NAME}-${CLUSTER_NAME}-seedwords" +mkdir -p "${SEEDFOLDER}" +test ! -f "${SEEDFOLDER}/node0" && mv remote/ansible/keys/* "${SEEDFOLDER}" + diff --git a/networks/add-datadog.sh b/networks/add-datadog.sh new file mode 100755 index 000000000..6432cc9e4 --- /dev/null +++ b/networks/add-datadog.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# add-datadog - add datadog agent to a set of nodes + +if [ $# -ne 2 ]; then + echo "Usage: ./add-datadog.sh <testnetname> <clustername>" + exit 1 +fi +set -eux + +export TESTNET_NAME=$1 +export CLUSTER_NAME=$2 + +make install-datadog + diff --git a/networks/del-cluster.sh b/networks/del-cluster.sh new file mode 100755 index 000000000..0c4dec8d1 --- /dev/null +++ b/networks/del-cluster.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# del-cluster - example make call to delete a set of nodes on an existing testnet in AWS + +if [ $# -ne 1 ]; then + echo "Usage: ./add-cluster.sh <clustername>" + exit 1 +fi +set -eux + +export CLUSTER_NAME=$1 + +# Delete the AWS nodes +make fullnodes-stop + diff --git a/networks/del-datadog.sh b/networks/del-datadog.sh new file mode 100755 index 000000000..c9bf33526 --- /dev/null +++ b/networks/del-datadog.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# del-datadog - aremove datadog agent from a set of nodes + +if [ $# -ne 1 ]; then + echo "Usage: ./del-datadog.sh <clustername>" + exit 1 +fi +set -eux + +export CLUSTER_NAME=$1 + +make remove-datadog + diff --git a/networks/list.sh b/networks/list.sh new file mode 100755 index 000000000..fd1b132fa --- /dev/null +++ b/networks/list.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# list - list the IPs of a set of nodes + +if [ $# -ne 1 ]; then + echo "Usage: ./list.sh <clustername>" + exit 1 +fi +set -eux + +export CLUSTER_NAME=$1 + +make list + diff --git a/networks/local/README.md b/networks/local/README.md index d38e837a2..3a0f855be 100644 --- a/networks/local/README.md +++ b/networks/local/README.md @@ -31,9 +31,9 @@ To start a 4 node testnet run: make localnet-start ``` -The nodes bind their RPC servers to ports 46657, 46660, 46662, and 46664 on the host. +The nodes bind their RPC servers to ports 26657, 26660, 26662, and 26664 on the host. This file creates a 4-node network using the gaiadnode image. -The nodes of the network expose their P2P and RPC endpoints to the host machine on ports 46656-46657, 46659-46660, 46661-46662, and 46663-46664 respectively. +The nodes of the network expose their P2P and RPC endpoints to the host machine on ports 26656-26657, 26659-26660, 26661-26662, and 26663-26664 respectively. To update the binary, just rebuild it and restart the nodes: diff --git a/networks/local/gaiadnode/Dockerfile b/networks/local/gaiadnode/Dockerfile index fc2c0d4a0..d82036a46 100644 --- a/networks/local/gaiadnode/Dockerfile +++ b/networks/local/gaiadnode/Dockerfile @@ -7,7 +7,7 @@ RUN apk update && \ VOLUME [ /gaiad ] WORKDIR /gaiad -EXPOSE 46656 46657 +EXPOSE 26656 26657 ENTRYPOINT ["/usr/bin/wrapper.sh"] CMD ["start"] STOPSIGNAL SIGTERM diff --git a/networks/new-testnet.sh b/networks/new-testnet.sh new file mode 100755 index 000000000..ae7b73dea --- /dev/null +++ b/networks/new-testnet.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# new-testnet - example make call to create a new set of validator nodes in AWS +# WARNING: Run it from the current directory - it uses relative paths to ship the binary + +if [ $# -ne 4 ]; then + echo "Usage: ./new-testnet.sh <testnetname> <clustername> <regionlimit> <numberofnodesperavailabilityzone>" + exit 1 +fi +set -eux + +if [ -z "`file ../build/gaiad | grep 'ELF 64-bit'`" ]; then + # Build the linux binary we're going to ship to the nodes + make -C .. build-linux +fi + +# The testnet name is the same on all nodes +export TESTNET_NAME=$1 +export CLUSTER_NAME=$2 +export REGION_LIMIT=$3 +export SERVERS=$4 + +# Build the AWS validator nodes and extract the genesis.json and config.toml from one of them +rm -rf remote/ansible/keys +make validators-start extract-config + +# Save the private key seed words from the validators +SEEDFOLDER="${TESTNET_NAME}-${CLUSTER_NAME}-seedwords" +mkdir -p "${SEEDFOLDER}" +test ! -f "${SEEDFOLDER}/node0" && mv remote/ansible/keys/* "${SEEDFOLDER}" + diff --git a/networks/remote/README.rst b/networks/remote/README.rst deleted file mode 100644 index de694d049..000000000 --- a/networks/remote/README.rst +++ /dev/null @@ -1,67 +0,0 @@ -Terraform & Ansible -=================== - -Automated deployments are done using `Terraform <https://www.terraform.io/>`__ to create servers on Digital Ocean then -`Ansible <http://www.ansible.com/>`__ to create and manage testnets on those servers. - -Prerequisites -------------- - -- Install `Terraform <https://www.terraform.io/downloads.html>`__ and `Ansible <http://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html>`__ on a Linux machine. -- Create a `DigitalOcean API token <https://cloud.digitalocean.com/settings/api/tokens>`__ with read and write capability. -- Install the python dopy package (``pip install dopy``) (This is necessary for the digitalocean.py script for ansible.) -- Create SSH keys - -:: - - export DO_API_TOKEN="abcdef01234567890abcdef01234567890" - export TESTNET_NAME="remotenet" - export SSH_PRIVATE_FILE="$HOME/.ssh/id_rsa" - export SSH_PUBLIC_FILE="$HOME/.ssh/id_rsa.pub" - -These will be used by both ``terraform`` and ``ansible``. - -Create a remote network ------------------------ - -:: - - make remotenet-start - - -Optionally, you can set the number of servers you want to launch and the name of the testnet (which defaults to remotenet): - -:: - - TESTNET_NAME="mytestnet" SERVERS=7 make remotenet-start - - -Quickly see the /status endpoint --------------------------------- - -:: - - make remotenet-status - - -Delete servers --------------- - -:: - - make remotenet-stop - -Logging -------- - -You can ship logs to Logz.io, an Elastic stack (Elastic search, Logstash and Kibana) service provider. You can set up your nodes to log there automatically. Create an account and get your API key from the notes on `this page <https://app.logz.io/#/dashboard/data-sources/Filebeat>`__, then: - -:: - - yum install systemd-devel || echo "This will only work on RHEL-based systems." - apt-get install libsystemd-dev || echo "This will only work on Debian-based systems." - - go get github.com/mheese/journalbeat - ansible-playbook -i inventory/digital_ocean.py -l remotenet logzio.yml -e LOGZIO_TOKEN=ABCDEFGHIJKLMNOPQRSTUVWXYZ012345 - - diff --git a/networks/remote/ansible/.gitignore b/networks/remote/ansible/.gitignore index 8826f63a7..bebb9186b 100644 --- a/networks/remote/ansible/.gitignore +++ b/networks/remote/ansible/.gitignore @@ -1,2 +1,3 @@ *.retry files/* +keys/* diff --git a/networks/remote/ansible/add-lcd.yml b/networks/remote/ansible/add-lcd.yml new file mode 100644 index 000000000..bdc070348 --- /dev/null +++ b/networks/remote/ansible/add-lcd.yml @@ -0,0 +1,8 @@ +--- + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - add-lcd + diff --git a/networks/remote/ansible/clear-config.yml b/networks/remote/ansible/clear-config.yml index 675cdd072..80831e75c 100644 --- a/networks/remote/ansible/clear-config.yml +++ b/networks/remote/ansible/clear-config.yml @@ -1,7 +1,6 @@ --- - hosts: all - user: root any_errors_fatal: true gather_facts: no roles: diff --git a/networks/remote/ansible/extract-config.yml b/networks/remote/ansible/extract-config.yml new file mode 100644 index 000000000..d901bb698 --- /dev/null +++ b/networks/remote/ansible/extract-config.yml @@ -0,0 +1,8 @@ +--- + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - extract-config + diff --git a/networks/remote/ansible/install-datadog-agent.yml b/networks/remote/ansible/install-datadog-agent.yml new file mode 100644 index 000000000..d32458703 --- /dev/null +++ b/networks/remote/ansible/install-datadog-agent.yml @@ -0,0 +1,10 @@ +--- + +#DD_API_KEY,TESTNET_NAME,CLUSTER_NAME required + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - install-datadog-agent + diff --git a/networks/remote/ansible/inventory/ec2.ini b/networks/remote/ansible/inventory/ec2.ini new file mode 100644 index 000000000..e11a69cc1 --- /dev/null +++ b/networks/remote/ansible/inventory/ec2.ini @@ -0,0 +1,209 @@ +# Ansible EC2 external inventory script settings +# + +[ec2] + +# to talk to a private eucalyptus instance uncomment these lines +# and edit edit eucalyptus_host to be the host name of your cloud controller +#eucalyptus = True +#eucalyptus_host = clc.cloud.domain.org + +# AWS regions to make calls to. Set this to 'all' to make request to all regions +# in AWS and merge the results together. Alternatively, set this to a comma +# separated list of regions. E.g. 'us-east-1,us-west-1,us-west-2' and do not +# provide the 'regions_exclude' option. If this is set to 'auto', AWS_REGION or +# AWS_DEFAULT_REGION environment variable will be read to determine the region. +regions = all +regions_exclude = us-gov-west-1, cn-north-1 + +# When generating inventory, Ansible needs to know how to address a server. +# Each EC2 instance has a lot of variables associated with it. Here is the list: +# http://docs.pythonboto.org/en/latest/ref/ec2.html#module-boto.ec2.instance +# Below are 2 variables that are used as the address of a server: +# - destination_variable +# - vpc_destination_variable + +# This is the normal destination variable to use. If you are running Ansible +# from outside EC2, then 'public_dns_name' makes the most sense. If you are +# running Ansible from within EC2, then perhaps you want to use the internal +# address, and should set this to 'private_dns_name'. The key of an EC2 tag +# may optionally be used; however the boto instance variables hold precedence +# in the event of a collision. +destination_variable = public_dns_name + +# This allows you to override the inventory_name with an ec2 variable, instead +# of using the destination_variable above. Addressing (aka ansible_ssh_host) +# will still use destination_variable. Tags should be written as 'tag_TAGNAME'. +#hostname_variable = tag_Name + +# For server inside a VPC, using DNS names may not make sense. When an instance +# has 'subnet_id' set, this variable is used. If the subnet is public, setting +# this to 'ip_address' will return the public IP address. For instances in a +# private subnet, this should be set to 'private_ip_address', and Ansible must +# be run from within EC2. The key of an EC2 tag may optionally be used; however +# the boto instance variables hold precedence in the event of a collision. +# WARNING: - instances that are in the private vpc, _without_ public ip address +# will not be listed in the inventory until You set: +# vpc_destination_variable = private_ip_address +vpc_destination_variable = ip_address + +# The following two settings allow flexible ansible host naming based on a +# python format string and a comma-separated list of ec2 tags. Note that: +# +# 1) If the tags referenced are not present for some instances, empty strings +# will be substituted in the format string. +# 2) This overrides both destination_variable and vpc_destination_variable. +# +#destination_format = {0}.{1}.example.com +#destination_format_tags = Name,environment + +# To tag instances on EC2 with the resource records that point to them from +# Route53, set 'route53' to True. +route53 = False + +# To use Route53 records as the inventory hostnames, uncomment and set +# to equal the domain name you wish to use. You must also have 'route53' (above) +# set to True. +# route53_hostnames = .example.com + +# To exclude RDS instances from the inventory, uncomment and set to False. +#rds = False + +# To exclude ElastiCache instances from the inventory, uncomment and set to False. +#elasticache = False + +# Additionally, you can specify the list of zones to exclude looking up in +# 'route53_excluded_zones' as a comma-separated list. +# route53_excluded_zones = samplezone1.com, samplezone2.com + +# By default, only EC2 instances in the 'running' state are returned. Set +# 'all_instances' to True to return all instances regardless of state. +all_instances = False + +# By default, only EC2 instances in the 'running' state are returned. Specify +# EC2 instance states to return as a comma-separated list. This +# option is overridden when 'all_instances' is True. +# instance_states = pending, running, shutting-down, terminated, stopping, stopped + +# By default, only RDS instances in the 'available' state are returned. Set +# 'all_rds_instances' to True return all RDS instances regardless of state. +all_rds_instances = False + +# Include RDS cluster information (Aurora etc.) +include_rds_clusters = False + +# By default, only ElastiCache clusters and nodes in the 'available' state +# are returned. Set 'all_elasticache_clusters' and/or 'all_elastic_nodes' +# to True return all ElastiCache clusters and nodes, regardless of state. +# +# Note that all_elasticache_nodes only applies to listed clusters. That means +# if you set all_elastic_clusters to false, no node will be return from +# unavailable clusters, regardless of the state and to what you set for +# all_elasticache_nodes. +all_elasticache_replication_groups = False +all_elasticache_clusters = False +all_elasticache_nodes = False + +# API calls to EC2 are slow. For this reason, we cache the results of an API +# call. Set this to the path you want cache files to be written to. Two files +# will be written to this directory: +# - ansible-ec2.cache +# - ansible-ec2.index +cache_path = ~/.ansible/tmp + +# The number of seconds a cache file is considered valid. After this many +# seconds, a new API call will be made, and the cache file will be updated. +# To disable the cache, set this value to 0 +cache_max_age = 300 + +# Organize groups into a nested/hierarchy instead of a flat namespace. +nested_groups = False + +# Replace - tags when creating groups to avoid issues with ansible +replace_dash_in_groups = True + +# If set to true, any tag of the form "a,b,c" is expanded into a list +# and the results are used to create additional tag_* inventory groups. +expand_csv_tags = False + +# The EC2 inventory output can become very large. To manage its size, +# configure which groups should be created. +group_by_instance_id = True +group_by_region = True +group_by_availability_zone = True +group_by_aws_account = False +group_by_ami_id = True +group_by_instance_type = True +group_by_instance_state = False +group_by_key_pair = True +group_by_vpc_id = True +group_by_security_group = True +group_by_tag_keys = True +group_by_tag_none = True +group_by_route53_names = True +group_by_rds_engine = True +group_by_rds_parameter_group = True +group_by_elasticache_engine = True +group_by_elasticache_cluster = True +group_by_elasticache_parameter_group = True +group_by_elasticache_replication_group = True + +# If you only want to include hosts that match a certain regular expression +# pattern_include = staging-* + +# If you want to exclude any hosts that match a certain regular expression +# pattern_exclude = staging-* + +# Instance filters can be used to control which instances are retrieved for +# inventory. For the full list of possible filters, please read the EC2 API +# docs: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html#query-DescribeInstances-filters +# Filters are key/value pairs separated by '=', to list multiple filters use +# a list separated by commas. See examples below. + +# If you want to apply multiple filters simultaneously, set stack_filters to +# True. Default behaviour is to combine the results of all filters. Stacking +# allows the use of multiple conditions to filter down, for example by +# environment and type of host. +stack_filters = False + +# Retrieve only instances with (key=value) env=staging tag +# instance_filters = tag:env=staging + +# Retrieve only instances with role=webservers OR role=dbservers tag +# instance_filters = tag:role=webservers,tag:role=dbservers + +# Retrieve only t1.micro instances OR instances with tag env=staging +# instance_filters = instance-type=t1.micro,tag:env=staging + +# You can use wildcards in filter values also. Below will list instances which +# tag Name value matches webservers1* +# (ex. webservers15, webservers1a, webservers123 etc) +# instance_filters = tag:Name=webservers1* + +# An IAM role can be assumed, so all requests are run as that role. +# This can be useful for connecting across different accounts, or to limit user +# access +# iam_role = role-arn + +# A boto configuration profile may be used to separate out credentials +# see http://boto.readthedocs.org/en/latest/boto_config_tut.html +# boto_profile = some-boto-profile-name + + +[credentials] + +# The AWS credentials can optionally be specified here. Credentials specified +# here are ignored if the environment variable AWS_ACCESS_KEY_ID or +# AWS_PROFILE is set, or if the boto_profile property above is set. +# +# Supplying AWS credentials here is not recommended, as it introduces +# non-trivial security concerns. When going down this route, please make sure +# to set access permissions for this file correctly, e.g. handle it the same +# way as you would a private SSH key. +# +# Unlike the boto and AWS configure files, this section does not support +# profiles. +# +# aws_access_key_id = AXXXXXXXXXXXXXX +# aws_secret_access_key = XXXXXXXXXXXXXXXXXXX +# aws_security_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXX diff --git a/networks/remote/ansible/inventory/ec2.py b/networks/remote/ansible/inventory/ec2.py new file mode 100755 index 000000000..9614c5fe9 --- /dev/null +++ b/networks/remote/ansible/inventory/ec2.py @@ -0,0 +1,1595 @@ +#!/usr/bin/env python + +''' +EC2 external inventory script +================================= + +Generates inventory that Ansible can understand by making API request to +AWS EC2 using the Boto library. + +NOTE: This script assumes Ansible is being executed where the environment +variables needed for Boto have already been set: + export AWS_ACCESS_KEY_ID='AK123' + export AWS_SECRET_ACCESS_KEY='abc123' + +optional region environement variable if region is 'auto' + +This script also assumes there is an ec2.ini file alongside it. To specify a +different path to ec2.ini, define the EC2_INI_PATH environment variable: + + export EC2_INI_PATH=/path/to/my_ec2.ini + +If you're using eucalyptus you need to set the above variables and +you need to define: + + export EC2_URL=http://hostname_of_your_cc:port/services/Eucalyptus + +If you're using boto profiles (requires boto>=2.24.0) you can choose a profile +using the --boto-profile command line argument (e.g. ec2.py --boto-profile prod) or using +the AWS_PROFILE variable: + + AWS_PROFILE=prod ansible-playbook -i ec2.py myplaybook.yml + +For more details, see: http://docs.pythonboto.org/en/latest/boto_config_tut.html + +When run against a specific host, this script returns the following variables: + - ec2_ami_launch_index + - ec2_architecture + - ec2_association + - ec2_attachTime + - ec2_attachment + - ec2_attachmentId + - ec2_block_devices + - ec2_client_token + - ec2_deleteOnTermination + - ec2_description + - ec2_deviceIndex + - ec2_dns_name + - ec2_eventsSet + - ec2_group_name + - ec2_hypervisor + - ec2_id + - ec2_image_id + - ec2_instanceState + - ec2_instance_type + - ec2_ipOwnerId + - ec2_ip_address + - ec2_item + - ec2_kernel + - ec2_key_name + - ec2_launch_time + - ec2_monitored + - ec2_monitoring + - ec2_networkInterfaceId + - ec2_ownerId + - ec2_persistent + - ec2_placement + - ec2_platform + - ec2_previous_state + - ec2_private_dns_name + - ec2_private_ip_address + - ec2_publicIp + - ec2_public_dns_name + - ec2_ramdisk + - ec2_reason + - ec2_region + - ec2_requester_id + - ec2_root_device_name + - ec2_root_device_type + - ec2_security_group_ids + - ec2_security_group_names + - ec2_shutdown_state + - ec2_sourceDestCheck + - ec2_spot_instance_request_id + - ec2_state + - ec2_state_code + - ec2_state_reason + - ec2_status + - ec2_subnet_id + - ec2_tenancy + - ec2_virtualization_type + - ec2_vpc_id + +These variables are pulled out of a boto.ec2.instance object. There is a lack of +consistency with variable spellings (camelCase and underscores) since this +just loops through all variables the object exposes. It is preferred to use the +ones with underscores when multiple exist. + +In addition, if an instance has AWS Tags associated with it, each tag is a new +variable named: + - ec2_tag_[Key] = [Value] + +Security groups are comma-separated in 'ec2_security_group_ids' and +'ec2_security_group_names'. +''' + +# (c) 2012, Peter Sankauskas +# +# This file is part of Ansible, +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see <http://www.gnu.org/licenses/>. + +###################################################################### + +import sys +import os +import argparse +import re +from time import time +import boto +from boto import ec2 +from boto import rds +from boto import elasticache +from boto import route53 +from boto import sts +import six + +from ansible.module_utils import ec2 as ec2_utils + +HAS_BOTO3 = False +try: + import boto3 + HAS_BOTO3 = True +except ImportError: + pass + +from six.moves import configparser +from collections import defaultdict + +try: + import json +except ImportError: + import simplejson as json + + +class Ec2Inventory(object): + + def _empty_inventory(self): + return {"_meta": {"hostvars": {}}} + + def __init__(self): + ''' Main execution path ''' + + # Inventory grouped by instance IDs, tags, security groups, regions, + # and availability zones + self.inventory = self._empty_inventory() + + self.aws_account_id = None + + # Index of hostname (address) to instance ID + self.index = {} + + # Boto profile to use (if any) + self.boto_profile = None + + # AWS credentials. + self.credentials = {} + + # Read settings and parse CLI arguments + self.parse_cli_args() + self.read_settings() + + # Make sure that profile_name is not passed at all if not set + # as pre 2.24 boto will fall over otherwise + if self.boto_profile: + if not hasattr(boto.ec2.EC2Connection, 'profile_name'): + self.fail_with_error("boto version must be >= 2.24 to use profile") + + # Cache + if self.args.refresh_cache: + self.do_api_calls_update_cache() + elif not self.is_cache_valid(): + self.do_api_calls_update_cache() + + # Data to print + if self.args.host: + data_to_print = self.get_host_info() + + elif self.args.list: + # Display list of instances for inventory + if self.inventory == self._empty_inventory(): + data_to_print = self.get_inventory_from_cache() + else: + data_to_print = self.json_format_dict(self.inventory, True) + + print(data_to_print) + + def is_cache_valid(self): + ''' Determines if the cache files have expired, or if it is still valid ''' + + if os.path.isfile(self.cache_path_cache): + mod_time = os.path.getmtime(self.cache_path_cache) + current_time = time() + if (mod_time + self.cache_max_age) > current_time: + if os.path.isfile(self.cache_path_index): + return True + + return False + + def read_settings(self): + ''' Reads the settings from the ec2.ini file ''' + + scriptbasename = __file__ + scriptbasename = os.path.basename(scriptbasename) + scriptbasename = scriptbasename.replace('.py', '') + + defaults = { + 'ec2': { + 'ini_path': os.path.join(os.path.dirname(__file__), '%s.ini' % scriptbasename) + } + } + + if six.PY3: + config = configparser.ConfigParser() + else: + config = configparser.SafeConfigParser() + ec2_ini_path = os.environ.get('EC2_INI_PATH', defaults['ec2']['ini_path']) + ec2_ini_path = os.path.expanduser(os.path.expandvars(ec2_ini_path)) + config.read(ec2_ini_path) + + # is eucalyptus? + self.eucalyptus_host = None + self.eucalyptus = False + if config.has_option('ec2', 'eucalyptus'): + self.eucalyptus = config.getboolean('ec2', 'eucalyptus') + if self.eucalyptus and config.has_option('ec2', 'eucalyptus_host'): + self.eucalyptus_host = config.get('ec2', 'eucalyptus_host') + + # Regions + self.regions = [] + configRegions = config.get('ec2', 'regions') + if (configRegions == 'all'): + if self.eucalyptus_host: + self.regions.append(boto.connect_euca(host=self.eucalyptus_host).region.name, **self.credentials) + else: + configRegions_exclude = config.get('ec2', 'regions_exclude') + for regionInfo in ec2.regions(): + if regionInfo.name not in configRegions_exclude: + self.regions.append(regionInfo.name) + else: + self.regions = configRegions.split(",") + if 'auto' in self.regions: + env_region = os.environ.get('AWS_REGION') + if env_region is None: + env_region = os.environ.get('AWS_DEFAULT_REGION') + self.regions = [env_region] + + # Destination addresses + self.destination_variable = config.get('ec2', 'destination_variable') + self.vpc_destination_variable = config.get('ec2', 'vpc_destination_variable') + + if config.has_option('ec2', 'hostname_variable'): + self.hostname_variable = config.get('ec2', 'hostname_variable') + else: + self.hostname_variable = None + + if config.has_option('ec2', 'destination_format') and \ + config.has_option('ec2', 'destination_format_tags'): + self.destination_format = config.get('ec2', 'destination_format') + self.destination_format_tags = config.get('ec2', 'destination_format_tags').split(',') + else: + self.destination_format = None + self.destination_format_tags = None + + # Route53 + self.route53_enabled = config.getboolean('ec2', 'route53') + if config.has_option('ec2', 'route53_hostnames'): + self.route53_hostnames = config.get('ec2', 'route53_hostnames') + else: + self.route53_hostnames = None + self.route53_excluded_zones = [] + if config.has_option('ec2', 'route53_excluded_zones'): + self.route53_excluded_zones.extend( + config.get('ec2', 'route53_excluded_zones', '').split(',')) + + # Include RDS instances? + self.rds_enabled = True + if config.has_option('ec2', 'rds'): + self.rds_enabled = config.getboolean('ec2', 'rds') + + # Include RDS cluster instances? + if config.has_option('ec2', 'include_rds_clusters'): + self.include_rds_clusters = config.getboolean('ec2', 'include_rds_clusters') + else: + self.include_rds_clusters = False + + # Include ElastiCache instances? + self.elasticache_enabled = True + if config.has_option('ec2', 'elasticache'): + self.elasticache_enabled = config.getboolean('ec2', 'elasticache') + + # Return all EC2 instances? + if config.has_option('ec2', 'all_instances'): + self.all_instances = config.getboolean('ec2', 'all_instances') + else: + self.all_instances = False + + # Instance states to be gathered in inventory. Default is 'running'. + # Setting 'all_instances' to 'yes' overrides this option. + ec2_valid_instance_states = [ + 'pending', + 'running', + 'shutting-down', + 'terminated', + 'stopping', + 'stopped' + ] + self.ec2_instance_states = [] + if self.all_instances: + self.ec2_instance_states = ec2_valid_instance_states + elif config.has_option('ec2', 'instance_states'): + for instance_state in config.get('ec2', 'instance_states').split(','): + instance_state = instance_state.strip() + if instance_state not in ec2_valid_instance_states: + continue + self.ec2_instance_states.append(instance_state) + else: + self.ec2_instance_states = ['running'] + + # Return all RDS instances? (if RDS is enabled) + if config.has_option('ec2', 'all_rds_instances') and self.rds_enabled: + self.all_rds_instances = config.getboolean('ec2', 'all_rds_instances') + else: + self.all_rds_instances = False + + # Return all ElastiCache replication groups? (if ElastiCache is enabled) + if config.has_option('ec2', 'all_elasticache_replication_groups') and self.elasticache_enabled: + self.all_elasticache_replication_groups = config.getboolean('ec2', 'all_elasticache_replication_groups') + else: + self.all_elasticache_replication_groups = False + + # Return all ElastiCache clusters? (if ElastiCache is enabled) + if config.has_option('ec2', 'all_elasticache_clusters') and self.elasticache_enabled: + self.all_elasticache_clusters = config.getboolean('ec2', 'all_elasticache_clusters') + else: + self.all_elasticache_clusters = False + + # Return all ElastiCache nodes? (if ElastiCache is enabled) + if config.has_option('ec2', 'all_elasticache_nodes') and self.elasticache_enabled: + self.all_elasticache_nodes = config.getboolean('ec2', 'all_elasticache_nodes') + else: + self.all_elasticache_nodes = False + + # boto configuration profile (prefer CLI argument then environment variables then config file) + self.boto_profile = self.args.boto_profile or os.environ.get('AWS_PROFILE') + if config.has_option('ec2', 'boto_profile') and not self.boto_profile: + self.boto_profile = config.get('ec2', 'boto_profile') + + # AWS credentials (prefer environment variables) + if not (self.boto_profile or os.environ.get('AWS_ACCESS_KEY_ID') or + os.environ.get('AWS_PROFILE')): + if config.has_option('credentials', 'aws_access_key_id'): + aws_access_key_id = config.get('credentials', 'aws_access_key_id') + else: + aws_access_key_id = None + if config.has_option('credentials', 'aws_secret_access_key'): + aws_secret_access_key = config.get('credentials', 'aws_secret_access_key') + else: + aws_secret_access_key = None + if config.has_option('credentials', 'aws_security_token'): + aws_security_token = config.get('credentials', 'aws_security_token') + else: + aws_security_token = None + if aws_access_key_id: + self.credentials = { + 'aws_access_key_id': aws_access_key_id, + 'aws_secret_access_key': aws_secret_access_key + } + if aws_security_token: + self.credentials['security_token'] = aws_security_token + + # Cache related + cache_dir = os.path.expanduser(config.get('ec2', 'cache_path')) + if self.boto_profile: + cache_dir = os.path.join(cache_dir, 'profile_' + self.boto_profile) + if not os.path.exists(cache_dir): + os.makedirs(cache_dir) + + cache_name = 'ansible-ec2' + cache_id = self.boto_profile or os.environ.get('AWS_ACCESS_KEY_ID', self.credentials.get('aws_access_key_id')) + if cache_id: + cache_name = '%s-%s' % (cache_name, cache_id) + self.cache_path_cache = os.path.join(cache_dir, "%s.cache" % cache_name) + self.cache_path_index = os.path.join(cache_dir, "%s.index" % cache_name) + self.cache_max_age = config.getint('ec2', 'cache_max_age') + + if config.has_option('ec2', 'expand_csv_tags'): + self.expand_csv_tags = config.getboolean('ec2', 'expand_csv_tags') + else: + self.expand_csv_tags = False + + # Configure nested groups instead of flat namespace. + if config.has_option('ec2', 'nested_groups'): + self.nested_groups = config.getboolean('ec2', 'nested_groups') + else: + self.nested_groups = False + + # Replace dash or not in group names + if config.has_option('ec2', 'replace_dash_in_groups'): + self.replace_dash_in_groups = config.getboolean('ec2', 'replace_dash_in_groups') + else: + self.replace_dash_in_groups = True + + # IAM role to assume for connection + if config.has_option('ec2', 'iam_role'): + self.iam_role = config.get('ec2', 'iam_role') + else: + self.iam_role = None + + # Configure which groups should be created. + group_by_options = [ + 'group_by_instance_id', + 'group_by_region', + 'group_by_availability_zone', + 'group_by_ami_id', + 'group_by_instance_type', + 'group_by_instance_state', + 'group_by_key_pair', + 'group_by_vpc_id', + 'group_by_security_group', + 'group_by_tag_keys', + 'group_by_tag_none', + 'group_by_route53_names', + 'group_by_rds_engine', + 'group_by_rds_parameter_group', + 'group_by_elasticache_engine', + 'group_by_elasticache_cluster', + 'group_by_elasticache_parameter_group', + 'group_by_elasticache_replication_group', + 'group_by_aws_account', + ] + for option in group_by_options: + if config.has_option('ec2', option): + setattr(self, option, config.getboolean('ec2', option)) + else: + setattr(self, option, True) + + # Do we need to just include hosts that match a pattern? + try: + pattern_include = config.get('ec2', 'pattern_include') + if pattern_include and len(pattern_include) > 0: + self.pattern_include = re.compile(pattern_include) + else: + self.pattern_include = None + except configparser.NoOptionError: + self.pattern_include = None + + # Do we need to exclude hosts that match a pattern? + try: + pattern_exclude = config.get('ec2', 'pattern_exclude') + if pattern_exclude and len(pattern_exclude) > 0: + self.pattern_exclude = re.compile(pattern_exclude) + else: + self.pattern_exclude = None + except configparser.NoOptionError: + self.pattern_exclude = None + + # Do we want to stack multiple filters? + if config.has_option('ec2', 'stack_filters'): + self.stack_filters = config.getboolean('ec2', 'stack_filters') + else: + self.stack_filters = False + + # Instance filters (see boto and EC2 API docs). Ignore invalid filters. + self.ec2_instance_filters = defaultdict(list) + if config.has_option('ec2', 'instance_filters'): + + filters = [f for f in config.get('ec2', 'instance_filters').split(',') if f] + + for instance_filter in filters: + instance_filter = instance_filter.strip() + if not instance_filter or '=' not in instance_filter: + continue + filter_key, filter_value = [x.strip() for x in instance_filter.split('=', 1)] + if not filter_key: + continue + self.ec2_instance_filters[filter_key].append(filter_value) + + def parse_cli_args(self): + ''' Command line argument processing ''' + + parser = argparse.ArgumentParser(description='Produce an Ansible Inventory file based on EC2') + parser.add_argument('--list', action='store_true', default=True, + help='List instances (default: True)') + parser.add_argument('--host', action='store', + help='Get all the variables about a specific instance') + parser.add_argument('--refresh-cache', action='store_true', default=False, + help='Force refresh of cache by making API requests to EC2 (default: False - use cache files)') + parser.add_argument('--profile', '--boto-profile', action='store', dest='boto_profile', + help='Use boto profile for connections to EC2') + self.args = parser.parse_args() + + def do_api_calls_update_cache(self): + ''' Do API calls to each region, and save data in cache files ''' + + if self.route53_enabled: + self.get_route53_records() + + for region in self.regions: + self.get_instances_by_region(region) + if self.rds_enabled: + self.get_rds_instances_by_region(region) + if self.elasticache_enabled: + self.get_elasticache_clusters_by_region(region) + self.get_elasticache_replication_groups_by_region(region) + if self.include_rds_clusters: + self.include_rds_clusters_by_region(region) + + self.write_to_cache(self.inventory, self.cache_path_cache) + self.write_to_cache(self.index, self.cache_path_index) + + def connect(self, region): + ''' create connection to api server''' + if self.eucalyptus: + conn = boto.connect_euca(host=self.eucalyptus_host, **self.credentials) + conn.APIVersion = '2010-08-31' + else: + conn = self.connect_to_aws(ec2, region) + return conn + + def boto_fix_security_token_in_profile(self, connect_args): + ''' monkey patch for boto issue boto/boto#2100 ''' + profile = 'profile ' + self.boto_profile + if boto.config.has_option(profile, 'aws_security_token'): + connect_args['security_token'] = boto.config.get(profile, 'aws_security_token') + return connect_args + + def connect_to_aws(self, module, region): + connect_args = self.credentials + + # only pass the profile name if it's set (as it is not supported by older boto versions) + if self.boto_profile: + connect_args['profile_name'] = self.boto_profile + self.boto_fix_security_token_in_profile(connect_args) + + if self.iam_role: + sts_conn = sts.connect_to_region(region, **connect_args) + role = sts_conn.assume_role(self.iam_role, 'ansible_dynamic_inventory') + connect_args['aws_access_key_id'] = role.credentials.access_key + connect_args['aws_secret_access_key'] = role.credentials.secret_key + connect_args['security_token'] = role.credentials.session_token + + conn = module.connect_to_region(region, **connect_args) + # connect_to_region will fail "silently" by returning None if the region name is wrong or not supported + if conn is None: + self.fail_with_error("region name: %s likely not supported, or AWS is down. connection to region failed." % region) + return conn + + def get_instances_by_region(self, region): + ''' Makes an AWS EC2 API call to the list of instances in a particular + region ''' + + try: + conn = self.connect(region) + reservations = [] + if self.ec2_instance_filters: + if self.stack_filters: + filters_dict = {} + for filter_key, filter_values in self.ec2_instance_filters.items(): + filters_dict[filter_key] = filter_values + reservations.extend(conn.get_all_instances(filters=filters_dict)) + else: + for filter_key, filter_values in self.ec2_instance_filters.items(): + reservations.extend(conn.get_all_instances(filters={filter_key: filter_values})) + else: + reservations = conn.get_all_instances() + + # Pull the tags back in a second step + # AWS are on record as saying that the tags fetched in the first `get_all_instances` request are not + # reliable and may be missing, and the only way to guarantee they are there is by calling `get_all_tags` + instance_ids = [] + for reservation in reservations: + instance_ids.extend([instance.id for instance in reservation.instances]) + + max_filter_value = 199 + tags = [] + for i in range(0, len(instance_ids), max_filter_value): + tags.extend(conn.get_all_tags(filters={'resource-type': 'instance', 'resource-id': instance_ids[i:i + max_filter_value]})) + + tags_by_instance_id = defaultdict(dict) + for tag in tags: + tags_by_instance_id[tag.res_id][tag.name] = tag.value + + if (not self.aws_account_id) and reservations: + self.aws_account_id = reservations[0].owner_id + + for reservation in reservations: + for instance in reservation.instances: + instance.tags = tags_by_instance_id[instance.id] + self.add_instance(instance, region) + + except boto.exception.BotoServerError as e: + if e.error_code == 'AuthFailure': + error = self.get_auth_error_message() + else: + backend = 'Eucalyptus' if self.eucalyptus else 'AWS' + error = "Error connecting to %s backend.\n%s" % (backend, e.message) + self.fail_with_error(error, 'getting EC2 instances') + + def get_rds_instances_by_region(self, region): + ''' Makes an AWS API call to the list of RDS instances in a particular + region ''' + + if not HAS_BOTO3: + self.fail_with_error("Working with RDS instances requires boto3 - please install boto3 and try again", + "getting RDS instances") + + client = ec2_utils.boto3_inventory_conn('client', 'rds', region, **self.credentials) + db_instances = client.describe_db_instances() + + try: + conn = self.connect_to_aws(rds, region) + if conn: + marker = None + while True: + instances = conn.get_all_dbinstances(marker=marker) + marker = instances.marker + for index, instance in enumerate(instances): + # Add tags to instances. + instance.arn = db_instances['DBInstances'][index]['DBInstanceArn'] + tags = client.list_tags_for_resource(ResourceName=instance.arn)['TagList'] + instance.tags = {} + for tag in tags: + instance.tags[tag['Key']] = tag['Value'] + + self.add_rds_instance(instance, region) + if not marker: + break + except boto.exception.BotoServerError as e: + error = e.reason + + if e.error_code == 'AuthFailure': + error = self.get_auth_error_message() + if not e.reason == "Forbidden": + error = "Looks like AWS RDS is down:\n%s" % e.message + self.fail_with_error(error, 'getting RDS instances') + + def include_rds_clusters_by_region(self, region): + if not HAS_BOTO3: + self.fail_with_error("Working with RDS clusters requires boto3 - please install boto3 and try again", + "getting RDS clusters") + + client = ec2_utils.boto3_inventory_conn('client', 'rds', region, **self.credentials) + + marker, clusters = '', [] + while marker is not None: + resp = client.describe_db_clusters(Marker=marker) + clusters.extend(resp["DBClusters"]) + marker = resp.get('Marker', None) + + account_id = boto.connect_iam().get_user().arn.split(':')[4] + c_dict = {} + for c in clusters: + # remove these datetime objects as there is no serialisation to json + # currently in place and we don't need the data yet + if 'EarliestRestorableTime' in c: + del c['EarliestRestorableTime'] + if 'LatestRestorableTime' in c: + del c['LatestRestorableTime'] + + if self.ec2_instance_filters == {}: + matches_filter = True + else: + matches_filter = False + + try: + # arn:aws:rds:<region>:<account number>:<resourcetype>:<name> + tags = client.list_tags_for_resource( + ResourceName='arn:aws:rds:' + region + ':' + account_id + ':cluster:' + c['DBClusterIdentifier']) + c['Tags'] = tags['TagList'] + + if self.ec2_instance_filters: + for filter_key, filter_values in self.ec2_instance_filters.items(): + # get AWS tag key e.g. tag:env will be 'env' + tag_name = filter_key.split(":", 1)[1] + # Filter values is a list (if you put multiple values for the same tag name) + matches_filter = any(d['Key'] == tag_name and d['Value'] in filter_values for d in c['Tags']) + + if matches_filter: + # it matches a filter, so stop looking for further matches + break + + except Exception as e: + if e.message.find('DBInstanceNotFound') >= 0: + # AWS RDS bug (2016-01-06) means deletion does not fully complete and leave an 'empty' cluster. + # Ignore errors when trying to find tags for these + pass + + # ignore empty clusters caused by AWS bug + if len(c['DBClusterMembers']) == 0: + continue + elif matches_filter: + c_dict[c['DBClusterIdentifier']] = c + + self.inventory['db_clusters'] = c_dict + + def get_elasticache_clusters_by_region(self, region): + ''' Makes an AWS API call to the list of ElastiCache clusters (with + nodes' info) in a particular region.''' + + # ElastiCache boto module doesn't provide a get_all_intances method, + # that's why we need to call describe directly (it would be called by + # the shorthand method anyway...) + try: + conn = self.connect_to_aws(elasticache, region) + if conn: + # show_cache_node_info = True + # because we also want nodes' information + response = conn.describe_cache_clusters(None, None, None, True) + + except boto.exception.BotoServerError as e: + error = e.reason + + if e.error_code == 'AuthFailure': + error = self.get_auth_error_message() + if not e.reason == "Forbidden": + error = "Looks like AWS ElastiCache is down:\n%s" % e.message + self.fail_with_error(error, 'getting ElastiCache clusters') + + try: + # Boto also doesn't provide wrapper classes to CacheClusters or + # CacheNodes. Because of that we can't make use of the get_list + # method in the AWSQueryConnection. Let's do the work manually + clusters = response['DescribeCacheClustersResponse']['DescribeCacheClustersResult']['CacheClusters'] + + except KeyError as e: + error = "ElastiCache query to AWS failed (unexpected format)." + self.fail_with_error(error, 'getting ElastiCache clusters') + + for cluster in clusters: + self.add_elasticache_cluster(cluster, region) + + def get_elasticache_replication_groups_by_region(self, region): + ''' Makes an AWS API call to the list of ElastiCache replication groups + in a particular region.''' + + # ElastiCache boto module doesn't provide a get_all_intances method, + # that's why we need to call describe directly (it would be called by + # the shorthand method anyway...) + try: + conn = self.connect_to_aws(elasticache, region) + if conn: + response = conn.describe_replication_groups() + + except boto.exception.BotoServerError as e: + error = e.reason + + if e.error_code == 'AuthFailure': + error = self.get_auth_error_message() + if not e.reason == "Forbidden": + error = "Looks like AWS ElastiCache [Replication Groups] is down:\n%s" % e.message + self.fail_with_error(error, 'getting ElastiCache clusters') + + try: + # Boto also doesn't provide wrapper classes to ReplicationGroups + # Because of that we can't make use of the get_list method in the + # AWSQueryConnection. Let's do the work manually + replication_groups = response['DescribeReplicationGroupsResponse']['DescribeReplicationGroupsResult']['ReplicationGroups'] + + except KeyError as e: + error = "ElastiCache [Replication Groups] query to AWS failed (unexpected format)." + self.fail_with_error(error, 'getting ElastiCache clusters') + + for replication_group in replication_groups: + self.add_elasticache_replication_group(replication_group, region) + + def get_auth_error_message(self): + ''' create an informative error message if there is an issue authenticating''' + errors = ["Authentication error retrieving ec2 inventory."] + if None in [os.environ.get('AWS_ACCESS_KEY_ID'), os.environ.get('AWS_SECRET_ACCESS_KEY')]: + errors.append(' - No AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY environment vars found') + else: + errors.append(' - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment vars found but may not be correct') + + boto_paths = ['/etc/boto.cfg', '~/.boto', '~/.aws/credentials'] + boto_config_found = list(p for p in boto_paths if os.path.isfile(os.path.expanduser(p))) + if len(boto_config_found) > 0: + errors.append(" - Boto configs found at '%s', but the credentials contained may not be correct" % ', '.join(boto_config_found)) + else: + errors.append(" - No Boto config found at any expected location '%s'" % ', '.join(boto_paths)) + + return '\n'.join(errors) + + def fail_with_error(self, err_msg, err_operation=None): + '''log an error to std err for ansible-playbook to consume and exit''' + if err_operation: + err_msg = 'ERROR: "{err_msg}", while: {err_operation}'.format( + err_msg=err_msg, err_operation=err_operation) + sys.stderr.write(err_msg) + sys.exit(1) + + def get_instance(self, region, instance_id): + conn = self.connect(region) + + reservations = conn.get_all_instances([instance_id]) + for reservation in reservations: + for instance in reservation.instances: + return instance + + def add_instance(self, instance, region): + ''' Adds an instance to the inventory and index, as long as it is + addressable ''' + + # Only return instances with desired instance states + if instance.state not in self.ec2_instance_states: + return + + # Select the best destination address + if self.destination_format and self.destination_format_tags: + dest = self.destination_format.format(*[getattr(instance, 'tags').get(tag, '') for tag in self.destination_format_tags]) + elif instance.subnet_id: + dest = getattr(instance, self.vpc_destination_variable, None) + if dest is None: + dest = getattr(instance, 'tags').get(self.vpc_destination_variable, None) + else: + dest = getattr(instance, self.destination_variable, None) + if dest is None: + dest = getattr(instance, 'tags').get(self.destination_variable, None) + + if not dest: + # Skip instances we cannot address (e.g. private VPC subnet) + return + + # Set the inventory name + hostname = None + if self.hostname_variable: + if self.hostname_variable.startswith('tag_'): + hostname = instance.tags.get(self.hostname_variable[4:], None) + else: + hostname = getattr(instance, self.hostname_variable) + + # set the hostname from route53 + if self.route53_enabled and self.route53_hostnames: + route53_names = self.get_instance_route53_names(instance) + for name in route53_names: + if name.endswith(self.route53_hostnames): + hostname = name + + # If we can't get a nice hostname, use the destination address + if not hostname: + hostname = dest + # to_safe strips hostname characters like dots, so don't strip route53 hostnames + elif self.route53_enabled and self.route53_hostnames and hostname.endswith(self.route53_hostnames): + hostname = hostname.lower() + else: + hostname = self.to_safe(hostname).lower() + + # if we only want to include hosts that match a pattern, skip those that don't + if self.pattern_include and not self.pattern_include.match(hostname): + return + + # if we need to exclude hosts that match a pattern, skip those + if self.pattern_exclude and self.pattern_exclude.match(hostname): + return + + # Add to index + self.index[hostname] = [region, instance.id] + + # Inventory: Group by instance ID (always a group of 1) + if self.group_by_instance_id: + self.inventory[instance.id] = [hostname] + if self.nested_groups: + self.push_group(self.inventory, 'instances', instance.id) + + # Inventory: Group by region + if self.group_by_region: + self.push(self.inventory, region, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'regions', region) + + # Inventory: Group by availability zone + if self.group_by_availability_zone: + self.push(self.inventory, instance.placement, hostname) + if self.nested_groups: + if self.group_by_region: + self.push_group(self.inventory, region, instance.placement) + self.push_group(self.inventory, 'zones', instance.placement) + + # Inventory: Group by Amazon Machine Image (AMI) ID + if self.group_by_ami_id: + ami_id = self.to_safe(instance.image_id) + self.push(self.inventory, ami_id, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'images', ami_id) + + # Inventory: Group by instance type + if self.group_by_instance_type: + type_name = self.to_safe('type_' + instance.instance_type) + self.push(self.inventory, type_name, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'types', type_name) + + # Inventory: Group by instance state + if self.group_by_instance_state: + state_name = self.to_safe('instance_state_' + instance.state) + self.push(self.inventory, state_name, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'instance_states', state_name) + + # Inventory: Group by key pair + if self.group_by_key_pair and instance.key_name: + key_name = self.to_safe('key_' + instance.key_name) + self.push(self.inventory, key_name, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'keys', key_name) + + # Inventory: Group by VPC + if self.group_by_vpc_id and instance.vpc_id: + vpc_id_name = self.to_safe('vpc_id_' + instance.vpc_id) + self.push(self.inventory, vpc_id_name, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'vpcs', vpc_id_name) + + # Inventory: Group by security group + if self.group_by_security_group: + try: + for group in instance.groups: + key = self.to_safe("security_group_" + group.name) + self.push(self.inventory, key, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'security_groups', key) + except AttributeError: + self.fail_with_error('\n'.join(['Package boto seems a bit older.', + 'Please upgrade boto >= 2.3.0.'])) + + # Inventory: Group by AWS account ID + if self.group_by_aws_account: + self.push(self.inventory, self.aws_account_id, dest) + if self.nested_groups: + self.push_group(self.inventory, 'accounts', self.aws_account_id) + + # Inventory: Group by tag keys + if self.group_by_tag_keys: + for k, v in instance.tags.items(): + if self.expand_csv_tags and v and ',' in v: + values = map(lambda x: x.strip(), v.split(',')) + else: + values = [v] + + for v in values: + if v: + key = self.to_safe("tag_" + k + "=" + v) + else: + key = self.to_safe("tag_" + k) + self.push(self.inventory, key, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'tags', self.to_safe("tag_" + k)) + if v: + self.push_group(self.inventory, self.to_safe("tag_" + k), key) + + # Inventory: Group by Route53 domain names if enabled + if self.route53_enabled and self.group_by_route53_names: + route53_names = self.get_instance_route53_names(instance) + for name in route53_names: + self.push(self.inventory, name, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'route53', name) + + # Global Tag: instances without tags + if self.group_by_tag_none and len(instance.tags) == 0: + self.push(self.inventory, 'tag_none', hostname) + if self.nested_groups: + self.push_group(self.inventory, 'tags', 'tag_none') + + # Global Tag: tag all EC2 instances + self.push(self.inventory, 'ec2', hostname) + + self.inventory["_meta"]["hostvars"][hostname] = self.get_host_info_dict_from_instance(instance) + self.inventory["_meta"]["hostvars"][hostname]['ansible_ssh_host'] = dest + + def add_rds_instance(self, instance, region): + ''' Adds an RDS instance to the inventory and index, as long as it is + addressable ''' + + # Only want available instances unless all_rds_instances is True + if not self.all_rds_instances and instance.status != 'available': + return + + # Select the best destination address + dest = instance.endpoint[0] + + if not dest: + # Skip instances we cannot address (e.g. private VPC subnet) + return + + # Set the inventory name + hostname = None + if self.hostname_variable: + if self.hostname_variable.startswith('tag_'): + hostname = instance.tags.get(self.hostname_variable[4:], None) + else: + hostname = getattr(instance, self.hostname_variable) + + # If we can't get a nice hostname, use the destination address + if not hostname: + hostname = dest + + hostname = self.to_safe(hostname).lower() + + # Add to index + self.index[hostname] = [region, instance.id] + + # Inventory: Group by instance ID (always a group of 1) + if self.group_by_instance_id: + self.inventory[instance.id] = [hostname] + if self.nested_groups: + self.push_group(self.inventory, 'instances', instance.id) + + # Inventory: Group by region + if self.group_by_region: + self.push(self.inventory, region, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'regions', region) + + # Inventory: Group by availability zone + if self.group_by_availability_zone: + self.push(self.inventory, instance.availability_zone, hostname) + if self.nested_groups: + if self.group_by_region: + self.push_group(self.inventory, region, instance.availability_zone) + self.push_group(self.inventory, 'zones', instance.availability_zone) + + # Inventory: Group by instance type + if self.group_by_instance_type: + type_name = self.to_safe('type_' + instance.instance_class) + self.push(self.inventory, type_name, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'types', type_name) + + # Inventory: Group by VPC + if self.group_by_vpc_id and instance.subnet_group and instance.subnet_group.vpc_id: + vpc_id_name = self.to_safe('vpc_id_' + instance.subnet_group.vpc_id) + self.push(self.inventory, vpc_id_name, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'vpcs', vpc_id_name) + + # Inventory: Group by security group + if self.group_by_security_group: + try: + if instance.security_group: + key = self.to_safe("security_group_" + instance.security_group.name) + self.push(self.inventory, key, hostname) + if self.nested_groups: + self.push_group(self.inventory, 'security_groups', key) + + except AttributeError: + self.fail_with_error('\n'.join(['Package boto seems a bit older.', + 'Please upgrade boto >= 2.3.0.'])) + + # Inventory: Group by engine + if self.group_by_rds_engine: + self.push(self.inventory, self.to_safe("rds_" + instance.engine), hostname) + if self.nested_groups: + self.push_group(self.inventory, 'rds_engines', self.to_safe("rds_" + instance.engine)) + + # Inventory: Group by parameter group + if self.group_by_rds_parameter_group: + self.push(self.inventory, self.to_safe("rds_parameter_group_" + instance.parameter_group.name), hostname) + if self.nested_groups: + self.push_group(self.inventory, 'rds_parameter_groups', self.to_safe("rds_parameter_group_" + instance.parameter_group.name)) + + # Global Tag: all RDS instances + self.push(self.inventory, 'rds', hostname) + + self.inventory["_meta"]["hostvars"][hostname] = self.get_host_info_dict_from_instance(instance) + self.inventory["_meta"]["hostvars"][hostname]['ansible_ssh_host'] = dest + + def add_elasticache_cluster(self, cluster, region): + ''' Adds an ElastiCache cluster to the inventory and index, as long as + it's nodes are addressable ''' + + # Only want available clusters unless all_elasticache_clusters is True + if not self.all_elasticache_clusters and cluster['CacheClusterStatus'] != 'available': + return + + # Select the best destination address + if 'ConfigurationEndpoint' in cluster and cluster['ConfigurationEndpoint']: + # Memcached cluster + dest = cluster['ConfigurationEndpoint']['Address'] + is_redis = False + else: + # Redis sigle node cluster + # Because all Redis clusters are single nodes, we'll merge the + # info from the cluster with info about the node + dest = cluster['CacheNodes'][0]['Endpoint']['Address'] + is_redis = True + + if not dest: + # Skip clusters we cannot address (e.g. private VPC subnet) + return + + # Add to index + self.index[dest] = [region, cluster['CacheClusterId']] + + # Inventory: Group by instance ID (always a group of 1) + if self.group_by_instance_id: + self.inventory[cluster['CacheClusterId']] = [dest] + if self.nested_groups: + self.push_group(self.inventory, 'instances', cluster['CacheClusterId']) + + # Inventory: Group by region + if self.group_by_region and not is_redis: + self.push(self.inventory, region, dest) + if self.nested_groups: + self.push_group(self.inventory, 'regions', region) + + # Inventory: Group by availability zone + if self.group_by_availability_zone and not is_redis: + self.push(self.inventory, cluster['PreferredAvailabilityZone'], dest) + if self.nested_groups: + if self.group_by_region: + self.push_group(self.inventory, region, cluster['PreferredAvailabilityZone']) + self.push_group(self.inventory, 'zones', cluster['PreferredAvailabilityZone']) + + # Inventory: Group by node type + if self.group_by_instance_type and not is_redis: + type_name = self.to_safe('type_' + cluster['CacheNodeType']) + self.push(self.inventory, type_name, dest) + if self.nested_groups: + self.push_group(self.inventory, 'types', type_name) + + # Inventory: Group by VPC (information not available in the current + # AWS API version for ElastiCache) + + # Inventory: Group by security group + if self.group_by_security_group and not is_redis: + + # Check for the existence of the 'SecurityGroups' key and also if + # this key has some value. When the cluster is not placed in a SG + # the query can return None here and cause an error. + if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None: + for security_group in cluster['SecurityGroups']: + key = self.to_safe("security_group_" + security_group['SecurityGroupId']) + self.push(self.inventory, key, dest) + if self.nested_groups: + self.push_group(self.inventory, 'security_groups', key) + + # Inventory: Group by engine + if self.group_by_elasticache_engine and not is_redis: + self.push(self.inventory, self.to_safe("elasticache_" + cluster['Engine']), dest) + if self.nested_groups: + self.push_group(self.inventory, 'elasticache_engines', self.to_safe(cluster['Engine'])) + + # Inventory: Group by parameter group + if self.group_by_elasticache_parameter_group: + self.push(self.inventory, self.to_safe("elasticache_parameter_group_" + cluster['CacheParameterGroup']['CacheParameterGroupName']), dest) + if self.nested_groups: + self.push_group(self.inventory, 'elasticache_parameter_groups', self.to_safe(cluster['CacheParameterGroup']['CacheParameterGroupName'])) + + # Inventory: Group by replication group + if self.group_by_elasticache_replication_group and 'ReplicationGroupId' in cluster and cluster['ReplicationGroupId']: + self.push(self.inventory, self.to_safe("elasticache_replication_group_" + cluster['ReplicationGroupId']), dest) + if self.nested_groups: + self.push_group(self.inventory, 'elasticache_replication_groups', self.to_safe(cluster['ReplicationGroupId'])) + + # Global Tag: all ElastiCache clusters + self.push(self.inventory, 'elasticache_clusters', cluster['CacheClusterId']) + + host_info = self.get_host_info_dict_from_describe_dict(cluster) + + self.inventory["_meta"]["hostvars"][dest] = host_info + + # Add the nodes + for node in cluster['CacheNodes']: + self.add_elasticache_node(node, cluster, region) + + def add_elasticache_node(self, node, cluster, region): + ''' Adds an ElastiCache node to the inventory and index, as long as + it is addressable ''' + + # Only want available nodes unless all_elasticache_nodes is True + if not self.all_elasticache_nodes and node['CacheNodeStatus'] != 'available': + return + + # Select the best destination address + dest = node['Endpoint']['Address'] + + if not dest: + # Skip nodes we cannot address (e.g. private VPC subnet) + return + + node_id = self.to_safe(cluster['CacheClusterId'] + '_' + node['CacheNodeId']) + + # Add to index + self.index[dest] = [region, node_id] + + # Inventory: Group by node ID (always a group of 1) + if self.group_by_instance_id: + self.inventory[node_id] = [dest] + if self.nested_groups: + self.push_group(self.inventory, 'instances', node_id) + + # Inventory: Group by region + if self.group_by_region: + self.push(self.inventory, region, dest) + if self.nested_groups: + self.push_group(self.inventory, 'regions', region) + + # Inventory: Group by availability zone + if self.group_by_availability_zone: + self.push(self.inventory, cluster['PreferredAvailabilityZone'], dest) + if self.nested_groups: + if self.group_by_region: + self.push_group(self.inventory, region, cluster['PreferredAvailabilityZone']) + self.push_group(self.inventory, 'zones', cluster['PreferredAvailabilityZone']) + + # Inventory: Group by node type + if self.group_by_instance_type: + type_name = self.to_safe('type_' + cluster['CacheNodeType']) + self.push(self.inventory, type_name, dest) + if self.nested_groups: + self.push_group(self.inventory, 'types', type_name) + + # Inventory: Group by VPC (information not available in the current + # AWS API version for ElastiCache) + + # Inventory: Group by security group + if self.group_by_security_group: + + # Check for the existence of the 'SecurityGroups' key and also if + # this key has some value. When the cluster is not placed in a SG + # the query can return None here and cause an error. + if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None: + for security_group in cluster['SecurityGroups']: + key = self.to_safe("security_group_" + security_group['SecurityGroupId']) + self.push(self.inventory, key, dest) + if self.nested_groups: + self.push_group(self.inventory, 'security_groups', key) + + # Inventory: Group by engine + if self.group_by_elasticache_engine: + self.push(self.inventory, self.to_safe("elasticache_" + cluster['Engine']), dest) + if self.nested_groups: + self.push_group(self.inventory, 'elasticache_engines', self.to_safe("elasticache_" + cluster['Engine'])) + + # Inventory: Group by parameter group (done at cluster level) + + # Inventory: Group by replication group (done at cluster level) + + # Inventory: Group by ElastiCache Cluster + if self.group_by_elasticache_cluster: + self.push(self.inventory, self.to_safe("elasticache_cluster_" + cluster['CacheClusterId']), dest) + + # Global Tag: all ElastiCache nodes + self.push(self.inventory, 'elasticache_nodes', dest) + + host_info = self.get_host_info_dict_from_describe_dict(node) + + if dest in self.inventory["_meta"]["hostvars"]: + self.inventory["_meta"]["hostvars"][dest].update(host_info) + else: + self.inventory["_meta"]["hostvars"][dest] = host_info + + def add_elasticache_replication_group(self, replication_group, region): + ''' Adds an ElastiCache replication group to the inventory and index ''' + + # Only want available clusters unless all_elasticache_replication_groups is True + if not self.all_elasticache_replication_groups and replication_group['Status'] != 'available': + return + + # Skip clusters we cannot address (e.g. private VPC subnet or clustered redis) + if replication_group['NodeGroups'][0]['PrimaryEndpoint'] is None or \ + replication_group['NodeGroups'][0]['PrimaryEndpoint']['Address'] is None: + return + + # Select the best destination address (PrimaryEndpoint) + dest = replication_group['NodeGroups'][0]['PrimaryEndpoint']['Address'] + + # Add to index + self.index[dest] = [region, replication_group['ReplicationGroupId']] + + # Inventory: Group by ID (always a group of 1) + if self.group_by_instance_id: + self.inventory[replication_group['ReplicationGroupId']] = [dest] + if self.nested_groups: + self.push_group(self.inventory, 'instances', replication_group['ReplicationGroupId']) + + # Inventory: Group by region + if self.group_by_region: + self.push(self.inventory, region, dest) + if self.nested_groups: + self.push_group(self.inventory, 'regions', region) + + # Inventory: Group by availability zone (doesn't apply to replication groups) + + # Inventory: Group by node type (doesn't apply to replication groups) + + # Inventory: Group by VPC (information not available in the current + # AWS API version for replication groups + + # Inventory: Group by security group (doesn't apply to replication groups) + # Check this value in cluster level + + # Inventory: Group by engine (replication groups are always Redis) + if self.group_by_elasticache_engine: + self.push(self.inventory, 'elasticache_redis', dest) + if self.nested_groups: + self.push_group(self.inventory, 'elasticache_engines', 'redis') + + # Global Tag: all ElastiCache clusters + self.push(self.inventory, 'elasticache_replication_groups', replication_group['ReplicationGroupId']) + + host_info = self.get_host_info_dict_from_describe_dict(replication_group) + + self.inventory["_meta"]["hostvars"][dest] = host_info + + def get_route53_records(self): + ''' Get and store the map of resource records to domain names that + point to them. ''' + + if self.boto_profile: + r53_conn = route53.Route53Connection(profile_name=self.boto_profile) + else: + r53_conn = route53.Route53Connection() + all_zones = r53_conn.get_zones() + + route53_zones = [zone for zone in all_zones if zone.name[:-1] not in self.route53_excluded_zones] + + self.route53_records = {} + + for zone in route53_zones: + rrsets = r53_conn.get_all_rrsets(zone.id) + + for record_set in rrsets: + record_name = record_set.name + + if record_name.endswith('.'): + record_name = record_name[:-1] + + for resource in record_set.resource_records: + self.route53_records.setdefault(resource, set()) + self.route53_records[resource].add(record_name) + + def get_instance_route53_names(self, instance): + ''' Check if an instance is referenced in the records we have from + Route53. If it is, return the list of domain names pointing to said + instance. If nothing points to it, return an empty list. ''' + + instance_attributes = ['public_dns_name', 'private_dns_name', + 'ip_address', 'private_ip_address'] + + name_list = set() + + for attrib in instance_attributes: + try: + value = getattr(instance, attrib) + except AttributeError: + continue + + if value in self.route53_records: + name_list.update(self.route53_records[value]) + + return list(name_list) + + def get_host_info_dict_from_instance(self, instance): + instance_vars = {} + for key in vars(instance): + value = getattr(instance, key) + key = self.to_safe('ec2_' + key) + + # Handle complex types + # state/previous_state changed to properties in boto in https://github.com/boto/boto/commit/a23c379837f698212252720d2af8dec0325c9518 + if key == 'ec2__state': + instance_vars['ec2_state'] = instance.state or '' + instance_vars['ec2_state_code'] = instance.state_code + elif key == 'ec2__previous_state': + instance_vars['ec2_previous_state'] = instance.previous_state or '' + instance_vars['ec2_previous_state_code'] = instance.previous_state_code + elif isinstance(value, (int, bool)): + instance_vars[key] = value + elif isinstance(value, six.string_types): + instance_vars[key] = value.strip() + elif value is None: + instance_vars[key] = '' + elif key == 'ec2_region': + instance_vars[key] = value.name + elif key == 'ec2__placement': + instance_vars['ec2_placement'] = value.zone + elif key == 'ec2_tags': + for k, v in value.items(): + if self.expand_csv_tags and ',' in v: + v = list(map(lambda x: x.strip(), v.split(','))) + key = self.to_safe('ec2_tag_' + k) + instance_vars[key] = v + elif key == 'ec2_groups': + group_ids = [] + group_names = [] + for group in value: + group_ids.append(group.id) + group_names.append(group.name) + instance_vars["ec2_security_group_ids"] = ','.join([str(i) for i in group_ids]) + instance_vars["ec2_security_group_names"] = ','.join([str(i) for i in group_names]) + elif key == 'ec2_block_device_mapping': + instance_vars["ec2_block_devices"] = {} + for k, v in value.items(): + instance_vars["ec2_block_devices"][os.path.basename(k)] = v.volume_id + else: + pass + # TODO Product codes if someone finds them useful + # print key + # print type(value) + # print value + + instance_vars[self.to_safe('ec2_account_id')] = self.aws_account_id + + return instance_vars + + def get_host_info_dict_from_describe_dict(self, describe_dict): + ''' Parses the dictionary returned by the API call into a flat list + of parameters. This method should be used only when 'describe' is + used directly because Boto doesn't provide specific classes. ''' + + # I really don't agree with prefixing everything with 'ec2' + # because EC2, RDS and ElastiCache are different services. + # I'm just following the pattern used until now to not break any + # compatibility. + + host_info = {} + for key in describe_dict: + value = describe_dict[key] + key = self.to_safe('ec2_' + self.uncammelize(key)) + + # Handle complex types + + # Target: Memcached Cache Clusters + if key == 'ec2_configuration_endpoint' and value: + host_info['ec2_configuration_endpoint_address'] = value['Address'] + host_info['ec2_configuration_endpoint_port'] = value['Port'] + + # Target: Cache Nodes and Redis Cache Clusters (single node) + if key == 'ec2_endpoint' and value: + host_info['ec2_endpoint_address'] = value['Address'] + host_info['ec2_endpoint_port'] = value['Port'] + + # Target: Redis Replication Groups + if key == 'ec2_node_groups' and value: + host_info['ec2_endpoint_address'] = value[0]['PrimaryEndpoint']['Address'] + host_info['ec2_endpoint_port'] = value[0]['PrimaryEndpoint']['Port'] + replica_count = 0 + for node in value[0]['NodeGroupMembers']: + if node['CurrentRole'] == 'primary': + host_info['ec2_primary_cluster_address'] = node['ReadEndpoint']['Address'] + host_info['ec2_primary_cluster_port'] = node['ReadEndpoint']['Port'] + host_info['ec2_primary_cluster_id'] = node['CacheClusterId'] + elif node['CurrentRole'] == 'replica': + host_info['ec2_replica_cluster_address_' + str(replica_count)] = node['ReadEndpoint']['Address'] + host_info['ec2_replica_cluster_port_' + str(replica_count)] = node['ReadEndpoint']['Port'] + host_info['ec2_replica_cluster_id_' + str(replica_count)] = node['CacheClusterId'] + replica_count += 1 + + # Target: Redis Replication Groups + if key == 'ec2_member_clusters' and value: + host_info['ec2_member_clusters'] = ','.join([str(i) for i in value]) + + # Target: All Cache Clusters + elif key == 'ec2_cache_parameter_group': + host_info["ec2_cache_node_ids_to_reboot"] = ','.join([str(i) for i in value['CacheNodeIdsToReboot']]) + host_info['ec2_cache_parameter_group_name'] = value['CacheParameterGroupName'] + host_info['ec2_cache_parameter_apply_status'] = value['ParameterApplyStatus'] + + # Target: Almost everything + elif key == 'ec2_security_groups': + + # Skip if SecurityGroups is None + # (it is possible to have the key defined but no value in it). + if value is not None: + sg_ids = [] + for sg in value: + sg_ids.append(sg['SecurityGroupId']) + host_info["ec2_security_group_ids"] = ','.join([str(i) for i in sg_ids]) + + # Target: Everything + # Preserve booleans and integers + elif isinstance(value, (int, bool)): + host_info[key] = value + + # Target: Everything + # Sanitize string values + elif isinstance(value, six.string_types): + host_info[key] = value.strip() + + # Target: Everything + # Replace None by an empty string + elif value is None: + host_info[key] = '' + + else: + # Remove non-processed complex types + pass + + return host_info + + def get_host_info(self): + ''' Get variables about a specific host ''' + + if len(self.index) == 0: + # Need to load index from cache + self.load_index_from_cache() + + if self.args.host not in self.index: + # try updating the cache + self.do_api_calls_update_cache() + if self.args.host not in self.index: + # host might not exist anymore + return self.json_format_dict({}, True) + + (region, instance_id) = self.index[self.args.host] + + instance = self.get_instance(region, instance_id) + return self.json_format_dict(self.get_host_info_dict_from_instance(instance), True) + + def push(self, my_dict, key, element): + ''' Push an element onto an array that may not have been defined in + the dict ''' + group_info = my_dict.setdefault(key, []) + if isinstance(group_info, dict): + host_list = group_info.setdefault('hosts', []) + host_list.append(element) + else: + group_info.append(element) + + def push_group(self, my_dict, key, element): + ''' Push a group as a child of another group. ''' + parent_group = my_dict.setdefault(key, {}) + if not isinstance(parent_group, dict): + parent_group = my_dict[key] = {'hosts': parent_group} + child_groups = parent_group.setdefault('children', []) + if element not in child_groups: + child_groups.append(element) + + def get_inventory_from_cache(self): + ''' Reads the inventory from the cache file and returns it as a JSON + object ''' + + with open(self.cache_path_cache, 'r') as f: + json_inventory = f.read() + return json_inventory + + def load_index_from_cache(self): + ''' Reads the index from the cache file sets self.index ''' + + with open(self.cache_path_index, 'rb') as f: + self.index = json.load(f) + + def write_to_cache(self, data, filename): + ''' Writes data in JSON format to a file ''' + + json_data = self.json_format_dict(data, True) + with open(filename, 'w') as f: + f.write(json_data) + + def uncammelize(self, key): + temp = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', key) + return re.sub('([a-z0-9])([A-Z])', r'\1_\2', temp).lower() + + def to_safe(self, word): + ''' Converts 'bad' characters in a string to underscores so they can be used as Ansible groups ''' + regex = "[^A-Za-z0-9\_" + if not self.replace_dash_in_groups: + regex += "\-" + return re.sub(regex + "]", "_", word) + + def json_format_dict(self, data, pretty=False): + ''' Converts a dict to a JSON object and dumps it as a formatted + string ''' + + if pretty: + return json.dumps(data, sort_keys=True, indent=2) + else: + return json.dumps(data) + + +if __name__ == '__main__': + # Run the script + Ec2Inventory() diff --git a/networks/remote/ansible/logzio.yml b/networks/remote/ansible/logzio.yml index da3c43890..7ad28193a 100644 --- a/networks/remote/ansible/logzio.yml +++ b/networks/remote/ansible/logzio.yml @@ -3,7 +3,6 @@ #Note: You need to add LOGZIO_TOKEN variable with your API key. Like this: ansible-playbook -e LOGZIO_TOKEN=ABCXYZ123456 - hosts: all - user: root any_errors_fatal: true gather_facts: no vars: diff --git a/networks/remote/ansible/remove-datadog-agent.yml b/networks/remote/ansible/remove-datadog-agent.yml new file mode 100644 index 000000000..32679c3b2 --- /dev/null +++ b/networks/remote/ansible/remove-datadog-agent.yml @@ -0,0 +1,8 @@ +--- + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - remove-datadog-agent + diff --git a/networks/remote/ansible/roles/add-lcd/defaults/main.yml b/networks/remote/ansible/roles/add-lcd/defaults/main.yml new file mode 100644 index 000000000..952d016f7 --- /dev/null +++ b/networks/remote/ansible/roles/add-lcd/defaults/main.yml @@ -0,0 +1,4 @@ +--- + +GAIAD_ADDRESS: tcp://0.0.0.0:1317 + diff --git a/networks/remote/ansible/roles/add-lcd/handlers/main.yml b/networks/remote/ansible/roles/add-lcd/handlers/main.yml new file mode 100644 index 000000000..2ce6b83e5 --- /dev/null +++ b/networks/remote/ansible/roles/add-lcd/handlers/main.yml @@ -0,0 +1,9 @@ +--- + +- name: systemctl + systemd: name=gaiacli enabled=yes daemon_reload=yes + +- name: restart gaiacli + service: name=gaiacli state=restarted + + diff --git a/networks/remote/ansible/roles/add-lcd/tasks/main.yml b/networks/remote/ansible/roles/add-lcd/tasks/main.yml new file mode 100644 index 000000000..11fa44c9f --- /dev/null +++ b/networks/remote/ansible/roles/add-lcd/tasks/main.yml @@ -0,0 +1,15 @@ +--- + +- name: Copy binary + copy: + src: "{{GAIACLI_BINARY}}" + dest: /usr/bin + mode: 0755 + notify: restart gaiacli + +- name: Copy service + template: + src: gaiacli.service.j2 + dest: /etc/systemd/system/gaiacli.service + notify: systemctl + diff --git a/networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2 b/networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2 new file mode 100644 index 000000000..4f189f8f5 --- /dev/null +++ b/networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2 @@ -0,0 +1,17 @@ +[Unit] +Description=gaiacli +Requires=network-online.target +After=network-online.target + +[Service] +Restart=on-failure +User=gaiad +Group=gaiad +PermissionsStartOnly=true +ExecStart=/usr/bin/gaiacli advanced rest-server --laddr {{GAIAD_ADDRESS}} +ExecReload=/bin/kill -HUP $MAINPID +KillSignal=SIGTERM + +[Install] +WantedBy=multi-user.target + diff --git a/networks/remote/ansible/roles/extract-config/defaults/main.yml b/networks/remote/ansible/roles/extract-config/defaults/main.yml new file mode 100644 index 000000000..a535d201d --- /dev/null +++ b/networks/remote/ansible/roles/extract-config/defaults/main.yml @@ -0,0 +1,4 @@ +--- + +TESTNET_NAME: remotenet + diff --git a/networks/remote/ansible/roles/extract-config/tasks/main.yml b/networks/remote/ansible/roles/extract-config/tasks/main.yml new file mode 100644 index 000000000..02f2acf20 --- /dev/null +++ b/networks/remote/ansible/roles/extract-config/tasks/main.yml @@ -0,0 +1,14 @@ +--- + +- name: Fetch genesis.json + fetch: "src=/home/gaiad/.gaiad/config/genesis.json dest={{GENESISFILE}} flat=yes" + run_once: yes + become: yes + become_user: gaiad + +- name: Fetch config.toml + fetch: "src=/home/gaiad/.gaiad/config/config.toml dest={{CONFIGFILE}} flat=yes" + run_once: yes + become: yes + become_user: gaiad + diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/network.d/conf.yaml b/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/network.d/conf.yaml new file mode 100644 index 000000000..b174490fc --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/network.d/conf.yaml @@ -0,0 +1,9 @@ +init_config: + +instances: + - collect_connection_state: true + excluded_interfaces: + - lo + - lo0 + collect_rate_metrics: true + collect_count_metrics: true diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/process.d/conf.yaml b/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/process.d/conf.yaml new file mode 100644 index 000000000..465cadad7 --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/process.d/conf.yaml @@ -0,0 +1,15 @@ +init_config: + +instances: +- name: ssh + search_string: ['ssh', 'sshd'] + thresholds: + critical: [1, 5] +- name: gaiad + search_string: ['gaiad'] + thresholds: + critical: [1, 1] +- name: gaiacli + search_string: ['gaiacli'] + thresholds: + critical: [1, 1] diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/prometheus.d/conf.yaml b/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/prometheus.d/conf.yaml new file mode 100644 index 000000000..b08908400 --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/files/conf.d/prometheus.d/conf.yaml @@ -0,0 +1,7 @@ +init_config: + +instances: + - prometheus_url: http://127.0.0.1:26660 + namespace: "gaiad" + metrics: + - p2p: * diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/intake.logs.datadoghq.com.crt b/networks/remote/ansible/roles/install-datadog-agent/files/intake.logs.datadoghq.com.crt new file mode 100644 index 000000000..ef6d9b2c2 --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/files/intake.logs.datadoghq.com.crt @@ -0,0 +1,78 @@ +-----BEGIN CERTIFICATE----- +MIIESTCCAzGgAwIBAgITBn+UV4WH6Kx33rJTMlu8mYtWDTANBgkqhkiG9w0BAQsF +ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6 +b24gUm9vdCBDQSAxMB4XDTE1MTAyMjAwMDAwMFoXDTI1MTAxOTAwMDAwMFowRjEL +MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEVMBMGA1UECxMMU2VydmVyIENB +IDFCMQ8wDQYDVQQDEwZBbWF6b24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDCThZn3c68asg3Wuw6MLAd5tES6BIoSMzoKcG5blPVo+sDORrMd4f2AbnZ +cMzPa43j4wNxhplty6aUKk4T1qe9BOwKFjwK6zmxxLVYo7bHViXsPlJ6qOMpFge5 +blDP+18x+B26A0piiQOuPkfyDyeR4xQghfj66Yo19V+emU3nazfvpFA+ROz6WoVm +B5x+F2pV8xeKNR7u6azDdU5YVX1TawprmxRC1+WsAYmz6qP+z8ArDITC2FMVy2fw +0IjKOtEXc/VfmtTFch5+AfGYMGMqqvJ6LcXiAhqG5TI+Dr0RtM88k+8XUBCeQ8IG +KuANaL7TiItKZYxK1MMuTJtV9IblAgMBAAGjggE7MIIBNzASBgNVHRMBAf8ECDAG +AQH/AgEAMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUWaRmBlKge5WSPKOUByeW +dFv5PdAwHwYDVR0jBBgwFoAUhBjMhTTsvAyUlC4IWZzHshBOCggwewYIKwYBBQUH +AQEEbzBtMC8GCCsGAQUFBzABhiNodHRwOi8vb2NzcC5yb290Y2ExLmFtYXpvbnRy +dXN0LmNvbTA6BggrBgEFBQcwAoYuaHR0cDovL2NydC5yb290Y2ExLmFtYXpvbnRy +dXN0LmNvbS9yb290Y2ExLmNlcjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3Js +LnJvb3RjYTEuYW1hem9udHJ1c3QuY29tL3Jvb3RjYTEuY3JsMBMGA1UdIAQMMAow +CAYGZ4EMAQIBMA0GCSqGSIb3DQEBCwUAA4IBAQCFkr41u3nPo4FCHOTjY3NTOVI1 +59Gt/a6ZiqyJEi+752+a1U5y6iAwYfmXss2lJwJFqMp2PphKg5625kXg8kP2CN5t +6G7bMQcT8C8xDZNtYTd7WPD8UZiRKAJPBXa30/AbwuZe0GaFEQ8ugcYQgSn+IGBI +8/LwhBNTZTUVEWuCUUBVV18YtbAiPq3yXqMB48Oz+ctBWuZSkbvkNodPLamkB2g1 +upRyzQ7qDn1X8nn8N8V7YJ6y68AtkHcNSRAnpTitxBKjtKPISLMVCx7i4hncxHZS +yLyKQXhw2W2Xs0qLeC1etA+jTGDK4UfLeC0SF7FSi8o5LL21L8IzApar2pR/ +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEkjCCA3qgAwIBAgITBn+USionzfP6wq4rAfkI7rnExjANBgkqhkiG9w0BAQsF +ADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNj +b3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4x +OzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1 +dGhvcml0eSAtIEcyMB4XDTE1MDUyNTEyMDAwMFoXDTM3MTIzMTAxMDAwMFowOTEL +MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv +b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj +ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM +9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw +IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6 +VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L +93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm +jgSubJrIqg0CAwEAAaOCATEwggEtMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ +BAQDAgGGMB0GA1UdDgQWBBSEGMyFNOy8DJSULghZnMeyEE4KCDAfBgNVHSMEGDAW +gBScXwDfqgHXMCs4iKK4bUqc8hGRgzB4BggrBgEFBQcBAQRsMGowLgYIKwYBBQUH +MAGGImh0dHA6Ly9vY3NwLnJvb3RnMi5hbWF6b250cnVzdC5jb20wOAYIKwYBBQUH +MAKGLGh0dHA6Ly9jcnQucm9vdGcyLmFtYXpvbnRydXN0LmNvbS9yb290ZzIuY2Vy +MD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwucm9vdGcyLmFtYXpvbnRydXN0 +LmNvbS9yb290ZzIuY3JsMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsF +AAOCAQEAYjdCXLwQtT6LLOkMm2xF4gcAevnFWAu5CIw+7bMlPLVvUOTNNWqnkzSW +MiGpSESrnO09tKpzbeR/FoCJbM8oAxiDR3mjEH4wW6w7sGDgd9QIpuEdfF7Au/ma +eyKdpwAJfqxGF4PcnCZXmTA5YpaP7dreqsXMGz7KQ2hsVxa81Q4gLv7/wmpdLqBK +bRRYh5TmOTFffHPLkIhqhBGWJ6bt2YFGpn6jcgAKUj6DiAdjd4lpFw85hdKrCEVN +0FE6/V1dN2RMfjCyVSRCnTawXZwXgWHxyvkQAiSr6w10kY17RSlQOYiypok1JR4U +akcjMS9cmvqtmg5iUaQqqcT5NJ0hGA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEdTCCA12gAwIBAgIJAKcOSkw0grd/MA0GCSqGSIb3DQEBCwUAMGgxCzAJBgNV +BAYTAlVTMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTIw +MAYDVQQLEylTdGFyZmllbGQgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTAeFw0wOTA5MDIwMDAwMDBaFw0zNDA2MjgxNzM5MTZaMIGYMQswCQYDVQQGEwJV +UzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UE +ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE7MDkGA1UEAxMyU3RhcmZp +ZWxkIFNlcnZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVDDrEKvlO4vW+GZdfjohTsR8/ +y8+fIBNtKTrID30892t2OGPZNmCom15cAICyL1l/9of5JUOG52kbUpqQ4XHj2C0N +Tm/2yEnZtvMaVq4rtnQU68/7JuMauh2WLmo7WJSJR1b/JaCTcFOD2oR0FMNnngRo +Ot+OQFodSk7PQ5E751bWAHDLUu57fa4657wx+UX2wmDPE1kCK4DMNEffud6QZW0C +zyyRpqbn3oUYSXxmTqM6bam17jQuug0DuDPfR+uxa40l2ZvOgdFFRjKWcIfeAg5J +Q4W2bHO7ZOphQazJ1FTfhy/HIrImzJ9ZVGif/L4qL8RVHHVAYBeFAlU5i38FAgMB +AAGjgfAwge0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0O +BBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMB8GA1UdIwQYMBaAFL9ft9HO3R+G9FtV +rNzXEMIOqYjnME8GCCsGAQUFBwEBBEMwQTAcBggrBgEFBQcwAYYQaHR0cDovL28u +c3MyLnVzLzAhBggrBgEFBQcwAoYVaHR0cDovL3guc3MyLnVzL3guY2VyMCYGA1Ud +HwQfMB0wG6AZoBeGFWh0dHA6Ly9zLnNzMi51cy9yLmNybDARBgNVHSAECjAIMAYG +BFUdIAAwDQYJKoZIhvcNAQELBQADggEBACMd44pXyn3pF3lM8R5V/cxTbj5HD9/G +VfKyBDbtgB9TxF00KGu+x1X8Z+rLP3+QsjPNG1gQggL4+C/1E2DUBc7xgQjB3ad1 +l08YuW3e95ORCLp+QCztweq7dp4zBncdDQh/U90bZKuCJ/Fp1U1ervShw3WnWEQt +8jxwmKy6abaVd38PMV4s/KCHOkdp8Hlf9BRUpJVeEXgSYCfOn8J3/yNTd126/+pZ +59vPr5KW7ySaNRB6nJHGDn2Z9j8Z3/VyVOEVqQdZe4O/Ui5GjLIAZHYcSNPYeehu +VsyuLAOQ1xk4meTKCRlb/weWsKh/NEnfVqn3sF/tM+2MR7cwA130A4w= +-----END CERTIFICATE----- diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/logrotate.conf b/networks/remote/ansible/roles/install-datadog-agent/files/logrotate.conf new file mode 100644 index 000000000..e90a5ffb2 --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/files/logrotate.conf @@ -0,0 +1,35 @@ +# see "man logrotate" for details +# rotate log files weekly +daily + +# keep 4 days worth of backlogs +rotate 4 + +# create new (empty) log files after rotating old ones +create + +# use date as a suffix of the rotated file +dateext + +# uncomment this if you want your log files compressed +compress + +# RPM packages drop log rotation information into this directory +include /etc/logrotate.d + +# no packages own wtmp and btmp -- we'll rotate them here +/var/log/wtmp { + monthly + create 0664 root utmp + minsize 1M + rotate 1 +} + +/var/log/btmp { + missingok + monthly + create 0600 root utmp + rotate 1 +} + +# system-specific logs may be also be configured here. diff --git a/networks/remote/ansible/roles/install-datadog-agent/files/syslog b/networks/remote/ansible/roles/install-datadog-agent/files/syslog new file mode 100644 index 000000000..8052df477 --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/files/syslog @@ -0,0 +1,13 @@ +/var/log/cron +/var/log/maillog +/var/log/messages +/var/log/secure +/var/log/spooler +{ + missingok + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true + service datadog-agent restart 2> /dev/null || true + endscript +} diff --git a/networks/remote/ansible/roles/install-datadog-agent/handlers/main.yml b/networks/remote/ansible/roles/install-datadog-agent/handlers/main.yml new file mode 100644 index 000000000..04f72b74d --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/handlers/main.yml @@ -0,0 +1,10 @@ +--- + +- name: restart datadog-agent + service: name=datadog-agent state=restarted + +- name: restart rsyslog + service: name=rsyslog state=restarted + +- name: restart journald + service: name=systemd-journald state=restarted diff --git a/networks/remote/ansible/roles/install-datadog-agent/tasks/main.yml b/networks/remote/ansible/roles/install-datadog-agent/tasks/main.yml new file mode 100644 index 000000000..bba86a5ac --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/tasks/main.yml @@ -0,0 +1,58 @@ +--- + +- name: Remove old datadog.yaml, if exist + file: path=/etc/datadog-agent/datadog.yaml state=absent + notify: restart datadog-agent + +- name: Download DataDog agent script + get_url: url=https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh dest=/tmp/datadog-agent-install.sh mode=0755 + +- name: Install DataDog agent + command: "/tmp/datadog-agent-install.sh" + environment: + DD_API_KEY: "{{DD_API_KEY}}" + DD_HOST_TAGS: "testnet:{{TESTNET_NAME}},cluster:{{CLUSTER_NAME}}" + +- name: Set datadog.yaml config + template: src=datadog.yaml.j2 dest=/etc/datadog-agent/datadog.yaml + notify: restart datadog-agent + +- name: Set metrics config + copy: src=conf.d/ dest=/etc/datadog-agent/conf.d/ + notify: restart datadog-agent + +- name: Disable journald rate-limiting + lineinfile: "dest=/etc/systemd/journald.conf regexp={{item.regexp}} line='{{item.line}}'" + with_items: + - { regexp: "^#RateLimitInterval", line: "RateLimitInterval=0s" } + - { regexp: "^#RateLimitBurst", line: "RateLimitBurst=0" } + - { regexp: "^#SystemMaxFileSize", line: "SystemMaxFileSize=500M" } + notify: restart journald + +- name: As long as Datadog does not support journald on RPM-based linux, we enable rsyslog + yum: "name={{item}} state=installed" + with_items: + - rsyslog + - rsyslog-gnutls + +#- name: Get DataDog certificate for rsyslog +# get_url: url=https://docs.datadoghq.com/crt/intake.logs.datadoghq.com.crt dest=/etc/ssl/certs/intake.logs.datadoghq.com.crt + +- name: Get DataDog certificate for rsyslog + copy: src=intake.logs.datadoghq.com.crt dest=/etc/ssl/certs/intake.logs.datadoghq.com.crt + +- name: Add datadog config to rsyslog + template: src=datadog.conf.j2 dest=/etc/rsyslog.d/datadog.conf mode=0600 + notify: restart rsyslog + +- name: Set logrotate to rotate daily so syslog does not use up all space + copy: src=logrotate.conf dest=/etc/logrotate.conf + +- name: Set syslog to restart datadog-agent after logrotate + copy: src=syslog dest=/etc/logrotate.d/syslog + +#semanage port -a -t syslog_tls_port_t -p tcp 10516 +- name: Enable rsyslog to report to port 10516 in SELinux + seport: ports=10516 proto=tcp reload=yes setype=syslog_tls_port_t state=present + notify: restart rsyslog + diff --git a/networks/remote/ansible/roles/install-datadog-agent/templates/datadog.conf.j2 b/networks/remote/ansible/roles/install-datadog-agent/templates/datadog.conf.j2 new file mode 100644 index 000000000..1ab7d1b07 --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/templates/datadog.conf.j2 @@ -0,0 +1,14 @@ +$template DatadogFormat,"{{DD_API_KEY}} <%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% - - - %msg%\n" + +$imjournalRatelimitInterval 0 +$imjournalRatelimitBurst 0 + +$DefaultNetstreamDriver gtls +$DefaultNetstreamDriverCAFile /etc/ssl/certs/intake.logs.datadoghq.com.crt +$ActionSendStreamDriver gtls +$ActionSendStreamDriverMode 1 +$ActionSendStreamDriverAuthMode x509/name +$ActionSendStreamDriverPermittedPeer *.logs.datadoghq.com +*.* @@intake.logs.datadoghq.com:10516;DatadogFormat + + diff --git a/networks/remote/ansible/roles/install-datadog-agent/templates/datadog.yaml.j2 b/networks/remote/ansible/roles/install-datadog-agent/templates/datadog.yaml.j2 new file mode 100644 index 000000000..2f3eb286e --- /dev/null +++ b/networks/remote/ansible/roles/install-datadog-agent/templates/datadog.yaml.j2 @@ -0,0 +1,561 @@ + +# The host of the Datadog intake server to send Agent data to +dd_url: https://app.datadoghq.com + +# The Datadog api key to associate your Agent's data with your organization. +# Can be found here: +# https://app.datadoghq.com/account/settings +api_key: {{DD_API_KEY}} + +# If you need a proxy to connect to the Internet, provide it here (default: +# disabled). You can use the 'no_proxy' list to specify hosts that should +# bypass the proxy. These settings might impact your checks requests, please +# refer to the specific check documentation for more details. Environment +# variables HTTP_PROXY, HTTPS_PROXY and NO_PROXY (coma-separated string) will +# override the values set here. See https://docs.datadoghq.com/agent/proxy/. +# +# proxy: +# http: http(s)://user:password@proxy_for_http:port +# https: http(s)://user:password@proxy_for_https:port +# no_proxy: +# - host1 +# - host2 + +# Setting this option to "yes" will tell the agent to skip validation of SSL/TLS certificates. +# This may be necessary if the agent is running behind a proxy. See this page for details: +# https://github.com/DataDog/dd-agent/wiki/Proxy-Configuration#using-haproxy-as-a-proxy +# skip_ssl_validation: no + +# Setting this option to "yes" will force the agent to only use TLS 1.2 when +# pushing data to the url specified in "dd_url". +# force_tls_12: no + +# Force the hostname to whatever you want. (default: auto-detected) +# hostname: mymachine.mydomain + +# Make the agent use "hostname -f" on unix-based systems as a last resort +# way of determining the hostname instead of Golang "os.Hostname()" +# This will be enabled by default in version 6.4 +# More information at https://dtdg.co/flag-hostname-fqdn +# hostname_fqdn: false + +# Set the host's tags (optional) +tags: ['testnet:{{TESTNET_NAME}}','cluster:{{CLUSTER_NAME}}'] +# - mytag +# - env:prod +# - role:database + +# Histogram and Historate configuration +# +# Configure which aggregated value to compute. Possible values are: min, max, +# median, avg, sum and count. +# +# histogram_aggregates: ["max", "median", "avg", "count"] +# +# Configure which percentiles will be computed. Must be a list of float +# between 0 and 1. +# Warning: percentiles must be specified as yaml strings +# +# histogram_percentiles: ["0.95"] +# +# Copy histogram values to distributions for true global distributions (in beta) +# This will increase the number of custom metrics created +# histogram_copy_to_distribution: false +# +# A prefix to add to distribution metrics created when histogram_copy_to_distributions is true +# histogram_copy_to_distribution_prefix: "" + +# Forwarder timeout in seconds +# forwarder_timeout: 20 + +# The forwarder retries failed requests. Use this setting to change the +# maximum length of the forwarder's retry queue (each request in the queue +# takes no more than 2MB in memory) +# forwarder_retry_queue_max_size: 30 + +# The number of workers used by the forwarder. Please note each worker will +# open an outbound HTTP connection towards Datadog's metrics intake at every +# flush. +# forwarder_num_workers: 1 + +# Collect AWS EC2 custom tags as agent tags +collect_ec2_tags: true + +# The path containing check configuration files +# By default, uses the conf.d folder located in the agent configuration folder. +# confd_path: + +# Additional path where to search for Python checks +# By default, uses the checks.d folder located in the agent configuration folder. +# additional_checksd: + +# The port for the go_expvar server +# expvar_port: 5000 + +# The port on which the IPC api listens +# cmd_port: 5001 + +# The port for the browser GUI to be served +# Setting 'GUI_port: -1' turns off the GUI completely +# Default is '5002' on Windows and macOS ; turned off on Linux +# GUI_port: -1 + +# The Agent runs workers in parallel to execute checks. By default the number +# of workers is set to 1. If set to 0 the agent will automatically determine +# the best number of runners needed based on the number of checks running. This +# would optimize the check collection time but may produce CPU spikes. +# check_runners: 1 + +# Metadata collection should always be enabled, except if you are running several +# agents/dsd instances per host. In that case, only one agent should have it on. +# WARNING: disabling it on every agent will lead to display and billing issues +# enable_metadata_collection: true + +# Enable the gohai collection of systems data +# enable_gohai: true + +# IPC api server timeout in seconds +# server_timeout: 15 + +# Some environments may have the procfs file system mounted in a miscellaneous +# location. The procfs_path configuration parameter provides a mechanism to +# override the standard default location: '/proc' - this setting will trickle +# down to integrations and affect their behavior if they rely on the psutil +# python package. +# procfs_path: /proc + +# BETA: Encrypted Secrets (Linux only) +# +# This feature is in beta and its options or behaviour might break between +# minor or bugfix releases of the Agent. +# +# The agent can call an external command to fetch secrets. The command will be +# executed maximum once per instance containing an encrypted password. +# Secrets are cached by the agent, this will avoid executing again the +# secret_backend_command to fetch an already known secret (useful when combine +# with Autodiscovery). This feature is still in beta. +# +# For more information see: https://github.com/DataDog/datadog-agent/blob/master/docs/agent/secrets.md +# +# Path to the script to execute. The script must belong to the same user used +# to run the agent. Executable right must be given to the agent and no rights +# for 'group' or 'other'. +# secret_backend_command: /path/to/command +# +# A list of arguments to give to the command at each run (optional) +# secret_backend_arguments: +# - argument1 +# - argument2 +# +# The size in bytes of the buffer used to store the command answer (apply to +# both stdout and stderr) +# secret_backend_output_max_size: 1024 +# +# The timeout to execute the command in second +# secret_backend_timeout: 5 + + +# Metadata providers, add or remove from the list to enable or disable collection. +# Intervals are expressed in seconds. You can also set a provider's interval to 0 +# to disable it. +# metadata_providers: +# - name: k8s +# interval: 60 + +# DogStatsd +# +# If you don't want to enable the DogStatsd server, set this option to no +# use_dogstatsd: yes +# +# Make sure your client is sending to the same UDP port +# dogstatsd_port: 8125 +# +# The host to bind to receive external metrics (used only by the dogstatsd +# server for now). For dogstatsd this is ignored if +# 'dogstatsd_non_local_traffic' is set to true +# bind_host: localhost +# +# Dogstatsd can also listen for metrics on a Unix Socket (*nix only). +# Set to a valid filesystem path to enable. +# dogstatsd_socket: /var/run/dogstatsd/dsd.sock +# +# When using Unix Socket, dogstatsd can tag metrics with container metadata. +# If running dogstatsd in a container, host PID mode (e.g. with --pid=host) is required. +# dogstatsd_origin_detection: false +# +# The buffer size use to receive statsd packet, in bytes +# dogstatsd_buffer_size: 1024 +# +# Whether dogstatsd should listen to non local UDP traffic +# dogstatsd_non_local_traffic: no +# +# Publish dogstatsd's internal stats as Go expvars +# dogstatsd_stats_enable: no +# +# How many items in the dogstatsd's stats circular buffer +# dogstatsd_stats_buffer: 10 +# +# The port for the go_expvar server +# dogstatsd_stats_port: 5000 +# +# The number of bytes allocated to dogstatsd's socket receive buffer (POSIX +# system only). By default, this value is set by the system. If you need to +# increase the size of this buffer but keep the OS default value the same, you +# can set dogstatsd's receive buffer size here. The maximum accepted value +# might change depending on the OS. +# dogstatsd_so_rcvbuf: +# +# If you want to forward every packet received by the dogstatsd server +# to another statsd server, uncomment these lines. +# WARNING: Make sure that forwarded packets are regular statsd packets and not "dogstatsd" packets, +# as your other statsd server might not be able to handle them. +# statsd_forward_host: address_of_own_statsd_server +# statsd_forward_port: 8125 +# +# If you want all statsd metrics coming from this host to be namespaced +# you can configure the namspace below. Each metric received will be prefixed +# with the namespace before it's sent to Datadog. +# statsd_metric_namespace: + +# Logs agent +# +# Logs agent is disabled by default +logs_enabled: true +# +# Enable logs collection for all containers, disabled by default +# logs_config: +# container_collect_all: false +# + +# JMX +# +# jmx_pipe_path: +# jmx_pipe_name: dd-auto_discovery +# +# If you only run Autodiscovery tests, jmxfetch might fail to pick up custom_jar_paths +# set in the check templates. If that is the case, you can force custom jars here. +# jmx_custom_jars: +# - /jmx-jars/jboss-cli-client.jar +# +# When running in a memory cgroup, openjdk 8u131 and higher can automatically adjust +# its heap memory usage in accordance to the cgroup/container's memory limit. +# Default is false: we'll set a Xmx of 200MB if none is configured. +# Note: older openjdk versions and other jvms might fail to start if this option is set +# +# jmx_use_cgroup_memory_limit: true +# + +# Autoconfig +# +# Directory containing configuration templates +# autoconf_template_dir: /datadog/check_configs +# +# The providers the Agent should call to collect checks configurations. +# Please note the File Configuration Provider is enabled by default and cannot +# be configured. +# config_providers: + +## The kubelet provider handles templates embedded in pod annotations, see +## https://docs.datadoghq.com/guides/autodiscovery/#template-source-kubernetes-pod-annotations +# - name: kubelet +# polling: true + +## The docker provider handles templates embedded in container labels, see +## https://docs.datadoghq.com/guides/autodiscovery/#template-source-docker-label-annotations +# - name: docker +# polling: true + +# - name: etcd +# polling: true +# template_dir: /datadog/check_configs +# template_url: http://127.0.0.1 +# username: +# password: + +# - name: consul +# polling: true +# template_dir: /datadog/check_configs +# template_url: http://127.0.0.1 +# ca_file: +# ca_path: +# cert_file: +# key_file: +# username: +# password: +# token: + +# - name: zookeeper +# polling: true +# template_dir: /datadog/check_configs +# template_url: 127.0.0.1 +# username: +# password: + +# Logging +# +# log_level: info +# log_file: /var/log/datadog/agent.log + +# Set to 'yes' to output logs in JSON format +# log_format_json: no + +# Set to 'no' to disable logging to stdout +# log_to_console: yes + +# Set to 'yes' to disable logging to the log file +# disable_file_logging: no + +# Set to 'yes' to enable logging to syslog. +# +# log_to_syslog: no +# +# If 'syslog_uri' is left undefined/empty, a local domain socket connection will be attempted +# +# syslog_uri: +# +# Set to 'yes' to output in an RFC 5424-compliant format +# +# syslog_rfc: no +# +# If TLS enabled, you must specify a path to a PEM certificate here +# +# syslog_pem: /path/to/certificate.pem +# +# If TLS enabled, you must specify a path to a private key here +# +# syslog_key: /path/to/key.pem +# +# If TLS enabled, you may enforce TLS verification here (defaults to true) +# +# syslog_tls_verify: yes +# + +# Autodiscovery +# +# Change the root directory to look at to get cgroup statistics. Useful when running inside a +# container with host directories mounted on a different folder. +# Default if environment variable "DOCKER_DD_AGENT" is set to "yes" +# "/host/sys/fs/cgroup" and "/sys/fs/cgroup" if not. +# +# container_cgroup_root: /host/sys/fs/cgroup/ +# +# Change the root directory to look at to get proc statistics. Useful when running inside a +# container with host directories mounted on a different folder. +# Default if environment variable "DOCKER_DD_AGENT" is set to "yes" +# "/host/proc" and "/proc" if not. +# +# container_proc_root: /host/proc +# +# Choose "auto" if you want to let the agent find any relevant listener on your host +# At the moment, the only auto listener supported is docker +# If you have already set docker anywhere in the listeners, the auto listener is ignored +# listeners: +# - name: auto +# - name: docker +# +# Exclude containers from metrics and AD based on their name or image: +# An excluded container will not get any individual container metric reported for it. +# Please note that the `docker.containers.running`, `.stopped`, `.running.total` and +# `.stopped.total` metrics are not affected by these settings and always count all +# containers. This does not affect your per-container billing. +# +# How it works: include first. +# If a container matches an exclude rule, it won't be included unless it first matches an include rule. +# +# Rules are regexp. +# +# Examples: +# exclude all, except containers based on the 'ubuntu' image or the 'debian' image. +# ac_exclude: ["image:.*"] +# ac_include: ["image:ubuntu", "image:debian"] +# +# include all, except containers based on the 'ubuntu' image. +# ac_exclude: ["image:ubuntu"] +# ac_include: [] +# +# exclude all debian images except containers with a name starting with 'frontend'. +# ac_exclude: ["image:debian"] +# ac_include: ["name:frontend.*"] +# +# ac_exclude: [] +# ac_include: [] +# +# +# Exclude default pause containers from orchestrators. +# +# By default the agent will not monitor kubernetes/openshift pause +# container. They will still be counted in the container count (just like +# excluded containers) since ignoring them would give a wrong impression +# about the docker daemon load. +# +# exclude_pause_container: true + +# Exclude default containers from DockerCloud: +# The following configuration will instruct the agent to ignore the containers from Docker Cloud. +# You can remove the ones you want to collect. +# ac_exclude: ["image:dockercloud/network-daemon","image:dockercloud/cleanup","image:dockercloud/logrotate","image:dockercloud/events","image:dockercloud/ntpd"] +# ac_include: [] +# +# You can also use the regex to ignore them all: +# ac_exclude: ["image:dockercloud/*"] +# ac_include: [] +# +# The default timeout value when connecting to the docker daemon +# is 5 seconds. It can be configured with this option. +# docker_query_timeout: 5 +# + +# Docker tag extraction +# +# We can extract container label or environment variables +# as metric tags. If you prefix your tag name with +, it +# will only be added to high cardinality metrics (docker check) +# +# docker_labels_as_tags: +# label_name: tag_name +# high_cardinality_label_name: +tag_name +# docker_env_as_tags: +# ENVVAR_NAME: tag_name +# +# Example: +# docker_labels_as_tags: +# com.docker.compose.service: service_name +# com.docker.compose.project: +project_name +# + +# Kubernetes tag extraction +# +# We can extract pod labels and annotations as metric tags. If you prefix your +# tag name with +, it will only be added to high cardinality metrics +# +# kubernetes_pod_labels_as_tags: +# app: kube_app +# pod-template-hash: +kube_pod-template-hash +# +# kubernetes_pod_annotations_as_tags: +# app: kube_app +# pod-template-hash: +kube_pod-template-hash +# + +# ECS integration +# +# URL where the ECS agent can be found. Standard cases will be autodetected. +# ecs_agent_url: http://localhost:51678 +# + +# Kubernetes kubelet connectivity +# +# The kubelet host and port should be autodetected when running inside a pod. +# If you run into connectivity issues, you can set these options according to +# your cluster setup: +# kubernetes_kubelet_host: autodetected +# kubernetes_http_kubelet_port: 10255 +# kubernetes_https_kubelet_port: 10250 +# +# When using HTTPS, we verify the kubelet's certificate, you can tune this: +# kubelet_tls_verify: true +# kubelet_client_ca: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt +# +# If authentication is needed, the agent will use the pod's serviceaccount's +# credentials. If you want to use a different account, or are running the agent +# on the host, you can set the credentials to use here: +# kubelet_auth_token_path: /path/to/file +# kubelet_client_crt: /path/to/key +# kubelet_client_key: /path/to/key +# + +# Kubernetes apiserver integration +# +# When running in a pod, the agent will automatically use the pod's serviceaccount +# to authenticate with the apiserver. If you wish to install the agent out of a pod +# or customise connection parameters, you can provide the path to a KubeConfig file +# see https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/ +# +# kubernetes_kubeconfig_path: /path/to/file +# +# In order to collect Kubernetes service names, the agent needs certain rights (see RBAC documentation in +# [docker readme](https://github.com/DataDog/datadog-agent/blob/master/Dockerfiles/agent/README.md#kubernetes)). +# You can disable this option or set how often (in seconds) the agent refreshes the internal mapping of services to +# ContainerIDs with the following options: +# kubernetes_collect_metadata_tags: true +# kubernetes_metadata_tag_update_freq: 60 +# kubernetes_apiserver_client_timeout: 10 +# kubernetes_apiserver_poll_freq: 30 +# +# To collect Kubernetes events, leader election must be enabled and collect_kubernetes_events set to true. +# Only the leader will collect events. More details about events [here](https://github.com/DataDog/datadog-agent/blob/master/Dockerfilesagent/README.md#event-collection). +# collect_kubernetes_events: false +# +# +# Leader Election settings, more details about leader election [here](https://github.com/DataDog/datadog-agent/blob/master/Dockerfilesagent/README.md#leader-election) +# To enable the leader election on this node, set the leader_election variable to true. +# leader_election: false +# The leader election lease is an integer in seconds. +# leader_lease_duration: 60 +# +# Node labels that should be collected and their name in host tags. Off by default. +# Some of these labels are redundant with metadata collected by +# cloud provider crawlers (AWS, GCE, Azure) +# +# kubernetes_node_labels_as_tags: +# kubernetes.io/hostname: nodename +# beta.kubernetes.io/os: os + +# Process agent specific settings +# +process_config: +# A string indicating the enabled state of the Process Agent. +# If "false" (the default) it will only collect containers. +# If "true" it will collect containers and processes. +# If "disabled" it will be disabled altogether and won't start. + enabled: "true" +# The full path to the file where process-agent logs will be written. +# log_file: +# The interval, in seconds, at which we will run each check. If you want consistent +# behavior between real-time you may set the Container/ProcessRT intervals to 10. +# Defaults to 10s for normal checks and 2s for others. +# intervals: +# container: +# container_realtime: +# process: +# process_realtime: +# A list of regex patterns that will exclude a process if matched. +# blacklist_patterns: +# How many check results to buffer in memory when POST fails. The default is usually fine. +# queue_size: +# The maximum number of file descriptors to open when collecting net connections. +# Only change if you are running out of file descriptors from the Agent. +# max_proc_fds: +# The maximum number of processes or containers per message. +# Only change if the defaults are causing issues. +# max_per_message: +# Overrides the path to the Agent bin used for getting the hostname. The default is usually fine. +# dd_agent_bin: +# Overrides of the environment we pass to fetch the hostname. The default is usually fine. +# dd_agent_env: + +# Trace Agent Specific Settings +# +# apm_config: +# Whether or not the APM Agent should run +# enabled: true +# The environment tag that Traces should be tagged with +# Will inherit from "env" tag if none is applied here +# env: none +# The port that the Receiver should listen on +# receiver_port: 8126 +# Whether the Trace Agent should listen for non local traffic +# Only enable if Traces are being sent to this Agent from another host/container +# apm_non_local_traffic: false +# Extra global sample rate to apply on all the traces +# This sample rate is combined to the sample rate from the sampler logic, still promoting interesting traces +# From 1 (no extra rate) to 0 (don't sample at all) +# extra_sample_rate: 1.0 +# Maximum number of traces per second to sample. +# The limit is applied over an average over a few minutes ; much bigger spikes are possible. +# Set to 0 to disable the limit. +# max_traces_per_second: 10 +# A blacklist of regular expressions can be provided to disable certain traces based on their resource name +# all entries must be surrounded by double quotes and separated by commas +# Example: ["(GET|POST) /healthcheck", "GET /V1"] +# ignore_resources: [] diff --git a/networks/remote/ansible/roles/logzio/templates/journalbeat.yml.j2 b/networks/remote/ansible/roles/logzio/templates/journalbeat.yml.j2 index a421ec8a5..af2ac4f13 100644 --- a/networks/remote/ansible/roles/logzio/templates/journalbeat.yml.j2 +++ b/networks/remote/ansible/roles/logzio/templates/journalbeat.yml.j2 @@ -50,7 +50,7 @@ journalbeat: #move_metadata_to_field: "" # Specific units to monitor. - units: ["{{service}}.service"] + units: ["{{service}}.service","gaiacli.service"] # Specify Journal paths to open. You can pass an array of paths to Systemd Journal paths. # If you want to open Journal from directory just pass an array consisting of one element diff --git a/networks/remote/ansible/roles/remove-datadog-agent/tasks/main.yml b/networks/remote/ansible/roles/remove-datadog-agent/tasks/main.yml new file mode 100644 index 000000000..73b027a22 --- /dev/null +++ b/networks/remote/ansible/roles/remove-datadog-agent/tasks/main.yml @@ -0,0 +1,12 @@ +--- + +- name: Stop datadog service + failed_when: false + service: name=datadog-agent state=stopped + +- name: Uninstall datadg-agent + yum: name=datadog-agent state=absent + +- name: Remove datadog-agent folder + file: path=/etc/datadog-agent state=absent + diff --git a/networks/remote/ansible/roles/setup-fullnodes/defaults/main.yml b/networks/remote/ansible/roles/setup-fullnodes/defaults/main.yml new file mode 100644 index 000000000..a535d201d --- /dev/null +++ b/networks/remote/ansible/roles/setup-fullnodes/defaults/main.yml @@ -0,0 +1,4 @@ +--- + +TESTNET_NAME: remotenet + diff --git a/networks/remote/ansible/roles/setup-fullnodes/tasks/main.yml b/networks/remote/ansible/roles/setup-fullnodes/tasks/main.yml new file mode 100644 index 000000000..26bcc4ccd --- /dev/null +++ b/networks/remote/ansible/roles/setup-fullnodes/tasks/main.yml @@ -0,0 +1,54 @@ +--- + +- name: Ensure keys folder exists locally + file: path=keys state=directory + connection: local + run_once: true + become: no + +- name: Copy binary + copy: + src: "{{BINARY}}" + dest: /usr/bin + mode: 0755 + +- name: Get node ID + command: "cat /etc/gaiad-nodeid" + changed_when: false + register: nodeid + +- name: gaiad init + command: "/usr/bin/gaiad init --chain-id={{TESTNET_NAME}} --name=fullnode{{nodeid.stdout_lines[0]}}" + become: yes + become_user: gaiad + register: initresult + args: + creates: /home/gaiad/.gaiad/config + +- name: Get wallet word seed from result of initial transaction locally + when: initresult["changed"] + shell: "echo '{{initresult.stdout}}' | python -c 'import json,sys ; print json.loads(\"\".join(sys.stdin.readlines()))[\"app_message\"][\"secret\"]'" + changed_when: false + register: walletkey + connection: local + +- name: Write wallet word seed to local files + when: initresult["changed"] + copy: "content={{walletkey.stdout}} dest=keys/node{{nodeid.stdout_lines[0]}}" + become: no + connection: local + +- name: Copy genesis file + copy: + src: "{{GENESISFILE}}" + dest: /home/gaiad/.gaiad/config/genesis.json + become: yes + become_user: gaiad + +- name: Copy config.toml file + copy: + src: "{{CONFIGFILE}}" + dest: /home/gaiad/.gaiad/config/config.toml + become: yes + become_user: gaiad + diff --git a/networks/remote/ansible/roles/setup-journald/handlers/main.yml b/networks/remote/ansible/roles/setup-journald/handlers/main.yml new file mode 100644 index 000000000..14f3b3376 --- /dev/null +++ b/networks/remote/ansible/roles/setup-journald/handlers/main.yml @@ -0,0 +1,5 @@ +--- + +- name: restart journald + service: name=systemd-journald state=restarted + diff --git a/networks/remote/ansible/roles/setup-journald/tasks/main.yml b/networks/remote/ansible/roles/setup-journald/tasks/main.yml new file mode 100644 index 000000000..a7a105bf3 --- /dev/null +++ b/networks/remote/ansible/roles/setup-journald/tasks/main.yml @@ -0,0 +1,17 @@ +--- + +- name: Disable journald rate-limiting + lineinfile: "dest=/etc/systemd/journald.conf regexp={{item.regexp}} line='{{item.line}}'" + with_items: + - { regexp: "^#RateLimitInterval", line: "RateLimitInterval=0s" } + - { regexp: "^#RateLimitBurst", line: "RateLimitBurst=0" } + notify: restart journald + +- name: Create journal directory for permanent logs + file: path=/var/log/journal state=directory + notify: restart journald + +- name: Set journal folder with systemd-tmpfiles + command: "systemd-tmpfiles --create --prefix /var/log/journal" + notify: restart journald + diff --git a/networks/remote/ansible/roles/setup-validators/tasks/main.yml b/networks/remote/ansible/roles/setup-validators/tasks/main.yml index 8023a67b4..46e9117d5 100644 --- a/networks/remote/ansible/roles/setup-validators/tasks/main.yml +++ b/networks/remote/ansible/roles/setup-validators/tasks/main.yml @@ -1,5 +1,11 @@ --- +- name: Ensure keys folder exists locally + file: path=keys state=directory + connection: local + run_once: true + become: no + - name: Copy binary copy: src: "{{BINARY}}" @@ -12,12 +18,26 @@ register: nodeid - name: Create initial transaction - command: "/usr/bin/gaiad init gen-tx --name=node{{nodeid.stdout_lines[0]}}" + command: "/usr/bin/gaiad init gen-tx --name=node{{nodeid.stdout_lines[0]}} --ip={{inventory_hostname}}" + register: gentxresult become: yes become_user: gaiad args: creates: /home/gaiad/.gaiad/config/gentx +- name: Get wallet word seed from result of initial transaction locally + when: gentxresult["changed"] + shell: "echo '{{gentxresult.stdout}}' | python -c 'import json,sys ; print json.loads(\"\".join(sys.stdin.readlines()))[\"app_message\"][\"secret\"]'" + changed_when: false + register: walletkey + connection: local + +- name: Write wallet word seed to local files + when: gentxresult["changed"] + copy: "content={{walletkey.stdout}} dest=keys/node{{nodeid.stdout_lines[0]}}" + become: no + connection: local + - name: Find gentx file command: "ls /home/gaiad/.gaiad/config/gentx" changed_when: false @@ -28,18 +48,19 @@ connection: local run_once: yes -- name: Get gen-tx +- name: Get gen-tx file fetch: dest: files/ src: "/home/gaiad/.gaiad/config/gentx/{{gentxfile.stdout_lines[0]}}" flat: yes -- name: Copy generated transactions to all nodes - copy: - src: files/ - dest: /home/gaiad/.gaiad/config/gentx/ - become: yes - become_user: gaiad +- name: Compress gathered gen-tx files locally + archive: path=files/ exclude_path=files/gen-tx.tgz dest=files/gen-tx.tgz + run_once: yes + connection: local + +- name: Unpack gen-tx archive + unarchive: src=files/gen-tx.tgz dest=/home/gaiad/.gaiad/config/gentx owner=gaiad - name: Generate genesis.json command: "/usr/bin/gaiad init --gen-txs --name=node{{nodeid.stdout_lines[0]}} --chain-id={{TESTNET_NAME}}" diff --git a/networks/remote/ansible/roles/upgrade-gaiad/handlers/main.yml b/networks/remote/ansible/roles/upgrade-gaiad/handlers/main.yml new file mode 100644 index 000000000..8a63ccbf9 --- /dev/null +++ b/networks/remote/ansible/roles/upgrade-gaiad/handlers/main.yml @@ -0,0 +1,5 @@ +--- + +- name: restart gaiad + service: name=gaiad state=restarted + diff --git a/networks/remote/ansible/roles/upgrade-gaiad/tasks/main.yml b/networks/remote/ansible/roles/upgrade-gaiad/tasks/main.yml new file mode 100644 index 000000000..03bdf40e0 --- /dev/null +++ b/networks/remote/ansible/roles/upgrade-gaiad/tasks/main.yml @@ -0,0 +1,29 @@ +--- + +- name: Copy binary + copy: + src: "{{BINARY}}" + dest: /usr/bin + mode: 0755 + notify: restart gaiad + +- name: Copy new genesis.json file, if available + when: "GENESISFILE is defined and GENESISFILE != ''" + copy: + src: "{{GENESISFILE}}" + dest: /home/gaiad/.gaiad/config/genesis.json + notify: restart gaiad + +- name: Download genesis.json URL, if available + when: "GENESISURL is defined and GENESISURL != ''" + get_url: + url: "{{GENESISURL}}" + dest: /home/gaiad/.gaiad/config/genesis.json + force: yes + notify: restart gaiad + +- name: Reset network + when: UNSAFE_RESET_ALL | default(false) | bool + command: "sudo -u gaiad gaiad unsafe_reset_all" + notify: restart gaiad + diff --git a/networks/remote/ansible/set-corefilesize.yml b/networks/remote/ansible/set-corefilesize.yml new file mode 100644 index 000000000..ae0f85291 --- /dev/null +++ b/networks/remote/ansible/set-corefilesize.yml @@ -0,0 +1,13 @@ +--- + +# Set the core file size to unlimited to allow the system to generate core dumps + +- hosts: all + any_errors_fatal: true + gather_facts: no + + tasks: + + - name: Set core file size to unlimited to be able to get the core dump on SIGABRT + shell: "ulimit -c unlimited" + diff --git a/networks/remote/ansible/setup-fullnodes.yml b/networks/remote/ansible/setup-fullnodes.yml new file mode 100644 index 000000000..7175e4d36 --- /dev/null +++ b/networks/remote/ansible/setup-fullnodes.yml @@ -0,0 +1,11 @@ +--- + +#GENESISFILE required +#CONFIGFILE required + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - setup-fullnodes + diff --git a/networks/remote/ansible/setup-journald.yml b/networks/remote/ansible/setup-journald.yml new file mode 100644 index 000000000..369c483f3 --- /dev/null +++ b/networks/remote/ansible/setup-journald.yml @@ -0,0 +1,10 @@ +--- + +#DD_API_KEY + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - setup-journald + diff --git a/networks/remote/ansible/setup-validators.yml b/networks/remote/ansible/setup-validators.yml index f5010777b..b8cec9386 100644 --- a/networks/remote/ansible/setup-validators.yml +++ b/networks/remote/ansible/setup-validators.yml @@ -1,7 +1,6 @@ --- - hosts: all - user: root any_errors_fatal: true gather_facts: no roles: diff --git a/networks/remote/ansible/start.yml b/networks/remote/ansible/start.yml index e9c84ce9e..bc29679e0 100644 --- a/networks/remote/ansible/start.yml +++ b/networks/remote/ansible/start.yml @@ -1,7 +1,6 @@ --- - hosts: all - user: root any_errors_fatal: true gather_facts: no vars: diff --git a/networks/remote/ansible/stop.yml b/networks/remote/ansible/stop.yml index d41caa43f..312cb9cf6 100644 --- a/networks/remote/ansible/stop.yml +++ b/networks/remote/ansible/stop.yml @@ -1,7 +1,6 @@ --- - hosts: all - user: root any_errors_fatal: true gather_facts: no vars: diff --git a/networks/remote/ansible/upgrade-gaia.yml b/networks/remote/ansible/upgrade-gaia.yml new file mode 100644 index 000000000..cde560348 --- /dev/null +++ b/networks/remote/ansible/upgrade-gaia.yml @@ -0,0 +1,9 @@ +--- + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - upgrade-gaiad + - add-lcd + diff --git a/networks/remote/ansible/upgrade-gaiad.yml b/networks/remote/ansible/upgrade-gaiad.yml new file mode 100644 index 000000000..4e81c7431 --- /dev/null +++ b/networks/remote/ansible/upgrade-gaiad.yml @@ -0,0 +1,11 @@ +--- + +# Required: BINARY +# Optional: GENESISFILE, UNSAFE_RESET_ALL + +- hosts: all + any_errors_fatal: true + gather_facts: no + roles: + - upgrade-gaiad + diff --git a/networks/remote/terraform/.gitignore b/networks/remote/terraform-app/.gitignore similarity index 71% rename from networks/remote/terraform/.gitignore rename to networks/remote/terraform-app/.gitignore index 0cc2d499a..d882c9444 100644 --- a/networks/remote/terraform/.gitignore +++ b/networks/remote/terraform-app/.gitignore @@ -2,3 +2,4 @@ terraform.tfstate terraform.tfstate.backup terraform.tfstate.d +.terraform.tfstate.lock.info diff --git a/networks/remote/terraform/files/gaiad.service b/networks/remote/terraform-app/files/gaiad.service similarity index 100% rename from networks/remote/terraform/files/gaiad.service rename to networks/remote/terraform-app/files/gaiad.service diff --git a/networks/remote/terraform-app/files/terraform.sh b/networks/remote/terraform-app/files/terraform.sh new file mode 100644 index 000000000..754c5757f --- /dev/null +++ b/networks/remote/terraform-app/files/terraform.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Script to initialize a testnet settings on a server + +#Usage: terraform.sh <testnet_name> <testnet_node_number> + +#Add gaiad node number for remote identification +echo "$2" > /etc/gaiad-nodeid + +#Create gaiad user +useradd -m -s /bin/bash gaiad + +#Reload services to enable the gaiad service (note that the gaiad binary is not available yet) +systemctl daemon-reload +systemctl enable gaiad + + diff --git a/networks/remote/terraform-app/infra/attachment.tf b/networks/remote/terraform-app/infra/attachment.tf new file mode 100644 index 000000000..daf9e6faa --- /dev/null +++ b/networks/remote/terraform-app/infra/attachment.tf @@ -0,0 +1,15 @@ +# This is the reason why we can't separate nodes and load balancer creation into different modules. +# https://github.com/hashicorp/terraform/issues/10857 +# In short: the list of instances coming from the nodes module is a generated variable +# and it should be the input for the load-balancer generation. However when attaching the instances +# to the load-balancer, aws_lb_target_group_attachment.count cannot be a generated value. + +#Instance Attachment (autoscaling is the future) +resource "aws_lb_target_group_attachment" "lb_attach" { + count = "${var.SERVERS*length(data.aws_availability_zones.zones.names)}" + target_group_arn = "${aws_lb_target_group.lb_target_group.arn}" + target_id = "${element(aws_instance.node.*.id,count.index)}" + port = 80 +} + + diff --git a/networks/remote/terraform-app/infra/instance.tf b/networks/remote/terraform-app/infra/instance.tf new file mode 100644 index 000000000..c2ccd5d44 --- /dev/null +++ b/networks/remote/terraform-app/infra/instance.tf @@ -0,0 +1,64 @@ +resource "aws_key_pair" "key" { + key_name = "${var.name}" + public_key = "${file(var.ssh_public_file)}" +} + +data "aws_ami" "linux" { + most_recent = true + filter { + name = "name" + values = ["${var.image_name}"] + } +} + +resource "aws_instance" "node" { +# depends_on = ["${element(aws_route_table_association.route_table_association.*,count.index)}"] + count = "${var.SERVERS*length(data.aws_availability_zones.zones.names)}" + ami = "${data.aws_ami.linux.image_id}" + instance_type = "${var.instance_type}" + key_name = "${aws_key_pair.key.key_name}" + associate_public_ip_address = true + vpc_security_group_ids = [ "${aws_security_group.secgroup.id}" ] + subnet_id = "${element(aws_subnet.subnet.*.id,count.index)}" + availability_zone = "${element(data.aws_availability_zones.zones.names,count.index)}" + + tags { + Environment = "${var.name}" + Name = "${var.name}-${element(data.aws_availability_zones.zones.names,count.index)}" + } + + volume_tags { + Environment = "${var.name}" + Name = "${var.name}-${element(data.aws_availability_zones.zones.names,count.index)}-VOLUME" + } + + root_block_device { + volume_size = 20 + } + + connection { + user = "centos" + private_key = "${file(var.ssh_private_file)}" + timeout = "600s" + } + + provisioner "file" { + source = "files/terraform.sh" + destination = "/tmp/terraform.sh" + } + + provisioner "file" { + source = "files/gaiad.service" + destination = "/tmp/gaiad.service" + } + + provisioner "remote-exec" { + inline = [ + "sudo cp /tmp/gaiad.service /etc/systemd/system/gaiad.service", + "chmod +x /tmp/terraform.sh", + "sudo /tmp/terraform.sh ${var.name} ${count.index}", + ] + } + +} + diff --git a/networks/remote/terraform-app/infra/lb.tf b/networks/remote/terraform-app/infra/lb.tf new file mode 100644 index 000000000..b4f6f120c --- /dev/null +++ b/networks/remote/terraform-app/infra/lb.tf @@ -0,0 +1,61 @@ +resource "aws_lb" "lb" { + name = "${var.name}" + subnets = ["${aws_subnet.subnet.*.id}"] +# security_groups = ["${split(",", var.lb_security_groups)}"] + tags { + Name = "${var.name}" + } +# access_logs { +# bucket = "${var.s3_bucket}" +# prefix = "ELB-logs" +# } +} + +resource "aws_lb_listener" "lb_listener" { + load_balancer_arn = "${aws_lb.lb.arn}" + port = "80" + protocol = "HTTP" + + default_action { + target_group_arn = "${aws_lb_target_group.lb_target_group.arn}" + type = "forward" + } +} + +resource "aws_lb_listener_rule" "listener_rule" { +# depends_on = ["aws_lb_target_group.lb_target_group"] + listener_arn = "${aws_lb_listener.lb_listener.arn}" + priority = "100" + action { + type = "forward" + target_group_arn = "${aws_lb_target_group.lb_target_group.id}" + } + condition { + field = "path-pattern" + values = ["/"] + } +} + +resource "aws_lb_target_group" "lb_target_group" { + name = "${var.name}" + port = "80" + protocol = "HTTP" + vpc_id = "${aws_vpc.vpc.id}" + tags { + name = "${var.name}" + } +# stickiness { +# type = "lb_cookie" +# cookie_duration = 1800 +# enabled = "true" +# } +# health_check { +# healthy_threshold = 3 +# unhealthy_threshold = 10 +# timeout = 5 +# interval = 10 +# path = "${var.target_group_path}" +# port = "${var.target_group_port}" +# } +} + diff --git a/networks/remote/terraform-app/infra/outputs.tf b/networks/remote/terraform-app/infra/outputs.tf new file mode 100644 index 000000000..525cb0d31 --- /dev/null +++ b/networks/remote/terraform-app/infra/outputs.tf @@ -0,0 +1,24 @@ +// The cluster name +output "name" { + value = "${var.name}" +} + +// The list of cluster instance IDs +output "instances" { + value = ["${aws_instance.node.*.id}"] +} + +output "instances_count" { + value = "${length(aws_instance.node.*)}" +} + +// The list of cluster instance public IPs +output "public_ips" { + value = ["${aws_instance.node.*.public_ip}"] +} + +// Name of the ALB +output "lb_name" { + value = "${aws_lb.lb.dns_name}" +} + diff --git a/networks/remote/terraform-app/infra/variables.tf b/networks/remote/terraform-app/infra/variables.tf new file mode 100644 index 000000000..8459e78f0 --- /dev/null +++ b/networks/remote/terraform-app/infra/variables.tf @@ -0,0 +1,29 @@ +variable "name" { + description = "The testnet name, e.g cdn" +} + +variable "image_name" { + description = "Image name" + default = "CentOS Linux 7 x86_64 HVM EBS 1704_01" +} + +variable "instance_type" { + description = "The instance size to use" + default = "t2.small" +} + +variable "SERVERS" { + description = "Number of servers in an availability zone" + default = "1" +} + +variable "ssh_private_file" { + description = "SSH private key file to be used to connect to the nodes" + type = "string" +} + +variable "ssh_public_file" { + description = "SSH public key file to be used on the nodes" + type = "string" +} + diff --git a/networks/remote/terraform-app/infra/vpc.tf b/networks/remote/terraform-app/infra/vpc.tf new file mode 100644 index 000000000..b38d845ca --- /dev/null +++ b/networks/remote/terraform-app/infra/vpc.tf @@ -0,0 +1,97 @@ +resource "aws_vpc" "vpc" { + cidr_block = "10.0.0.0/16" + + tags { + Name = "${var.name}" + } + +} + +resource "aws_internet_gateway" "internet_gateway" { + vpc_id = "${aws_vpc.vpc.id}" + + tags { + Name = "${var.name}" + } +} + +resource "aws_route_table" "route_table" { + vpc_id = "${aws_vpc.vpc.id}" + + route { + cidr_block = "0.0.0.0/0" + gateway_id = "${aws_internet_gateway.internet_gateway.id}" + } + + tags { + Name = "${var.name}" + } +} + +data "aws_availability_zones" "zones" { + state = "available" +} + +resource "aws_subnet" "subnet" { + count = "${length(data.aws_availability_zones.zones.names)}" + vpc_id = "${aws_vpc.vpc.id}" + availability_zone = "${element(data.aws_availability_zones.zones.names,count.index)}" + cidr_block = "${cidrsubnet(aws_vpc.vpc.cidr_block, 8, count.index)}" + map_public_ip_on_launch = "true" + + tags { + Name = "${var.name}-${element(data.aws_availability_zones.zones.names,count.index)}" + } +} + +resource "aws_route_table_association" "route_table_association" { + count = "${length(data.aws_availability_zones.zones.names)}" + subnet_id = "${element(aws_subnet.subnet.*.id,count.index)}" + route_table_id = "${aws_route_table.route_table.id}" +} + +resource "aws_security_group" "secgroup" { + name = "${var.name}" + vpc_id = "${aws_vpc.vpc.id}" + description = "Automated security group for application instances" + tags { + Name = "${var.name}" + } + + ingress { + from_port = 22 + to_port = 22 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + ingress { + from_port = 80 + to_port = 80 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + ingress { + from_port = 26656 + to_port = 26657 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + ingress { + from_port = 26660 + to_port = 26660 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + egress { + from_port = 0 + to_port = 0 + protocol = "-1" + cidr_blocks = ["0.0.0.0/0"] + + } +} + diff --git a/networks/remote/terraform-app/main.tf b/networks/remote/terraform-app/main.tf new file mode 100644 index 000000000..de828daf0 --- /dev/null +++ b/networks/remote/terraform-app/main.tf @@ -0,0 +1,61 @@ +#Terraform Configuration + +variable "APP_NAME" { + description = "Name of the application" +} + +variable "SERVERS" { + description = "Number of servers in an availability zone" + default = "1" +} + +#See https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region +#eu-west-3 does not contain CentOS images +variable "REGION" { + description = "AWS Regions" + default = "us-east-2" +} + +variable "SSH_PRIVATE_FILE" { + description = "SSH private key file to be used to connect to the nodes" + type = "string" +} + +variable "SSH_PUBLIC_FILE" { + description = "SSH public key file to be used on the nodes" + type = "string" +} + +# ap-southeast-1 and ap-southeast-2 does not contain the newer CentOS 1704 image +variable "image" { + description = "AWS image name" + default = "CentOS Linux 7 x86_64 HVM EBS 1703_01" +} + +variable "instance_type" { + description = "AWS instance type" + default = "t2.medium" +} + +provider "aws" { + region = "${var.REGION}" +} + +module "nodes" { + source = "infra" + name = "${var.APP_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +output "public_ips" { + value = "${module.nodes.public_ips}", +} + +output "lb_name" { + value = "${module.nodes.lb_name}" +} + diff --git a/networks/remote/terraform-aws/.gitignore b/networks/remote/terraform-aws/.gitignore new file mode 100644 index 000000000..d882c9444 --- /dev/null +++ b/networks/remote/terraform-aws/.gitignore @@ -0,0 +1,5 @@ +.terraform +terraform.tfstate +terraform.tfstate.backup +terraform.tfstate.d +.terraform.tfstate.lock.info diff --git a/networks/remote/terraform-aws/files/gaiad.service b/networks/remote/terraform-aws/files/gaiad.service new file mode 100644 index 000000000..697166567 --- /dev/null +++ b/networks/remote/terraform-aws/files/gaiad.service @@ -0,0 +1,17 @@ +[Unit] +Description=gaiad +Requires=network-online.target +After=network-online.target + +[Service] +Restart=on-failure +User=gaiad +Group=gaiad +PermissionsStartOnly=true +ExecStart=/usr/bin/gaiad start +ExecReload=/bin/kill -HUP $MAINPID +KillSignal=SIGTERM + +[Install] +WantedBy=multi-user.target + diff --git a/networks/remote/terraform-aws/files/terraform.sh b/networks/remote/terraform-aws/files/terraform.sh new file mode 100644 index 000000000..ef8019972 --- /dev/null +++ b/networks/remote/terraform-aws/files/terraform.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Script to initialize a testnet settings on a server + +#Usage: terraform.sh <testnet_name> <testnet_region_number> <testnet_node_number> + +#Add gaiad node number for remote identification +REGION="$(($2 + 1))" +RNODE="$(($3 + 1))" +ID="$((${REGION} * 100 + ${RNODE}))" +echo "$ID" > /etc/gaiad-nodeid + +#Create gaiad user +useradd -m -s /bin/bash gaiad + +#Reload services to enable the gaiad service (note that the gaiad binary is not available yet) +systemctl daemon-reload +systemctl enable gaiad + + diff --git a/networks/remote/terraform-aws/main.tf b/networks/remote/terraform-aws/main.tf new file mode 100644 index 000000000..448695389 --- /dev/null +++ b/networks/remote/terraform-aws/main.tf @@ -0,0 +1,249 @@ +#Terraform Configuration + +#See https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region +#eu-west-3 does not contain CentOS images +#us-east-1 usually contains other infrastructure and creating keys and security groups might conflict with that +variable "REGIONS" { + description = "AWS Regions" + type = "list" + default = ["us-east-2", "us-west-1", "us-west-2", "ap-south-1", "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ca-central-1", "eu-central-1", "eu-west-1", "eu-west-2", "sa-east-1"] +} + +variable "TESTNET_NAME" { + description = "Name of the testnet" + default = "remotenet" +} + +variable "REGION_LIMIT" { + description = "Number of regions to populate" + default = "1" +} + +variable "SERVERS" { + description = "Number of servers in an availability zone" + default = "1" +} + +variable "SSH_PRIVATE_FILE" { + description = "SSH private key file to be used to connect to the nodes" + type = "string" +} + +variable "SSH_PUBLIC_FILE" { + description = "SSH public key file to be used on the nodes" + type = "string" +} + + +# ap-southeast-1 and ap-southeast-2 does not contain the newer CentOS 1704 image +variable "image" { + description = "AWS image name" + default = "CentOS Linux 7 x86_64 HVM EBS 1703_01" +} + +variable "instance_type" { + description = "AWS instance type" + default = "t2.medium" +} + +module "nodes-0" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,0)}" + multiplier = "0" + execute = "${var.REGION_LIMIT > 0}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-1" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,1)}" + multiplier = "1" + execute = "${var.REGION_LIMIT > 1}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-2" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,2)}" + multiplier = "2" + execute = "${var.REGION_LIMIT > 2}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-3" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,3)}" + multiplier = "3" + execute = "${var.REGION_LIMIT > 3}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-4" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,4)}" + multiplier = "4" + execute = "${var.REGION_LIMIT > 4}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-5" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,5)}" + multiplier = "5" + execute = "${var.REGION_LIMIT > 5}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-6" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,6)}" + multiplier = "6" + execute = "${var.REGION_LIMIT > 6}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-7" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,7)}" + multiplier = "7" + execute = "${var.REGION_LIMIT > 7}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-8" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,8)}" + multiplier = "8" + execute = "${var.REGION_LIMIT > 8}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-9" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,9)}" + multiplier = "9" + execute = "${var.REGION_LIMIT > 9}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-10" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,10)}" + multiplier = "10" + execute = "${var.REGION_LIMIT > 10}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-11" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,11)}" + multiplier = "11" + execute = "${var.REGION_LIMIT > 11}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-12" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,12)}" + multiplier = "12" + execute = "${var.REGION_LIMIT > 12}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +module "nodes-13" { + source = "nodes" + name = "${var.TESTNET_NAME}" + image_name = "${var.image}" + instance_type = "${var.instance_type}" + region = "${element(var.REGIONS,13)}" + multiplier = "13" + execute = "${var.REGION_LIMIT > 13}" + ssh_public_file = "${var.SSH_PUBLIC_FILE}" + ssh_private_file = "${var.SSH_PRIVATE_FILE}" + SERVERS = "${var.SERVERS}" +} + +output "public_ips" { + value = "${concat( + module.nodes-0.public_ips, + module.nodes-1.public_ips, + module.nodes-2.public_ips, + module.nodes-3.public_ips, + module.nodes-4.public_ips, + module.nodes-5.public_ips, + module.nodes-6.public_ips, + module.nodes-7.public_ips, + module.nodes-8.public_ips, + module.nodes-9.public_ips, + module.nodes-10.public_ips, + module.nodes-11.public_ips, + module.nodes-12.public_ips, + module.nodes-13.public_ips + )}", +} + diff --git a/networks/remote/terraform-aws/nodes/main.tf b/networks/remote/terraform-aws/nodes/main.tf new file mode 100644 index 000000000..854f7ac2a --- /dev/null +++ b/networks/remote/terraform-aws/nodes/main.tf @@ -0,0 +1,110 @@ + +provider "aws" { + region = "${var.region}" +} + +resource "aws_key_pair" "testnets" { + count = "${var.execute?1:0}" + key_name = "testnets-${var.name}" + public_key = "${file(var.ssh_public_file)}" +} + +data "aws_ami" "linux" { + most_recent = true + filter { + name = "name" + values = ["${var.image_name}"] + } +} + +data "aws_availability_zones" "zones" { + state = "available" +} + +resource "aws_security_group" "secgroup" { + count = "${var.execute?1:0}" + name = "${var.name}" + description = "Automated security group for performance testing testnets" + tags { + Name = "testnets-${var.name}" + } + + ingress { + from_port = 22 + to_port = 22 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + ingress { + from_port = 26656 + to_port = 26657 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + ingress { + from_port = 26660 + to_port = 26660 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] + } + + egress { + from_port = 0 + to_port = 0 + protocol = "-1" + cidr_blocks = ["0.0.0.0/0"] + + } +} + +resource "aws_instance" "node" { + count = "${var.execute?var.SERVERS*length(data.aws_availability_zones.zones.names):0}" + ami = "${data.aws_ami.linux.image_id}" + instance_type = "${var.instance_type}" + key_name = "${aws_key_pair.testnets.key_name}" + associate_public_ip_address = true + security_groups = [ "${aws_security_group.secgroup.name}" ] + availability_zone = "${element(data.aws_availability_zones.zones.names,count.index)}" + + tags { + Environment = "${var.name}" + Name = "${var.name}-${element(data.aws_availability_zones.zones.names,count.index)}" + } + + volume_tags { + Environment = "${var.name}" + Name = "${var.name}-${element(data.aws_availability_zones.zones.names,count.index)}-VOLUME" + } + + root_block_device { + volume_size = 20 + } + + connection { + user = "centos" + private_key = "${file(var.ssh_private_file)}" + timeout = "600s" + } + + provisioner "file" { + source = "files/terraform.sh" + destination = "/tmp/terraform.sh" + } + + provisioner "file" { + source = "files/gaiad.service" + destination = "/tmp/gaiad.service" + } + + provisioner "remote-exec" { + inline = [ + "sudo cp /tmp/gaiad.service /etc/systemd/system/gaiad.service", + "chmod +x /tmp/terraform.sh", + "sudo /tmp/terraform.sh ${var.name} ${var.multiplier} ${count.index}", + ] + } + +} + diff --git a/networks/remote/terraform-aws/nodes/outputs.tf b/networks/remote/terraform-aws/nodes/outputs.tf new file mode 100644 index 000000000..2a4451d69 --- /dev/null +++ b/networks/remote/terraform-aws/nodes/outputs.tf @@ -0,0 +1,15 @@ +// The cluster name +output "name" { + value = "${var.name}" +} + +// The list of cluster instance IDs +output "instances" { + value = ["${aws_instance.node.*.id}"] +} + +// The list of cluster instance public IPs +output "public_ips" { + value = ["${aws_instance.node.*.public_ip}"] +} + diff --git a/networks/remote/terraform-aws/nodes/variables.tf b/networks/remote/terraform-aws/nodes/variables.tf new file mode 100644 index 000000000..ef540e697 --- /dev/null +++ b/networks/remote/terraform-aws/nodes/variables.tf @@ -0,0 +1,42 @@ +variable "name" { + description = "The testnet name, e.g cdn" +} + +variable "image_name" { + description = "Image name" + default = "CentOS Linux 7 x86_64 HVM EBS 1704_01" +} + +variable "instance_type" { + description = "The instance size to use" + default = "t2.small" +} + +variable "region" { + description = "AWS region to use" +} + +variable "multiplier" { + description = "Multiplier for node identification" +} + +variable "execute" { + description = "Set to false to disable the module" + default = true +} + +variable "SERVERS" { + description = "Number of servers in an availability zone" + default = "1" +} + +variable "ssh_private_file" { + description = "SSH private key file to be used to connect to the nodes" + type = "string" +} + +variable "ssh_public_file" { + description = "SSH public key file to be used on the nodes" + type = "string" +} + diff --git a/networks/remote/terraform-do/.gitignore b/networks/remote/terraform-do/.gitignore new file mode 100644 index 000000000..798052367 --- /dev/null +++ b/networks/remote/terraform-do/.gitignore @@ -0,0 +1,6 @@ +.terraform +terraform.tfstate +terraform.tfstate.backup +terraform.tfstate.d +.terraform.tfstate.lock.info + diff --git a/networks/remote/terraform-do/Makefile b/networks/remote/terraform-do/Makefile new file mode 100644 index 000000000..76040e208 --- /dev/null +++ b/networks/remote/terraform-do/Makefile @@ -0,0 +1,100 @@ +######################################## +### WARNING: The DigitalOcean scripts are deprecated. They are still here because +### they might be useful for developers. + +# Name of the testnet. Used in chain-id. +TESTNET_NAME?=remotenet + +# Name of the servers grouped together for management purposes. Used in tagging the servers in the cloud. +CLUSTER_NAME?=$(TESTNET_NAME) + +# Number of servers deployed in Digital Ocean. +# Number of servers to put in one availability zone in AWS. +SERVERS?=1 + +# Path to gaiad for deployment. Must be a Linux binary. +BINARY?=$(CURDIR)/../build/gaiad + +# Path to the genesis.json and config.toml files to deploy on full nodes. +GENESISFILE?=$(CURDIR)/../build/genesis.json +CONFIGFILE?=$(CURDIR)/../build/config.toml + +all: + @echo "There is no all. Only sum of the ones." + + +######################################## +### Extract genesis.json and config.toml from a node in a cluster + +extract-config: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -e TESTNET_NAME="$(TESTNET_NAME)" -e GENESISFILE="$(GENESISFILE)" -e CONFIGFILE="$(CONFIGFILE)" extract-config.yml + + +######################################## +### Remote validator nodes using terraform and ansible in Digital Ocean + +validators-start: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/terraform-do && terraform init && (terraform workspace new "$(CLUSTER_NAME)" || terraform workspace select "$(CLUSTER_NAME)") && terraform apply -auto-approve -var DO_API_TOKEN="$(DO_API_TOKEN)" -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" -var TESTNET_NAME="$(CLUSTER_NAME)" -var SERVERS="$(SERVERS)" + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -u root -e BINARY=$(BINARY) -e TESTNET_NAME="$(TESTNET_NAME)" setup-validators.yml + cd remote/ansible && ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -u root start.yml + +validators-stop: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + cd remote/terraform-do && terraform workspace select "$(CLUSTER_NAME)" && terraform destroy -force -var DO_API_TOKEN="$(DO_API_TOKEN)" -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" && terraform workspace select default && terraform workspace delete "$(CLUSTER_NAME)" + rm -rf remote/ansible/keys/ + +validators-status: + cd remote/ansible && ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" status.yml + + +######################################## +### Remote full nodes using terraform and ansible in Digital Ocean + +fullnodes-start: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/terraform-do && terraform init && (terraform workspace new "$(CLUSTER_NAME)" || terraform workspace select "$(CLUSTER_NAME)") && terraform apply -var DO_API_TOKEN="$(DO_API_TOKEN)" -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" -var TESTNET_NAME="$(CLUSTER_NAME)" -var SERVERS="$(SERVERS)" + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -e BINARY=$(BINARY) -e TESTNET_NAME="$(TESTNET_NAME)" -e GENESISFILE="$(GENESISFILE)" -e CONFIGFILE="$(CONFIGFILE)" setup-fullnodes.yml + cd remote/ansible && ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -u root start.yml + +fullnodes-stop: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + cd remote/terraform-do && terraform workspace select "$(CLUSTER_NAME)" && terraform destroy -force -var DO_API_TOKEN="$(DO_API_TOKEN)" -var SSH_PUBLIC_FILE="$(HOME)/.ssh/id_rsa.pub" -var SSH_PRIVATE_FILE="$(HOME)/.ssh/id_rsa" && terraform workspace select default && terraform workspace delete "$(CLUSTER_NAME)" + +fullnodes-status: + cd remote/ansible && ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" status.yml + + +######################################## +### Other calls + +upgrade-gaiad: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + @if ! [ -f $(HOME)/.ssh/id_rsa.pub ]; then ssh-keygen ; fi + @if [ -z "`file $(BINARY) | grep 'ELF 64-bit'`" ]; then echo "Please build a linux binary using 'make build-linux'." ; false ; fi + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -e BINARY=$(BINARY) upgrade-gaiad.yml + +list: + remote/ansible/inventory/digital_ocean.py | python -c 'import json,sys ; print "\n".join(json.loads("".join(sys.stdin.readlines()))["$(CLUSTER_NAME)"]["hosts"])' + +install-datadog: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + @if [ -z "$(DD_API_KEY)" ]; then echo "DD_API_KEY environment variable not set." ; false ; fi + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -u root -e DD_API_KEY="$(DD_API_KEY)" -e TESTNET_NAME=$(TESTNET_NAME) -e CLUSTER_NAME=$(CLUSTER_NAME) install-datadog-agent.yml + +remove-datadog: + @if [ -z "$(DO_API_TOKEN)" ]; then echo "DO_API_TOKEN environment variable not set." ; false ; fi + cd remote/ansible && ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i inventory/digital_ocean.py -l "$(CLUSTER_NAME)" -u root remove-datadog-agent.yml + + +# To avoid unintended conflicts with file names, always add to .PHONY +# unless there is a reason not to. +# https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html +.PHONY: all extract-config validators-start validators-stop validators-status fullnodes-start fullnodes-stop fullnodes-status upgrade-gaiad list-do install-datadog remove-datadog + diff --git a/networks/remote/terraform-do/README.md b/networks/remote/terraform-do/README.md new file mode 100644 index 000000000..0486a8bc4 --- /dev/null +++ b/networks/remote/terraform-do/README.md @@ -0,0 +1,58 @@ +# Terraform & Ansible + +WARNING: The Digital Ocean scripts are obsolete. They are here because they might still be useful for developers. + +Automated deployments are done using [Terraform](https://www.terraform.io/) to create servers on Digital Ocean then +[Ansible](http://www.ansible.com/) to create and manage testnets on those servers. + +## Prerequisites + +- Install [Terraform](https://www.terraform.io/downloads.html) and [Ansible](http://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) on a Linux machine. +- Create a [DigitalOcean API token](https://cloud.digitalocean.com/settings/api/tokens) with read and write capability. +- Install the python dopy package (`pip install dopy`) (This is necessary for the digitalocean.py script for ansible.) +- Create SSH keys + +``` +export DO_API_TOKEN="abcdef01234567890abcdef01234567890" +export TESTNET_NAME="remotenet" +export SSH_PRIVATE_FILE="$HOME/.ssh/id_rsa" +export SSH_PUBLIC_FILE="$HOME/.ssh/id_rsa.pub" +``` + +These will be used by both `terraform` and `ansible`. + +## Create a remote network + +``` +make remotenet-start +``` + +Optionally, you can set the number of servers you want to launch and the name of the testnet (which defaults to remotenet): + +``` +TESTNET_NAME="mytestnet" SERVERS=7 make remotenet-start +``` + +## Quickly see the /status endpoint + +``` +make remotenet-status +``` + +## Delete servers + +``` +make remotenet-stop +``` + +## Logging + +You can ship logs to Logz.io, an Elastic stack (Elastic search, Logstash and Kibana) service provider. You can set up your nodes to log there automatically. Create an account and get your API key from the notes on [this page](https://app.logz.io/#/dashboard/data-sources/Filebeat), then: + +``` +yum install systemd-devel || echo "This will only work on RHEL-based systems." +apt-get install libsystemd-dev || echo "This will only work on Debian-based systems." + +go get github.com/mheese/journalbeat +ansible-playbook -i inventory/digital_ocean.py -l remotenet logzio.yml -e LOGZIO_TOKEN=ABCDEFGHIJKLMNOPQRSTUVWXYZ012345 +``` diff --git a/networks/remote/terraform/cluster/main.tf b/networks/remote/terraform-do/cluster/main.tf similarity index 98% rename from networks/remote/terraform/cluster/main.tf rename to networks/remote/terraform-do/cluster/main.tf index 110f92a00..9bada5915 100644 --- a/networks/remote/terraform/cluster/main.tf +++ b/networks/remote/terraform-do/cluster/main.tf @@ -22,7 +22,6 @@ resource "digitalocean_droplet" "cluster" { connection { private_key = "${file(var.ssh_private_file)}" - timeout = "30s" } provisioner "file" { diff --git a/networks/remote/terraform/cluster/outputs.tf b/networks/remote/terraform-do/cluster/outputs.tf similarity index 100% rename from networks/remote/terraform/cluster/outputs.tf rename to networks/remote/terraform-do/cluster/outputs.tf diff --git a/networks/remote/terraform/cluster/variables.tf b/networks/remote/terraform-do/cluster/variables.tf similarity index 100% rename from networks/remote/terraform/cluster/variables.tf rename to networks/remote/terraform-do/cluster/variables.tf diff --git a/networks/remote/terraform-do/files/gaiad.service b/networks/remote/terraform-do/files/gaiad.service new file mode 100644 index 000000000..697166567 --- /dev/null +++ b/networks/remote/terraform-do/files/gaiad.service @@ -0,0 +1,17 @@ +[Unit] +Description=gaiad +Requires=network-online.target +After=network-online.target + +[Service] +Restart=on-failure +User=gaiad +Group=gaiad +PermissionsStartOnly=true +ExecStart=/usr/bin/gaiad start +ExecReload=/bin/kill -HUP $MAINPID +KillSignal=SIGTERM + +[Install] +WantedBy=multi-user.target + diff --git a/networks/remote/terraform/files/terraform.sh b/networks/remote/terraform-do/files/terraform.sh similarity index 100% rename from networks/remote/terraform/files/terraform.sh rename to networks/remote/terraform-do/files/terraform.sh diff --git a/networks/remote/terraform/main.tf b/networks/remote/terraform-do/main.tf similarity index 100% rename from networks/remote/terraform/main.tf rename to networks/remote/terraform-do/main.tf diff --git a/networks/remote/terraform/README.rst b/networks/remote/terraform/README.rst deleted file mode 100644 index fdccb1a6a..000000000 --- a/networks/remote/terraform/README.rst +++ /dev/null @@ -1,53 +0,0 @@ -Using Terraform -=============== - -This is a `Terraform <https://www.terraform.io/>`__ configuration that sets up DigitalOcean droplets. - -Prerequisites -------------- - -- Install `HashiCorp Terraform <https://www.terraform.io>`__ on a linux machine. -- Create a `DigitalOcean API token <https://cloud.digitalocean.com/settings/api/tokens>`__ with read and write capability. -- Create SSH keys - -Build ------ - -:: - - export DO_API_TOKEN="abcdef01234567890abcdef01234567890" - export TESTNET_NAME="remotenet" - export SSH_PUBLIC_FILE="$HOME/.ssh/id_rsa.pub" - export SSH_PRIVATE_FILE="$HOME/.ssh/id_rsa" - - terraform init - terraform apply -var DO_API_TOKEN="$DO_API_TOKEN" -var SSH_PUBLIC_FILE="$SSH_PUBLIC_FILE" -var SSH_PRIVATE_FILE="$SSH_PRIVATE_FILE" - -At the end you will get a list of IP addresses that belongs to your new droplets. - -Destroy -------- - -Run the below: - -:: - - terraform destroy -var DO_API_TOKEN="$DO_API_TOKEN" -var SSH_PUBLIC_FILE="$SSH_PUBLIC_FILE" -var SSH_PRIVATE_FILE="$SSH_PRIVATE_FILE" - -Good to know ------------- - -The DigitalOcean API was not very reliable for me. If you find that terraform fails to install a specific server (for example cluster[2]), check -the regions variable and remove data center names that you find unreliable. The variable is at cluster/variables.tf - -Example: - -:: - - variable "regions" { - description = "Regions to launch in" - type = "list" - default = ["TOR1", "LON1"] - } - - diff --git a/networks/upgrade-gaiad.sh b/networks/upgrade-gaiad.sh new file mode 100755 index 000000000..1f920c02b --- /dev/null +++ b/networks/upgrade-gaiad.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# upgrade-gaiad - example make call to upgrade gaiad on a set of nodes in AWS +# WARNING: Run it from the current directory - it uses relative paths to ship the binary and the genesis.json,config.toml files + +if [ $# -ne 1 ]; then + echo "Usage: ./upgrade-gaiad.sh <clustername>" + exit 1 +fi +set -eux + +export CLUSTER_NAME=$1 + +make upgrade-gaiad + diff --git a/scripts/localnet-blocks-test.sh b/scripts/localnet-blocks-test.sh new file mode 100755 index 000000000..53df090ff --- /dev/null +++ b/scripts/localnet-blocks-test.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +CNT=0 +ITER=$1 +SLEEP=$2 +NUMBLOCKS=$3 +NODEADDR=$4 + +if [ -z "$1" ]; then + echo "Need to input number of iterations to run..." + exit 1 +fi + +if [ -z "$2" ]; then + echo "Need to input number of seconds to sleep between iterations" + exit 1 +fi + +if [ -z "$3" ]; then + echo "Need to input block height to declare completion..." + exit 1 +fi + +if [ -z "$4" ]; then + echo "Need to input node address to poll..." + exit 1 +fi + +while [ ${CNT} -lt $ITER ]; do + var=$(curl -s $NODEADDR:26657/status | jq -r '.result.sync_info.latest_block_height') + echo "Number of Blocks: ${var}" + if [ ! -z ${var} ] && [ ${var} -gt ${NUMBLOCKS} ]; then + echo "Number of blocks reached, exiting success..." + exit 0 + fi + let CNT=CNT+1 + sleep $SLEEP +done + +echo "Timeout reached, exiting failure..." +exit 1 diff --git a/server/mock/app.go b/server/mock/app.go index 5229da41e..7b22328b0 100644 --- a/server/mock/app.go +++ b/server/mock/app.go @@ -30,14 +30,11 @@ func NewApp(rootDir string, logger log.Logger) (abci.Application, error) { capKeyMainStore := sdk.NewKVStoreKey("main") // Create BaseApp. - baseApp := bam.NewBaseApp("kvstore", nil, logger, db) + baseApp := bam.NewBaseApp("kvstore", logger, db, decodeTx) // Set mounts for BaseApp's MultiStore. baseApp.MountStoresIAVL(capKeyMainStore) - // Set Tx decoder - baseApp.SetTxDecoder(decodeTx) - baseApp.SetInitChainer(InitChainer(capKeyMainStore)) // Set a handler Route. diff --git a/server/mock/store.go b/server/mock/store.go index 5f598621f..ec963a1bc 100644 --- a/server/mock/store.go +++ b/server/mock/store.go @@ -8,6 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) +var _ sdk.MultiStore = multiStore{} + type multiStore struct { kv map[sdk.StoreKey]kvStore } @@ -76,10 +78,6 @@ func (ms multiStore) GetKVStore(key sdk.StoreKey) sdk.KVStore { return ms.kv[key] } -func (ms multiStore) GetKVStoreWithGas(meter sdk.GasMeter, key sdk.StoreKey) sdk.KVStore { - panic("not implemented") -} - func (ms multiStore) GetStore(key sdk.StoreKey) sdk.Store { panic("not implemented") } @@ -88,6 +86,8 @@ func (ms multiStore) GetStoreType() sdk.StoreType { panic("not implemented") } +var _ sdk.KVStore = kvStore{} + type kvStore struct { store map[string][]byte } @@ -129,6 +129,10 @@ func (kv kvStore) Prefix(prefix []byte) sdk.KVStore { panic("not implemented") } +func (kv kvStore) Gas(meter sdk.GasMeter, config sdk.GasConfig) sdk.KVStore { + panic("not implmeneted") +} + func (kv kvStore) Iterator(start, end []byte) sdk.Iterator { panic("not implemented") } diff --git a/server/start.go b/server/start.go index 64bd9fd45..8f369d517 100644 --- a/server/start.go +++ b/server/start.go @@ -101,7 +101,7 @@ func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) { proxy.NewLocalClientCreator(app), node.DefaultGenesisDocProviderFunc(cfg), node.DefaultDBProvider, - node.DefaultMetricsProvider, + node.DefaultMetricsProvider(cfg.Instrumentation), ctx.Logger.With("module", "node"), ) if err != nil { diff --git a/server/util.go b/server/util.go index 51547d116..0f5a7b3eb 100644 --- a/server/util.go +++ b/server/util.go @@ -84,6 +84,7 @@ func interceptLoadConfig() (conf *cfg.Config, err error) { conf.ProfListenAddress = "localhost:6060" conf.P2P.RecvRate = 5120000 conf.P2P.SendRate = 5120000 + conf.TxIndex.IndexAllTags = true conf.Consensus.TimeoutCommit = 5000 cfg.WriteConfigFile(configFilePath, conf) // Fall through, just so that its parsed into memory. diff --git a/store/cachekvstore.go b/store/cachekvstore.go index efc4e8911..9eb4ae932 100644 --- a/store/cachekvstore.go +++ b/store/cachekvstore.go @@ -85,6 +85,11 @@ func (ci *cacheKVStore) Prefix(prefix []byte) KVStore { return prefixStore{ci, prefix} } +// Implements KVStore +func (ci *cacheKVStore) Gas(meter GasMeter, config GasConfig) KVStore { + return NewGasKVStore(meter, config, ci) +} + // Implements CacheKVStore. func (ci *cacheKVStore) Write() { ci.mtx.Lock() diff --git a/store/cachemultistore.go b/store/cachemultistore.go index af89bde69..f69ad42aa 100644 --- a/store/cachemultistore.go +++ b/store/cachemultistore.go @@ -134,6 +134,6 @@ func (cms cacheMultiStore) GetKVStore(key StoreKey) KVStore { } // Implements MultiStore. -func (cms cacheMultiStore) GetKVStoreWithGas(meter sdk.GasMeter, key StoreKey) KVStore { - return NewGasKVStore(meter, cms.GetKVStore(key)) +func (cms cacheMultiStore) GetKVStoreWithGas(meter sdk.GasMeter, config sdk.GasConfig, key StoreKey) KVStore { + return NewGasKVStore(meter, config, cms.GetKVStore(key)) } diff --git a/store/dbstoreadapter.go b/store/dbstoreadapter.go index cd384c892..739e30596 100644 --- a/store/dbstoreadapter.go +++ b/store/dbstoreadapter.go @@ -7,6 +7,7 @@ import ( dbm "github.com/tendermint/tendermint/libs/db" ) +// Wrapper type for dbm.Db with implementation of KVStore type dbStoreAdapter struct { dbm.DB } @@ -31,5 +32,10 @@ func (dsa dbStoreAdapter) Prefix(prefix []byte) KVStore { return prefixStore{dsa, prefix} } +// Implements KVStore +func (dsa dbStoreAdapter) Gas(meter GasMeter, config GasConfig) KVStore { + return NewGasKVStore(meter, config, dsa) +} + // dbm.DB implements KVStore so we can CacheKVStore it. -var _ KVStore = dbStoreAdapter{dbm.DB(nil)} +var _ KVStore = dbStoreAdapter{} diff --git a/store/gaskvstore.go b/store/gaskvstore.go index 22f89e631..53ac340bd 100644 --- a/store/gaskvstore.go +++ b/store/gaskvstore.go @@ -6,29 +6,21 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// nolint -const ( - HasCost = 10 - ReadCostFlat = 10 - ReadCostPerByte = 1 - WriteCostFlat = 10 - WriteCostPerByte = 10 - KeyCostFlat = 5 - ValueCostFlat = 10 - ValueCostPerByte = 1 -) +var _ KVStore = &gasKVStore{} // gasKVStore applies gas tracking to an underlying kvstore type gasKVStore struct { - gasMeter sdk.GasMeter - parent sdk.KVStore + gasMeter sdk.GasMeter + gasConfig sdk.GasConfig + parent sdk.KVStore } // nolint -func NewGasKVStore(gasMeter sdk.GasMeter, parent sdk.KVStore) *gasKVStore { +func NewGasKVStore(gasMeter sdk.GasMeter, gasConfig sdk.GasConfig, parent sdk.KVStore) *gasKVStore { kvs := &gasKVStore{ - gasMeter: gasMeter, - parent: parent, + gasMeter: gasMeter, + gasConfig: gasConfig, + parent: parent, } return kvs } @@ -40,24 +32,25 @@ func (gi *gasKVStore) GetStoreType() sdk.StoreType { // Implements KVStore. func (gi *gasKVStore) Get(key []byte) (value []byte) { - gi.gasMeter.ConsumeGas(ReadCostFlat, "GetFlat") + gi.gasMeter.ConsumeGas(gi.gasConfig.ReadCostFlat, "ReadFlat") value = gi.parent.Get(key) // TODO overflow-safe math? - gi.gasMeter.ConsumeGas(ReadCostPerByte*sdk.Gas(len(value)), "ReadPerByte") + gi.gasMeter.ConsumeGas(gi.gasConfig.ReadCostPerByte*sdk.Gas(len(value)), "ReadPerByte") + return value } // Implements KVStore. func (gi *gasKVStore) Set(key []byte, value []byte) { - gi.gasMeter.ConsumeGas(WriteCostFlat, "SetFlat") + gi.gasMeter.ConsumeGas(gi.gasConfig.WriteCostFlat, "WriteFlat") // TODO overflow-safe math? - gi.gasMeter.ConsumeGas(WriteCostPerByte*sdk.Gas(len(value)), "SetPerByte") + gi.gasMeter.ConsumeGas(gi.gasConfig.WriteCostPerByte*sdk.Gas(len(value)), "WritePerByte") gi.parent.Set(key, value) } // Implements KVStore. func (gi *gasKVStore) Has(key []byte) bool { - gi.gasMeter.ConsumeGas(HasCost, "Has") + gi.gasMeter.ConsumeGas(gi.gasConfig.HasCost, "Has") return gi.parent.Has(key) } @@ -69,7 +62,17 @@ func (gi *gasKVStore) Delete(key []byte) { // Implements KVStore func (gi *gasKVStore) Prefix(prefix []byte) KVStore { - return prefixStore{gi, prefix} + // Keep gasstore layer at the top + return &gasKVStore{ + gasMeter: gi.gasMeter, + gasConfig: gi.gasConfig, + parent: prefixStore{gi.parent, prefix}, + } +} + +// Implements KVStore +func (gi *gasKVStore) Gas(meter GasMeter, config GasConfig) KVStore { + return NewGasKVStore(meter, config, gi) } // Implements KVStore. @@ -99,18 +102,20 @@ func (gi *gasKVStore) iterator(start, end []byte, ascending bool) sdk.Iterator { } else { parent = gi.parent.ReverseIterator(start, end) } - return newGasIterator(gi.gasMeter, parent) + return newGasIterator(gi.gasMeter, gi.gasConfig, parent) } type gasIterator struct { - gasMeter sdk.GasMeter - parent sdk.Iterator + gasMeter sdk.GasMeter + gasConfig sdk.GasConfig + parent sdk.Iterator } -func newGasIterator(gasMeter sdk.GasMeter, parent sdk.Iterator) sdk.Iterator { +func newGasIterator(gasMeter sdk.GasMeter, gasConfig sdk.GasConfig, parent sdk.Iterator) sdk.Iterator { return &gasIterator{ - gasMeter: gasMeter, - parent: parent, + gasMeter: gasMeter, + gasConfig: gasConfig, + parent: parent, } } @@ -131,7 +136,7 @@ func (g *gasIterator) Next() { // Implements Iterator. func (g *gasIterator) Key() (key []byte) { - g.gasMeter.ConsumeGas(KeyCostFlat, "KeyFlat") + g.gasMeter.ConsumeGas(g.gasConfig.KeyCostFlat, "KeyFlat") key = g.parent.Key() return key } @@ -139,8 +144,8 @@ func (g *gasIterator) Key() (key []byte) { // Implements Iterator. func (g *gasIterator) Value() (value []byte) { value = g.parent.Value() - g.gasMeter.ConsumeGas(ValueCostFlat, "ValueFlat") - g.gasMeter.ConsumeGas(ValueCostPerByte*sdk.Gas(len(value)), "ValuePerByte") + g.gasMeter.ConsumeGas(g.gasConfig.ValueCostFlat, "ValueFlat") + g.gasMeter.ConsumeGas(g.gasConfig.ValueCostPerByte*sdk.Gas(len(value)), "ValuePerByte") return value } diff --git a/store/gaskvstore_test.go b/store/gaskvstore_test.go index fe84affa2..b2c23c955 100644 --- a/store/gaskvstore_test.go +++ b/store/gaskvstore_test.go @@ -3,21 +3,23 @@ package store import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" dbm "github.com/tendermint/tendermint/libs/db" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/stretchr/testify/require" ) func newGasKVStore() KVStore { meter := sdk.NewGasMeter(1000) mem := dbStoreAdapter{dbm.NewMemDB()} - return NewGasKVStore(meter, mem) + return NewGasKVStore(meter, sdk.DefaultGasConfig(), mem) } func TestGasKVStoreBasic(t *testing.T) { mem := dbStoreAdapter{dbm.NewMemDB()} meter := sdk.NewGasMeter(1000) - st := NewGasKVStore(meter, mem) + st := NewGasKVStore(meter, sdk.DefaultGasConfig(), mem) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") st.Set(keyFmt(1), valFmt(1)) require.Equal(t, valFmt(1), st.Get(keyFmt(1))) @@ -29,7 +31,7 @@ func TestGasKVStoreBasic(t *testing.T) { func TestGasKVStoreIterator(t *testing.T) { mem := dbStoreAdapter{dbm.NewMemDB()} meter := sdk.NewGasMeter(1000) - st := NewGasKVStore(meter, mem) + st := NewGasKVStore(meter, sdk.DefaultGasConfig(), mem) require.Empty(t, st.Get(keyFmt(1)), "Expected `key1` to be empty") require.Empty(t, st.Get(keyFmt(2)), "Expected `key2` to be empty") st.Set(keyFmt(1), valFmt(1)) @@ -53,16 +55,51 @@ func TestGasKVStoreIterator(t *testing.T) { func TestGasKVStoreOutOfGasSet(t *testing.T) { mem := dbStoreAdapter{dbm.NewMemDB()} meter := sdk.NewGasMeter(0) - st := NewGasKVStore(meter, mem) + st := NewGasKVStore(meter, sdk.DefaultGasConfig(), mem) require.Panics(t, func() { st.Set(keyFmt(1), valFmt(1)) }, "Expected out-of-gas") } func TestGasKVStoreOutOfGasIterator(t *testing.T) { mem := dbStoreAdapter{dbm.NewMemDB()} meter := sdk.NewGasMeter(200) - st := NewGasKVStore(meter, mem) + st := NewGasKVStore(meter, sdk.DefaultGasConfig(), mem) st.Set(keyFmt(1), valFmt(1)) iterator := st.Iterator(nil, nil) iterator.Next() require.Panics(t, func() { iterator.Value() }, "Expected out-of-gas") } + +func testGasKVStoreWrap(t *testing.T, store KVStore) { + meter := sdk.NewGasMeter(10000) + + store = store.Gas(meter, sdk.GasConfig{HasCost: 10}) + require.Equal(t, int64(0), meter.GasConsumed()) + + store.Has([]byte("key")) + require.Equal(t, int64(10), meter.GasConsumed()) + + store = store.Gas(meter, sdk.GasConfig{HasCost: 20}) + + store.Has([]byte("key")) + require.Equal(t, int64(40), meter.GasConsumed()) +} + +func TestGasKVStoreWrap(t *testing.T) { + db := dbm.NewMemDB() + tree, _ := newTree(t, db) + iavl := newIAVLStore(tree, numRecent, storeEvery) + testGasKVStoreWrap(t, iavl) + + st := NewCacheKVStore(iavl) + testGasKVStoreWrap(t, st) + + pref := st.Prefix([]byte("prefix")) + testGasKVStoreWrap(t, pref) + + dsa := dbStoreAdapter{dbm.NewMemDB()} + testGasKVStoreWrap(t, dsa) + + ts := newTransientStore() + testGasKVStoreWrap(t, ts) + +} diff --git a/store/iavlstore.go b/store/iavlstore.go index 80c693288..6ab50dfc9 100644 --- a/store/iavlstore.go +++ b/store/iavlstore.go @@ -67,7 +67,6 @@ func newIAVLStore(tree *iavl.VersionedTree, numRecent int64, storeEvery int64) * // Implements Committer. func (st *iavlStore) Commit() CommitID { - // Save a new version. hash, version, err := st.tree.SaveVersion() if err != nil { @@ -161,6 +160,11 @@ func (st *iavlStore) Prefix(prefix []byte) KVStore { return prefixStore{st, prefix} } +// Implements KVStore +func (st *iavlStore) Gas(meter GasMeter, config GasConfig) KVStore { + return NewGasKVStore(meter, config, st) +} + // Implements KVStore. func (st *iavlStore) Iterator(start, end []byte) Iterator { return newIAVLIterator(st.tree.Tree(), start, end, true) diff --git a/store/iavlstore_test.go b/store/iavlstore_test.go index ab117252f..d081b4576 100644 --- a/store/iavlstore_test.go +++ b/store/iavlstore_test.go @@ -446,6 +446,7 @@ func TestIAVLStoreQuery(t *testing.T) { require.Equal(t, uint32(sdk.CodeOK), qres.Code) require.Equal(t, v3, qres.Value) query2 := abci.RequestQuery{Path: "/key", Data: k2, Height: cid.Version} + qres = iavlStore.Query(query2) require.Equal(t, uint32(sdk.CodeOK), qres.Code) require.Equal(t, v2, qres.Value) diff --git a/store/prefixstore.go b/store/prefixstore.go index 7e7f8d493..835a21038 100644 --- a/store/prefixstore.go +++ b/store/prefixstore.go @@ -6,14 +6,16 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) +var _ KVStore = prefixStore{} + type prefixStore struct { - store KVStore + parent KVStore prefix []byte } // Implements Store func (s prefixStore) GetStoreType() StoreType { - return sdk.StoreTypePrefix + return s.parent.GetStoreType() } // Implements CacheWrap @@ -28,22 +30,22 @@ func (s prefixStore) CacheWrapWithTrace(w io.Writer, tc TraceContext) CacheWrap // Implements KVStore func (s prefixStore) Get(key []byte) []byte { - return s.store.Get(append(s.prefix, key...)) + return s.parent.Get(append(s.prefix, key...)) } // Implements KVStore func (s prefixStore) Has(key []byte) bool { - return s.store.Has(append(s.prefix, key...)) + return s.parent.Has(append(s.prefix, key...)) } // Implements KVStore func (s prefixStore) Set(key, value []byte) { - s.store.Set(append(s.prefix, key...), value) + s.parent.Set(append(s.prefix, key...), value) } // Implements KVStore func (s prefixStore) Delete(key []byte) { - s.store.Delete(append(s.prefix, key...)) + s.parent.Delete(append(s.prefix, key...)) } // Implements KVStore @@ -51,6 +53,11 @@ func (s prefixStore) Prefix(prefix []byte) KVStore { return prefixStore{s, prefix} } +// Implements KVStore +func (s prefixStore) Gas(meter GasMeter, config GasConfig) KVStore { + return NewGasKVStore(meter, config, s) +} + // Implements KVStore func (s prefixStore) Iterator(start, end []byte) Iterator { if end == nil { @@ -60,7 +67,7 @@ func (s prefixStore) Iterator(start, end []byte) Iterator { } return prefixIterator{ prefix: s.prefix, - iter: s.store.Iterator(append(s.prefix, start...), end), + iter: s.parent.Iterator(append(s.prefix, start...), end), } } @@ -73,7 +80,7 @@ func (s prefixStore) ReverseIterator(start, end []byte) Iterator { } return prefixIterator{ prefix: s.prefix, - iter: s.store.ReverseIterator(start, end), + iter: s.parent.ReverseIterator(start, end), } } diff --git a/store/prefixstore_test.go b/store/prefixstore_test.go index 1961bb4bb..ff37b27d4 100644 --- a/store/prefixstore_test.go +++ b/store/prefixstore_test.go @@ -4,7 +4,6 @@ import ( "math/rand" "testing" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/tendermint/iavl" @@ -35,32 +34,34 @@ func setRandomKVPairs(t *testing.T, store KVStore) []kvpair { func testPrefixStore(t *testing.T, baseStore KVStore, prefix []byte) { prefixStore := baseStore.Prefix(prefix) + prefixPrefixStore := prefixStore.Prefix([]byte("prefix")) - kvps := setRandomKVPairs(t, prefixStore) - - buf := make([]byte, 32) - for i := 0; i < 20; i++ { - rand.Read(buf) - assert.False(t, prefixStore.Has(buf)) - assert.Nil(t, prefixStore.Get(buf)) - assert.False(t, baseStore.Has(append(prefix, buf...))) - assert.Nil(t, baseStore.Get(append(prefix, buf...))) - } + kvps := setRandomKVPairs(t, prefixPrefixStore) for i := 0; i < 20; i++ { key := kvps[i].key - assert.True(t, prefixStore.Has(key)) - assert.Equal(t, kvps[i].value, prefixStore.Get(key)) - assert.True(t, baseStore.Has(append(prefix, key...))) - assert.Equal(t, kvps[i].value, baseStore.Get(append(prefix, key...))) + value := kvps[i].value + require.True(t, prefixPrefixStore.Has(key)) + require.Equal(t, value, prefixPrefixStore.Get(key)) - prefixStore.Delete(key) - assert.False(t, prefixStore.Has(key)) - assert.Nil(t, prefixStore.Get(key)) - assert.False(t, baseStore.Has(append(prefix, buf...))) - assert.Nil(t, baseStore.Get(append(prefix, buf...))) + key = append([]byte("prefix"), key...) + require.True(t, prefixStore.Has(key)) + require.Equal(t, value, prefixStore.Get(key)) + key = append(prefix, key...) + require.True(t, baseStore.Has(key)) + require.Equal(t, value, baseStore.Get(key)) + + key = kvps[i].key + prefixPrefixStore.Delete(key) + require.False(t, prefixPrefixStore.Has(key)) + require.Nil(t, prefixPrefixStore.Get(key)) + key = append([]byte("prefix"), key...) + require.False(t, prefixStore.Has(key)) + require.Nil(t, prefixStore.Get(key)) + key = append(prefix, key...) + require.False(t, baseStore.Has(key)) + require.Nil(t, baseStore.Get(key)) } - } func TestIAVLStorePrefix(t *testing.T) { @@ -80,7 +81,7 @@ func TestCacheKVStorePrefix(t *testing.T) { func TestGasKVStorePrefix(t *testing.T) { meter := sdk.NewGasMeter(100000000) mem := dbStoreAdapter{dbm.NewMemDB()} - gasStore := NewGasKVStore(meter, mem) + gasStore := NewGasKVStore(meter, sdk.DefaultGasConfig(), mem) testPrefixStore(t, gasStore, []byte("test")) } diff --git a/store/rootmultistore.go b/store/rootmultistore.go index 255afffbd..8eb1c33dd 100644 --- a/store/rootmultistore.go +++ b/store/rootmultistore.go @@ -99,7 +99,7 @@ func (rs *rootMultiStore) LoadVersion(ver int64) error { if ver == 0 { for key, storeParams := range rs.storesParams { id := CommitID{} - store, err := rs.loadCommitStoreFromParams(id, storeParams) + store, err := rs.loadCommitStoreFromParams(key, id, storeParams) if err != nil { return fmt.Errorf("failed to load rootMultiStore: %v", err) } @@ -122,17 +122,20 @@ func (rs *rootMultiStore) LoadVersion(ver int64) error { for _, storeInfo := range cInfo.StoreInfos { key, commitID := rs.nameToKey(storeInfo.Name), storeInfo.Core.CommitID storeParams := rs.storesParams[key] - store, err := rs.loadCommitStoreFromParams(commitID, storeParams) + store, err := rs.loadCommitStoreFromParams(key, commitID, storeParams) if err != nil { return fmt.Errorf("failed to load rootMultiStore: %v", err) } newStores[key] = store } - // If any CommitStoreLoaders were not used, return error. - for key := range rs.storesParams { - if _, ok := newStores[key]; !ok { - return fmt.Errorf("unused CommitStoreLoader: %v", key) + // TODO: detecting transient is quite adhoc + // If any nontransient CommitStoreLoaders were not used, return error. + for key, param := range rs.storesParams { + if param.typ != sdk.StoreTypeTransient { + if _, ok := newStores[key]; !ok { + return fmt.Errorf("unused CommitStoreLoader: %v", key) + } } } @@ -242,10 +245,7 @@ func (rs *rootMultiStore) GetKVStore(key StoreKey) KVStore { return store } -// Implements MultiStore. -func (rs *rootMultiStore) GetKVStoreWithGas(meter sdk.GasMeter, key StoreKey) KVStore { - return NewGasKVStore(meter, rs.GetKVStore(key)) -} +// Implements MultiStore // getStoreByName will first convert the original name to // a special key, before looking up the CommitStore. @@ -309,7 +309,7 @@ func parsePath(path string) (storeName string, subpath string, err sdk.Error) { //---------------------------------------- -func (rs *rootMultiStore) loadCommitStoreFromParams(id CommitID, params storeParams) (store CommitStore, err error) { +func (rs *rootMultiStore) loadCommitStoreFromParams(key sdk.StoreKey, id CommitID, params storeParams) (store CommitStore, err error) { var db dbm.DB if params.db != nil { db = dbm.NewPrefixDB(params.db, []byte("s/_/")) @@ -326,6 +326,14 @@ func (rs *rootMultiStore) loadCommitStoreFromParams(id CommitID, params storePar return case sdk.StoreTypeDB: panic("dbm.DB is not a CommitStore") + case sdk.StoreTypeTransient: + _, ok := key.(*sdk.TransientStoreKey) + if !ok { + err = fmt.Errorf("invalid StoreKey for StoreTypeTransient: %s", key.String()) + return + } + store = newTransientStore() + return default: panic(fmt.Sprintf("unrecognized store type %v", params.typ)) } @@ -440,6 +448,10 @@ func commitStores(version int64, storeMap map[StoreKey]CommitStore) commitInfo { // Commit commitID := store.Commit() + if store.GetStoreType() == sdk.StoreTypeTransient { + continue + } + // Record CommitID si := storeInfo{} si.Name = key.Name() diff --git a/store/rootmultistore_test.go b/store/rootmultistore_test.go index f56411462..79760d869 100644 --- a/store/rootmultistore_test.go +++ b/store/rootmultistore_test.go @@ -13,6 +13,14 @@ import ( const useDebugDB = false +func TestStoreType(t *testing.T) { + db := dbm.NewMemDB() + store := NewCommitMultiStore(db) + store.MountStoreWithDB( + sdk.NewKVStoreKey("store1"), sdk.StoreTypeIAVL, db) + +} + func TestMultistoreCommitLoad(t *testing.T) { var db dbm.DB = dbm.NewMemDB() if useDebugDB { @@ -125,6 +133,11 @@ func TestMultiStoreQuery(t *testing.T) { cid = multi.Commit() ver := cid.Version + // Reload multistore from database + multi = newMultiStoreWithMounts(db) + err = multi.LoadLatestVersion() + require.Nil(t, err) + // Test bad path. query := abci.RequestQuery{Path: "/key", Data: k, Height: ver} qres := multi.Query(query) @@ -165,11 +178,11 @@ func TestMultiStoreQuery(t *testing.T) { func newMultiStoreWithMounts(db dbm.DB) *rootMultiStore { store := NewCommitMultiStore(db) store.MountStoreWithDB( - sdk.NewKVStoreKey("store1"), sdk.StoreTypeIAVL, db) + sdk.NewKVStoreKey("store1"), sdk.StoreTypeIAVL, nil) store.MountStoreWithDB( - sdk.NewKVStoreKey("store2"), sdk.StoreTypeIAVL, db) + sdk.NewKVStoreKey("store2"), sdk.StoreTypeIAVL, nil) store.MountStoreWithDB( - sdk.NewKVStoreKey("store3"), sdk.StoreTypeIAVL, db) + sdk.NewKVStoreKey("store3"), sdk.StoreTypeIAVL, nil) return store } diff --git a/store/tracekvstore.go b/store/tracekvstore.go index f769c6690..0224e8c12 100644 --- a/store/tracekvstore.go +++ b/store/tracekvstore.go @@ -82,6 +82,11 @@ func (tkv *TraceKVStore) Prefix(prefix []byte) KVStore { return prefixStore{tkv, prefix} } +// Gas implements the KVStore interface. +func (tkv *TraceKVStore) Gas(meter GasMeter, config GasConfig) KVStore { + return NewGasKVStore(meter, config, tkv.parent) +} + // Iterator implements the KVStore interface. It delegates the Iterator call // the to the parent KVStore. func (tkv *TraceKVStore) Iterator(start, end []byte) sdk.Iterator { diff --git a/store/transientstore.go b/store/transientstore.go new file mode 100644 index 000000000..1c099fa0d --- /dev/null +++ b/store/transientstore.go @@ -0,0 +1,43 @@ +package store + +import ( + dbm "github.com/tendermint/tendermint/libs/db" +) + +var _ KVStore = (*transientStore)(nil) + +// transientStore is a wrapper for a MemDB with Commiter implementation +type transientStore struct { + dbStoreAdapter +} + +// Constructs new MemDB adapter +func newTransientStore() *transientStore { + return &transientStore{dbStoreAdapter{dbm.NewMemDB()}} +} + +// Implements CommitStore +// Commit cleans up transientStore. +func (ts *transientStore) Commit() (id CommitID) { + ts.dbStoreAdapter = dbStoreAdapter{dbm.NewMemDB()} + return +} + +// Implements CommitStore +func (ts *transientStore) SetPruning(pruning PruningStrategy) { +} + +// Implements CommitStore +func (ts *transientStore) LastCommitID() (id CommitID) { + return +} + +// Implements KVStore +func (ts *transientStore) Prefix(prefix []byte) KVStore { + return prefixStore{ts, prefix} +} + +// Implements KVStore +func (ts *transientStore) Gas(meter GasMeter, config GasConfig) KVStore { + return NewGasKVStore(meter, config, ts) +} diff --git a/store/transientstore_test.go b/store/transientstore_test.go new file mode 100644 index 000000000..1c9e98cfa --- /dev/null +++ b/store/transientstore_test.go @@ -0,0 +1,23 @@ +package store + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +var k, v = []byte("hello"), []byte("world") + +func TestTransientStore(t *testing.T) { + tstore := newTransientStore() + + require.Nil(t, tstore.Get(k)) + + tstore.Set(k, v) + + require.Equal(t, v, tstore.Get(k)) + + tstore.Commit() + + require.Nil(t, tstore.Get(k)) +} diff --git a/store/types.go b/store/types.go index 4c36a004b..353cd2e3c 100644 --- a/store/types.go +++ b/store/types.go @@ -7,6 +7,7 @@ import ( // Import cosmos-sdk/types/store.go for convenience. // nolint type ( + PruningStrategy = types.PruningStrategy Store = types.Store Committer = types.Committer CommitStore = types.CommitStore @@ -25,4 +26,7 @@ type ( StoreType = types.StoreType Queryable = types.Queryable TraceContext = types.TraceContext + Gas = types.Gas + GasMeter = types.GasMeter + GasConfig = types.GasConfig ) diff --git a/tests/gobash.go b/tests/gobash.go index 71db2d2dd..11f4407f2 100644 --- a/tests/gobash.go +++ b/tests/gobash.go @@ -2,6 +2,7 @@ package tests import ( "fmt" + "io" "io/ioutil" "strings" "testing" @@ -10,11 +11,12 @@ import ( cmn "github.com/tendermint/tendermint/libs/common" ) -// Execute the command, return stdout, logging stdout/err to t. -func ExecuteT(t *testing.T, cmd string) (out string) { +// ExecuteT executes the command, pipes any input to STDIN and return STDOUT, +// logging STDOUT/STDERR to t. +func ExecuteT(t *testing.T, cmd, input string) (out string) { t.Log("Running", cmn.Cyan(cmd)) - // Split cmd to name and args. + // split cmd to name and args split := strings.Split(cmd, " ") require.True(t, len(split) > 0, "no command provided") name, args := split[0], []string(nil) @@ -22,27 +24,32 @@ func ExecuteT(t *testing.T, cmd string) (out string) { args = split[1:] } - // Start process and wait. proc, err := StartProcess("", name, args) require.NoError(t, err) - // Get the output. + // if input is provided, pass it to STDIN and close the pipe + if input != "" { + _, err = io.WriteString(proc.StdinPipe, input) + require.NoError(t, err) + proc.StdinPipe.Close() + } + outbz, errbz, err := proc.ReadAll() if err != nil { fmt.Println("Err on proc.ReadAll()", err, args) } + proc.Wait() - // Log output. if len(outbz) > 0 { t.Log("Stdout:", cmn.Green(string(outbz))) } + if len(errbz) > 0 { t.Log("Stderr:", cmn.Red(string(errbz))) } - // Collect STDOUT output. - out = strings.Trim(string(outbz), "\n") //trim any new lines + out = strings.Trim(string(outbz), "\n") return out } diff --git a/tests/test_cover.sh b/tests/test_cover.sh index be6215b5a..3fb0ab69c 100644 --- a/tests/test_cover.sh +++ b/tests/test_cover.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -PKGS=$(go list ./... | grep -v /vendor/ | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test) +PKGS=$(go list ./... | grep -v /vendor/ | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test | grep -v '/simulation') set -e echo "mode: atomic" > coverage.txt diff --git a/tools/Makefile b/tools/Makefile index d58f52d1b..a11f2ec70 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -30,6 +30,9 @@ ifndef DEP_CHECK else @echo "Found dep in path." endif + +check_dev_tools: + $(MAKE) check_tools ifndef GOLINT_CHECK @echo "No golint in path. Install with 'make get_tools'." else @@ -78,6 +81,9 @@ else @echo "Installing dep" go get -v $(DEP) endif + +get_dev_tools: + $(MAKE) get_tools ifdef GOLINT_CHECK @echo "Golint is already installed. Run 'make update_tools' to update." else @@ -120,16 +126,19 @@ else @echo "Installing unparam" go get -v $(UNPARAM) endif -ifdef GOYCLO_CHECK - @echo "goyclo is already installed. Run 'make update_tools' to update." +ifdef GOCYCLO_CHECK + @echo "gocyclo is already installed. Run 'make update_tools' to update." else - @echo "Installing goyclo" + @echo "Installing gocyclo" go get -v $(GOCYCLO) endif update_tools: @echo "Updating dep" go get -u -v $(DEP) + +update_dev_tools: + $(MAKE) update_tools @echo "Updating tendermint/golint" go get -u -v $(GOLINT) @echo "Updating gometalinter.v2" @@ -150,4 +159,4 @@ update_tools: # To avoid unintended conflicts with file names, always add to .PHONY # unless there is a reason not to. # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html -.PHONY: check_tools get_tools update_tools +.PHONY: check_tools get_tools update_tools check_dev_tools get_dev_tools update_dev_tools diff --git a/types/account_test.go b/types/account_test.go new file mode 100644 index 000000000..aa222ee7e --- /dev/null +++ b/types/account_test.go @@ -0,0 +1,132 @@ +package types_test + +import ( + "encoding/hex" + "math/rand" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/tendermint/tendermint/crypto/ed25519" + + "github.com/cosmos/cosmos-sdk/types" +) + +var invalidstrs = []string{ + "", + "hello, world!", + "0xAA", + "AAA", + types.Bech32PrefixAccAddr + "AB0C", + types.Bech32PrefixAccPub + "1234", + types.Bech32PrefixValAddr + "5678", + types.Bech32PrefixValPub + "BBAB", +} + +func testMarshal(t *testing.T, original interface{}, res interface{}, marshal func() ([]byte, error), unmarshal func([]byte) error) { + bz, err := marshal() + require.Nil(t, err) + err = unmarshal(bz) + require.Nil(t, err) + require.Equal(t, original, res) +} + +func TestRandBech32PubkeyConsistency(t *testing.T) { + var pub ed25519.PubKeyEd25519 + + for i := 0; i < 1000; i++ { + rand.Read(pub[:]) + + mustbech32accpub := types.MustBech32ifyAccPub(pub) + bech32accpub, err := types.Bech32ifyAccPub(pub) + require.Nil(t, err) + require.Equal(t, bech32accpub, mustbech32accpub) + + mustbech32valpub := types.MustBech32ifyValPub(pub) + bech32valpub, err := types.Bech32ifyValPub(pub) + require.Nil(t, err) + require.Equal(t, bech32valpub, mustbech32valpub) + + mustaccpub := types.MustGetAccPubKeyBech32(bech32accpub) + accpub, err := types.GetAccPubKeyBech32(bech32accpub) + require.Nil(t, err) + require.Equal(t, accpub, mustaccpub) + + mustvalpub := types.MustGetValPubKeyBech32(bech32valpub) + valpub, err := types.GetValPubKeyBech32(bech32valpub) + require.Nil(t, err) + require.Equal(t, valpub, mustvalpub) + + require.Equal(t, valpub, accpub) + } +} + +func TestRandBech32AccAddrConsistency(t *testing.T) { + var pub ed25519.PubKeyEd25519 + + for i := 0; i < 1000; i++ { + rand.Read(pub[:]) + + acc := types.AccAddress(pub.Address()) + res := types.AccAddress{} + + testMarshal(t, &acc, &res, acc.MarshalJSON, (&res).UnmarshalJSON) + testMarshal(t, &acc, &res, acc.Marshal, (&res).Unmarshal) + + str := acc.String() + res, err := types.AccAddressFromBech32(str) + require.Nil(t, err) + require.Equal(t, acc, res) + + str = hex.EncodeToString(acc) + res, err = types.AccAddressFromHex(str) + require.Nil(t, err) + require.Equal(t, acc, res) + } + + for _, str := range invalidstrs { + _, err := types.AccAddressFromHex(str) + require.NotNil(t, err) + + _, err = types.AccAddressFromBech32(str) + require.NotNil(t, err) + + err = (*types.AccAddress)(nil).UnmarshalJSON([]byte("\"" + str + "\"")) + require.NotNil(t, err) + } +} + +func TestValAddr(t *testing.T) { + var pub ed25519.PubKeyEd25519 + + for i := 0; i < 20; i++ { + rand.Read(pub[:]) + + acc := types.ValAddress(pub.Address()) + res := types.ValAddress{} + + testMarshal(t, &acc, &res, acc.MarshalJSON, (&res).UnmarshalJSON) + testMarshal(t, &acc, &res, acc.Marshal, (&res).Unmarshal) + + str := acc.String() + res, err := types.ValAddressFromBech32(str) + require.Nil(t, err) + require.Equal(t, acc, res) + + str = hex.EncodeToString(acc) + res, err = types.ValAddressFromHex(str) + require.Nil(t, err) + require.Equal(t, acc, res) + } + + for _, str := range invalidstrs { + _, err := types.ValAddressFromHex(str) + require.NotNil(t, err) + + _, err = types.ValAddressFromBech32(str) + require.NotNil(t, err) + + err = (*types.ValAddress)(nil).UnmarshalJSON([]byte("\"" + str + "\"")) + require.NotNil(t, err) + } +} diff --git a/types/coin.go b/types/coin.go index eba645932..aa6029559 100644 --- a/types/coin.go +++ b/types/coin.go @@ -14,13 +14,17 @@ type Coin struct { Amount Int `json:"amount"` } -func NewCoin(denom string, amount int64) Coin { +func NewCoin(denom string, amount Int) Coin { return Coin{ Denom: denom, - Amount: NewInt(amount), + Amount: amount, } } +func NewInt64Coin(denom string, amount int64) Coin { + return NewCoin(denom, NewInt(amount)) +} + // String provides a human-readable representation of a coin func (coin Coin) String() string { return fmt.Sprintf("%v%v", coin.Amount, coin.Denom) diff --git a/types/coin_test.go b/types/coin_test.go index c7ccc5746..145c0c40a 100644 --- a/types/coin_test.go +++ b/types/coin_test.go @@ -12,14 +12,14 @@ func TestIsPositiveCoin(t *testing.T) { inputOne Coin expected bool }{ - {NewCoin("A", 1), true}, - {NewCoin("A", 0), false}, - {NewCoin("a", -1), false}, + {NewInt64Coin("A", 1), true}, + {NewInt64Coin("A", 0), false}, + {NewInt64Coin("a", -1), false}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.IsPositive() - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "%s positivity is incorrect, tc #%d", tc.inputOne.String(), tcIndex) } } @@ -28,14 +28,14 @@ func TestIsNotNegativeCoin(t *testing.T) { inputOne Coin expected bool }{ - {NewCoin("A", 1), true}, - {NewCoin("A", 0), true}, - {NewCoin("a", -1), false}, + {NewInt64Coin("A", 1), true}, + {NewInt64Coin("A", 0), true}, + {NewInt64Coin("a", -1), false}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.IsNotNegative() - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "%s not-negativity is incorrect, tc #%d", tc.inputOne.String(), tcIndex) } } @@ -45,16 +45,16 @@ func TestSameDenomAsCoin(t *testing.T) { inputTwo Coin expected bool }{ - {NewCoin("A", 1), NewCoin("A", 1), true}, - {NewCoin("A", 1), NewCoin("a", 1), false}, - {NewCoin("a", 1), NewCoin("b", 1), false}, - {NewCoin("steak", 1), NewCoin("steak", 10), true}, - {NewCoin("steak", -11), NewCoin("steak", 10), true}, + {NewInt64Coin("A", 1), NewInt64Coin("A", 1), true}, + {NewInt64Coin("A", 1), NewInt64Coin("a", 1), false}, + {NewInt64Coin("a", 1), NewInt64Coin("b", 1), false}, + {NewInt64Coin("steak", 1), NewInt64Coin("steak", 10), true}, + {NewInt64Coin("steak", -11), NewInt64Coin("steak", 10), true}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.SameDenomAs(tc.inputTwo) - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "coin denominations didn't match, tc #%d", tcIndex) } } @@ -64,15 +64,15 @@ func TestIsGTECoin(t *testing.T) { inputTwo Coin expected bool }{ - {NewCoin("A", 1), NewCoin("A", 1), true}, - {NewCoin("A", 2), NewCoin("A", 1), true}, - {NewCoin("A", -1), NewCoin("A", 5), false}, - {NewCoin("a", 1), NewCoin("b", 1), false}, + {NewInt64Coin("A", 1), NewInt64Coin("A", 1), true}, + {NewInt64Coin("A", 2), NewInt64Coin("A", 1), true}, + {NewInt64Coin("A", -1), NewInt64Coin("A", 5), false}, + {NewInt64Coin("a", 1), NewInt64Coin("b", 1), false}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.IsGTE(tc.inputTwo) - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "coin GTE relation is incorrect, tc #%d", tcIndex) } } @@ -82,16 +82,16 @@ func TestIsEqualCoin(t *testing.T) { inputTwo Coin expected bool }{ - {NewCoin("A", 1), NewCoin("A", 1), true}, - {NewCoin("A", 1), NewCoin("a", 1), false}, - {NewCoin("a", 1), NewCoin("b", 1), false}, - {NewCoin("steak", 1), NewCoin("steak", 10), false}, - {NewCoin("steak", -11), NewCoin("steak", 10), false}, + {NewInt64Coin("A", 1), NewInt64Coin("A", 1), true}, + {NewInt64Coin("A", 1), NewInt64Coin("a", 1), false}, + {NewInt64Coin("a", 1), NewInt64Coin("b", 1), false}, + {NewInt64Coin("steak", 1), NewInt64Coin("steak", 10), false}, + {NewInt64Coin("steak", -11), NewInt64Coin("steak", 10), false}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.IsEqual(tc.inputTwo) - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "coin equality relation is incorrect, tc #%d", tcIndex) } } @@ -101,21 +101,21 @@ func TestPlusCoin(t *testing.T) { inputTwo Coin expected Coin }{ - {NewCoin("A", 1), NewCoin("A", 1), NewCoin("A", 2)}, - {NewCoin("A", 1), NewCoin("B", 1), NewCoin("A", 1)}, - {NewCoin("asdf", -4), NewCoin("asdf", 5), NewCoin("asdf", 1)}, + {NewInt64Coin("A", 1), NewInt64Coin("A", 1), NewInt64Coin("A", 2)}, + {NewInt64Coin("A", 1), NewInt64Coin("B", 1), NewInt64Coin("A", 1)}, + {NewInt64Coin("asdf", -4), NewInt64Coin("asdf", 5), NewInt64Coin("asdf", 1)}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.Plus(tc.inputTwo) - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "sum of coins is incorrect, tc #%d", tcIndex) } tc := struct { inputOne Coin inputTwo Coin expected int64 - }{NewCoin("asdf", -1), NewCoin("asdf", 1), 0} + }{NewInt64Coin("asdf", -1), NewInt64Coin("asdf", 1), 0} res := tc.inputOne.Plus(tc.inputTwo) require.Equal(t, tc.expected, res.Amount.Int64()) } @@ -127,26 +127,66 @@ func TestMinusCoin(t *testing.T) { expected Coin }{ - {NewCoin("A", 1), NewCoin("B", 1), NewCoin("A", 1)}, - {NewCoin("asdf", -4), NewCoin("asdf", 5), NewCoin("asdf", -9)}, - {NewCoin("asdf", 10), NewCoin("asdf", 1), NewCoin("asdf", 9)}, + {NewInt64Coin("A", 1), NewInt64Coin("B", 1), NewInt64Coin("A", 1)}, + {NewInt64Coin("asdf", -4), NewInt64Coin("asdf", 5), NewInt64Coin("asdf", -9)}, + {NewInt64Coin("asdf", 10), NewInt64Coin("asdf", 1), NewInt64Coin("asdf", 9)}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.Minus(tc.inputTwo) - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "difference of coins is incorrect, tc #%d", tcIndex) } tc := struct { inputOne Coin inputTwo Coin expected int64 - }{NewCoin("A", 1), NewCoin("A", 1), 0} + }{NewInt64Coin("A", 1), NewInt64Coin("A", 1), 0} res := tc.inputOne.Minus(tc.inputTwo) require.Equal(t, tc.expected, res.Amount.Int64()) } +func TestIsZeroCoins(t *testing.T) { + cases := []struct { + inputOne Coins + expected bool + }{ + {Coins{}, true}, + {Coins{NewInt64Coin("A", 0)}, true}, + {Coins{NewInt64Coin("A", 0), NewInt64Coin("B", 0)}, true}, + {Coins{NewInt64Coin("A", 1)}, false}, + {Coins{NewInt64Coin("A", 0), NewInt64Coin("B", 1)}, false}, + } + + for _, tc := range cases { + res := tc.inputOne.IsZero() + require.Equal(t, tc.expected, res) + } +} + +func TestEqualCoins(t *testing.T) { + cases := []struct { + inputOne Coins + inputTwo Coins + expected bool + }{ + {Coins{}, Coins{}, true}, + {Coins{NewInt64Coin("A", 0)}, Coins{NewInt64Coin("A", 0)}, true}, + {Coins{NewInt64Coin("A", 0), NewInt64Coin("B", 1)}, Coins{NewInt64Coin("A", 0), NewInt64Coin("B", 1)}, true}, + {Coins{NewInt64Coin("A", 0)}, Coins{NewInt64Coin("B", 0)}, false}, + {Coins{NewInt64Coin("A", 0)}, Coins{NewInt64Coin("A", 1)}, false}, + {Coins{NewInt64Coin("A", 0)}, Coins{NewInt64Coin("A", 0), NewInt64Coin("B", 1)}, false}, + // TODO: is it expected behaviour? shouldn't we sort the coins before comparing them? + {Coins{NewInt64Coin("A", 0), NewInt64Coin("B", 1)}, Coins{NewInt64Coin("B", 1), NewInt64Coin("A", 0)}, false}, + } + + for tcnum, tc := range cases { + res := tc.inputOne.IsEqual(tc.inputTwo) + require.Equal(t, tc.expected, res, "Equality is differed from expected. tc #%d, expected %b, actual %b.", tcnum, tc.expected, res) + } +} + func TestCoins(t *testing.T) { //Define the coins to be used in tests @@ -160,6 +200,7 @@ func TestCoins(t *testing.T) { empty := Coins{ {"GOLD", NewInt(0)}, } + null := Coins{} badSort1 := Coins{ {"TREE", NewInt(1)}, {"GAS", NewInt(1)}, @@ -184,6 +225,7 @@ func TestCoins(t *testing.T) { assert.True(t, good.IsValid(), "Coins are valid") assert.True(t, good.IsPositive(), "Expected coins to be positive: %v", good) + assert.False(t, null.IsPositive(), "Expected coins to not be positive: %v", null) assert.True(t, good.IsGTE(empty), "Expected %v to be >= %v", good, empty) assert.False(t, neg.IsPositive(), "Expected neg coins to not be positive: %v", neg) assert.Zero(t, len(sum), "Expected 0 coins") @@ -212,10 +254,10 @@ func TestPlusCoins(t *testing.T) { {Coins{{"A", negone}, {"B", zero}}, Coins{{"A", zero}, {"B", zero}}, Coins{{"A", negone}}}, } - for _, tc := range cases { + for tcIndex, tc := range cases { res := tc.inputOne.Plus(tc.inputTwo) assert.True(t, res.IsValid()) - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "sum of coins is incorrect, tc #%d", tcIndex) } } @@ -242,12 +284,12 @@ func TestParse(t *testing.T) { {"5foo-bar", false, nil}, // once more, only letters in coin name } - for _, tc := range cases { + for tcIndex, tc := range cases { res, err := ParseCoins(tc.input) if !tc.valid { - require.NotNil(t, err, "%s: %#v", tc.input, res) + require.NotNil(t, err, "%s: %#v. tc #%d", tc.input, res, tcIndex) } else if assert.Nil(t, err, "%s: %+v", tc.input, err) { - require.Equal(t, tc.expected, res) + require.Equal(t, tc.expected, res, "coin parsing was incorrect, tc #%d", tcIndex) } } @@ -256,32 +298,32 @@ func TestParse(t *testing.T) { func TestSortCoins(t *testing.T) { good := Coins{ - NewCoin("GAS", 1), - NewCoin("MINERAL", 1), - NewCoin("TREE", 1), + NewInt64Coin("GAS", 1), + NewInt64Coin("MINERAL", 1), + NewInt64Coin("TREE", 1), } empty := Coins{ - NewCoin("GOLD", 0), + NewInt64Coin("GOLD", 0), } badSort1 := Coins{ - NewCoin("TREE", 1), - NewCoin("GAS", 1), - NewCoin("MINERAL", 1), + NewInt64Coin("TREE", 1), + NewInt64Coin("GAS", 1), + NewInt64Coin("MINERAL", 1), } badSort2 := Coins{ // both are after the first one, but the second and third are in the wrong order - NewCoin("GAS", 1), - NewCoin("TREE", 1), - NewCoin("MINERAL", 1), + NewInt64Coin("GAS", 1), + NewInt64Coin("TREE", 1), + NewInt64Coin("MINERAL", 1), } badAmt := Coins{ - NewCoin("GAS", 1), - NewCoin("TREE", 0), - NewCoin("MINERAL", 1), + NewInt64Coin("GAS", 1), + NewInt64Coin("TREE", 0), + NewInt64Coin("MINERAL", 1), } dup := Coins{ - NewCoin("GAS", 1), - NewCoin("GAS", 1), - NewCoin("MINERAL", 1), + NewInt64Coin("GAS", 1), + NewInt64Coin("GAS", 1), + NewInt64Coin("MINERAL", 1), } cases := []struct { @@ -296,10 +338,10 @@ func TestSortCoins(t *testing.T) { {dup, false, false}, } - for _, tc := range cases { - require.Equal(t, tc.before, tc.coins.IsValid()) + for tcIndex, tc := range cases { + require.Equal(t, tc.before, tc.coins.IsValid(), "coin validity is incorrect before sorting, tc #%d", tcIndex) tc.coins.Sort() - require.Equal(t, tc.after, tc.coins.IsValid()) + require.Equal(t, tc.after, tc.coins.IsValid(), "coin validity is incorrect after sorting, tc #%d", tcIndex) } } @@ -307,31 +349,31 @@ func TestAmountOf(t *testing.T) { case0 := Coins{} case1 := Coins{ - NewCoin("", 0), + NewInt64Coin("", 0), } case2 := Coins{ - NewCoin(" ", 0), + NewInt64Coin(" ", 0), } case3 := Coins{ - NewCoin("GOLD", 0), + NewInt64Coin("GOLD", 0), } case4 := Coins{ - NewCoin("GAS", 1), - NewCoin("MINERAL", 1), - NewCoin("TREE", 1), + NewInt64Coin("GAS", 1), + NewInt64Coin("MINERAL", 1), + NewInt64Coin("TREE", 1), } case5 := Coins{ - NewCoin("MINERAL", 1), - NewCoin("TREE", 1), + NewInt64Coin("MINERAL", 1), + NewInt64Coin("TREE", 1), } case6 := Coins{ - NewCoin("", 6), + NewInt64Coin("", 6), } case7 := Coins{ - NewCoin(" ", 7), + NewInt64Coin(" ", 7), } case8 := Coins{ - NewCoin("GAS", 8), + NewInt64Coin("GAS", 8), } cases := []struct { diff --git a/types/context.go b/types/context.go index e55eff1ab..44b0474e8 100644 --- a/types/context.go +++ b/types/context.go @@ -31,7 +31,6 @@ type Context struct { // create a new context func NewContext(ms MultiStore, header abci.Header, isCheckTx bool, logger log.Logger) Context { - c := Context{ Context: context.Background(), pst: newThePast(), @@ -41,7 +40,6 @@ func NewContext(ms MultiStore, header abci.Header, isCheckTx bool, logger log.Lo c = c.WithBlockHeader(header) c = c.WithBlockHeight(header.Height) c = c.WithChainID(header.ChainID) - c = c.WithIsCheckTx(isCheckTx) c = c.WithTxBytes(nil) c = c.WithLogger(logger) c = c.WithSigningValidators(nil) @@ -71,7 +69,12 @@ func (c Context) Value(key interface{}) interface{} { // KVStore fetches a KVStore from the MultiStore. func (c Context) KVStore(key StoreKey) KVStore { - return c.multiStore().GetKVStoreWithGas(c.GasMeter(), key) + return c.multiStore().GetKVStore(key).Gas(c.GasMeter(), cachedDefaultGasConfig) +} + +// TransientStore fetches a TransientStore from the MultiStore. +func (c Context) TransientStore(key StoreKey) KVStore { + return c.multiStore().GetKVStore(key).Gas(c.GasMeter(), cachedTransientGasConfig) } //---------------------------------------- @@ -126,8 +129,8 @@ const ( contextKeyMultiStore contextKey = iota contextKeyBlockHeader contextKeyBlockHeight + contextKeyConsensusParams contextKeyChainID - contextKeyIsCheckTx contextKeyTxBytes contextKeyLogger contextKeySigningValidators @@ -148,12 +151,12 @@ func (c Context) BlockHeader() abci.Header { func (c Context) BlockHeight() int64 { return c.Value(contextKeyBlockHeight).(int64) } +func (c Context) ConsensusParams() abci.ConsensusParams { + return c.Value(contextKeyConsensusParams).(abci.ConsensusParams) +} func (c Context) ChainID() string { return c.Value(contextKeyChainID).(string) } -func (c Context) IsCheckTx() bool { - return c.Value(contextKeyIsCheckTx).(bool) -} func (c Context) TxBytes() []byte { return c.Value(contextKeyTxBytes).([]byte) } @@ -176,12 +179,16 @@ func (c Context) WithBlockHeader(header abci.Header) Context { func (c Context) WithBlockHeight(height int64) Context { return c.withValue(contextKeyBlockHeight, height) } +func (c Context) WithConsensusParams(params *abci.ConsensusParams) Context { + if params == nil { + return c + } + return c.withValue(contextKeyConsensusParams, params). + WithGasMeter(NewGasMeter(params.TxSize.MaxGas)) +} func (c Context) WithChainID(chainID string) Context { return c.withValue(contextKeyChainID, chainID) } -func (c Context) WithIsCheckTx(isCheckTx bool) Context { - return c.withValue(contextKeyIsCheckTx, isCheckTx) -} func (c Context) WithTxBytes(txBytes []byte) Context { return c.withValue(contextKeyTxBytes, txBytes) } diff --git a/types/context_test.go b/types/context_test.go index fb2786cff..b11a774cd 100644 --- a/types/context_test.go +++ b/types/context_test.go @@ -98,3 +98,84 @@ func TestLogContext(t *testing.T) { ctx.Logger().Error("error") require.Equal(t, *logger.logs, []string{"debug", "info", "error"}) } + +type dummy int64 + +func (d dummy) Clone() interface{} { + return d +} + +// Testing saving/loading primitive values to/from the context +func TestContextWithPrimitive(t *testing.T) { + ctx := types.NewContext(nil, abci.Header{}, false, log.NewNopLogger()) + + clonerkey := "cloner" + stringkey := "string" + int32key := "int32" + uint32key := "uint32" + uint64key := "uint64" + + keys := []string{clonerkey, stringkey, int32key, uint32key, uint64key} + + for _, key := range keys { + require.Nil(t, ctx.Value(key)) + } + + clonerval := dummy(1) + stringval := "string" + int32val := int32(1) + uint32val := uint32(2) + uint64val := uint64(3) + + ctx = ctx. + WithCloner(clonerkey, clonerval). + WithString(stringkey, stringval). + WithInt32(int32key, int32val). + WithUint32(uint32key, uint32val). + WithUint64(uint64key, uint64val) + + require.Equal(t, clonerval, ctx.Value(clonerkey)) + require.Equal(t, stringval, ctx.Value(stringkey)) + require.Equal(t, int32val, ctx.Value(int32key)) + require.Equal(t, uint32val, ctx.Value(uint32key)) + require.Equal(t, uint64val, ctx.Value(uint64key)) +} + +// Testing saving/loading sdk type values to/from the context +func TestContextWithCustom(t *testing.T) { + var ctx types.Context + require.True(t, ctx.IsZero()) + + require.Panics(t, func() { ctx.BlockHeader() }) + require.Panics(t, func() { ctx.BlockHeight() }) + require.Panics(t, func() { ctx.ChainID() }) + require.Panics(t, func() { ctx.TxBytes() }) + require.Panics(t, func() { ctx.Logger() }) + require.Panics(t, func() { ctx.SigningValidators() }) + require.Panics(t, func() { ctx.GasMeter() }) + + header := abci.Header{} + height := int64(1) + chainid := "chainid" + ischeck := true + txbytes := []byte("txbytes") + logger := NewMockLogger() + signvals := []abci.SigningValidator{{}} + meter := types.NewGasMeter(10000) + + ctx = types.NewContext(nil, header, ischeck, logger). + WithBlockHeight(height). + WithChainID(chainid). + WithTxBytes(txbytes). + WithSigningValidators(signvals). + WithGasMeter(meter) + + require.Equal(t, header, ctx.BlockHeader()) + require.Equal(t, height, ctx.BlockHeight()) + require.Equal(t, chainid, ctx.ChainID()) + require.Equal(t, txbytes, ctx.TxBytes()) + require.Equal(t, logger, ctx.Logger()) + require.Equal(t, signvals, ctx.SigningValidators()) + require.Equal(t, meter, ctx.GasMeter()) + +} diff --git a/types/errors.go b/types/errors.go index a106ee9bb..58541dfea 100644 --- a/types/errors.go +++ b/types/errors.go @@ -65,6 +65,10 @@ const ( MaximumCodespace CodespaceType = 65535 ) +func unknownCodeMsg(code CodeType) string { + return fmt.Sprintf("unknown code %d", code) +} + // NOTE: Don't stringer this, we'll put better messages in later. // nolint: gocyclo func CodeToDefaultMsg(code CodeType) string { @@ -96,7 +100,7 @@ func CodeToDefaultMsg(code CodeType) string { case CodeMemoTooLarge: return "memo too large" default: - return fmt.Sprintf("unknown code %d", code) + return unknownCodeMsg(code) } } diff --git a/types/errors_test.go b/types/errors_test.go index 959f059d0..e7625e96f 100644 --- a/types/errors_test.go +++ b/types/errors_test.go @@ -1,7 +1,6 @@ package types import ( - "strings" "testing" "github.com/stretchr/testify/require" @@ -14,8 +13,13 @@ var codeTypes = []CodeType{ CodeUnauthorized, CodeInsufficientFunds, CodeUnknownRequest, - CodeUnknownAddress, + CodeInvalidAddress, CodeInvalidPubKey, + CodeUnknownAddress, + CodeInsufficientCoins, + CodeInvalidCoins, + CodeOutOfGas, + CodeMemoTooLarge, } type errFn func(msg string) Error @@ -27,24 +31,34 @@ var errFns = []errFn{ ErrUnauthorized, ErrInsufficientFunds, ErrUnknownRequest, - ErrUnknownAddress, + ErrInvalidAddress, ErrInvalidPubKey, + ErrUnknownAddress, + ErrInsufficientCoins, + ErrInvalidCoins, + ErrOutOfGas, + ErrMemoTooLarge, } func TestCodeType(t *testing.T) { require.True(t, ABCICodeOK.IsOK()) - for _, c := range codeTypes { + for tcnum, c := range codeTypes { msg := CodeToDefaultMsg(c) - require.False(t, strings.HasPrefix(msg, "Unknown code")) + require.NotEqual(t, unknownCodeMsg(c), msg, "Code expected to be known. tc #%d, code %d, msg %s", tcnum, c, msg) } + + msg := CodeToDefaultMsg(CodeOK) + require.Equal(t, unknownCodeMsg(CodeOK), msg) } func TestErrFn(t *testing.T) { for i, errFn := range errFns { err := errFn("") codeType := codeTypes[i] - require.Equal(t, err.Code(), codeType) - require.Equal(t, err.Result().Code, ToABCICode(CodespaceRoot, codeType)) + require.Equal(t, err.Code(), codeType, "Err function expected to return proper code. tc #%d", i) + require.Equal(t, err.Result().Code, ToABCICode(CodespaceRoot, codeType), "Err function expected to return proper ABCICode. tc #%d") } + + require.Equal(t, ABCICodeOK, ToABCICode(CodespaceRoot, CodeOK)) } diff --git a/types/gas.go b/types/gas.go index 18d3aa570..e8486c813 100644 --- a/types/gas.go +++ b/types/gas.go @@ -54,3 +54,40 @@ func (g *infiniteGasMeter) GasConsumed() Gas { func (g *infiniteGasMeter) ConsumeGas(amount Gas, descriptor string) { g.consumed += amount } + +// GasConfig defines gas cost for each operation on KVStores +type GasConfig struct { + HasCost Gas + ReadCostFlat Gas + ReadCostPerByte Gas + WriteCostFlat Gas + WriteCostPerByte Gas + KeyCostFlat Gas + ValueCostFlat Gas + ValueCostPerByte Gas +} + +var ( + cachedDefaultGasConfig = DefaultGasConfig() + cachedTransientGasConfig = TransientGasConfig() +) + +// Default gas config for KVStores +func DefaultGasConfig() GasConfig { + return GasConfig{ + HasCost: 10, + ReadCostFlat: 10, + ReadCostPerByte: 1, + WriteCostFlat: 10, + WriteCostPerByte: 10, + KeyCostFlat: 5, + ValueCostFlat: 10, + ValueCostPerByte: 1, + } +} + +// Default gas config for TransientStores +func TransientGasConfig() GasConfig { + // TODO: define gasconfig for transient stores + return DefaultGasConfig() +} diff --git a/types/gas_test.go b/types/gas_test.go new file mode 100644 index 000000000..cd2384d12 --- /dev/null +++ b/types/gas_test.go @@ -0,0 +1,36 @@ +package types + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestGasMeter(t *testing.T) { + cases := []struct { + limit Gas + usage []Gas + }{ + {10, []Gas{1, 2, 3, 4}}, + {1000, []Gas{40, 30, 20, 10, 900}}, + {100000, []Gas{99999, 1}}, + {100000000, []Gas{50000000, 40000000, 10000000}}, + {65535, []Gas{32768, 32767}}, + {65536, []Gas{32768, 32767, 1}}, + } + + for tcnum, tc := range cases { + meter := NewGasMeter(tc.limit) + used := int64(0) + + for unum, usage := range tc.usage { + used += usage + require.NotPanics(t, func() { meter.ConsumeGas(usage, "") }, "Not exceeded limit but panicked. tc #%d, usage #%d", tcnum, unum) + require.Equal(t, used, meter.GasConsumed(), "Gas consumption not match. tc #%d, usage #%d", tcnum, unum) + } + + require.Panics(t, func() { meter.ConsumeGas(1, "") }, "Exceeded but not panicked. tc #%d", tcnum) + break + + } +} diff --git a/types/int.go b/types/int.go index 0227203cd..1421a934d 100644 --- a/types/int.go +++ b/types/int.go @@ -4,21 +4,13 @@ import ( "encoding/json" "math/big" + "math/rand" ) func newIntegerFromString(s string) (*big.Int, bool) { return new(big.Int).SetString(s, 0) } -func newIntegerWithDecimal(n int64, dec int) (res *big.Int) { - if dec < 0 { - return - } - exp := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(dec)), nil) - i := new(big.Int) - return i.Mul(big.NewInt(n), exp) -} - func equal(i *big.Int, i2 *big.Int) bool { return i.Cmp(i2) == 0 } func gt(i *big.Int, i2 *big.Int) bool { return i.Cmp(i2) == 1 } @@ -37,6 +29,8 @@ func mod(i *big.Int, i2 *big.Int) *big.Int { return new(big.Int).Mod(i, i2) } func neg(i *big.Int) *big.Int { return new(big.Int).Neg(i) } +func random(i *big.Int) *big.Int { return new(big.Int).Rand(rand.New(rand.NewSource(rand.Int63())), i) } + func min(i *big.Int, i2 *big.Int) *big.Int { if i.Cmp(i2) == 1 { return new(big.Int).Set(i2) @@ -118,7 +112,13 @@ func NewIntFromString(s string) (res Int, ok bool) { // NewIntWithDecimal constructs Int with decimal // Result value is n*10^dec func NewIntWithDecimal(n int64, dec int) Int { - i := newIntegerWithDecimal(n, dec) + if dec < 0 { + panic("NewIntWithDecimal() decimal is negative") + } + exp := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(dec)), nil) + i := new(big.Int) + i.Mul(big.NewInt(n), exp) + // Check overflow if i.BitLen() > 255 { panic("NewIntWithDecimal() out of bound") @@ -141,6 +141,11 @@ func (i Int) Int64() int64 { return i.i.Int64() } +// IsInt64 returns true if Int64() not panics +func (i Int) IsInt64() bool { + return i.i.IsInt64() +} + // IsZero returns true if Int is zero func (i Int) IsZero() bool { return i.i.Sign() == 0 @@ -229,6 +234,19 @@ func (i Int) DivRaw(i2 int64) Int { return i.Div(NewInt(i2)) } +// Mod returns remainder after dividing with Int +func (i Int) Mod(i2 Int) Int { + if i2.Sign() == 0 { + panic("division-by-zero") + } + return Int{mod(i.i, i2.i)} +} + +// ModRaw returns remainder after dividing with int64 +func (i Int) ModRaw(i2 int64) Int { + return i.Mod(NewInt(i2)) +} + // Neg negates Int func (i Int) Neg() (res Int) { return Int{neg(i.i)} @@ -239,10 +257,16 @@ func MinInt(i1, i2 Int) Int { return Int{min(i1.BigInt(), i2.BigInt())} } +// Human readable string func (i Int) String() string { return i.i.String() } +// Testing purpose random Int generator +func randomInt(i Int) Int { + return NewIntFromBigInt(random(i.BigInt())) +} + // MarshalAmino defines custom encoding scheme func (i Int) MarshalAmino() (string, error) { if i.i == nil { // Necessary since default Uint initialization has i.i as nil @@ -319,8 +343,14 @@ func NewUintFromString(s string) (res Uint, ok bool) { // NewUintWithDecimal constructs Uint with decimal // Result value is n*10^dec -func NewUintWithDecimal(n int64, dec int) Uint { - i := newIntegerWithDecimal(n, dec) +func NewUintWithDecimal(n uint64, dec int) Uint { + if dec < 0 { + panic("NewUintWithDecimal() decimal is negative") + } + exp := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(dec)), nil) + i := new(big.Int) + i.Mul(new(big.Int).SetUint64(n), exp) + // Check overflow if i.Sign() == -1 || i.Sign() == 1 && i.BitLen() > 256 { panic("NewUintWithDecimal() out of bound") @@ -343,6 +373,11 @@ func (i Uint) Uint64() uint64 { return i.i.Uint64() } +// IsUint64 returns true if Uint64() not panics +func (i Uint) IsUint64() bool { + return i.i.IsUint64() +} + // IsZero returns true if Uint is zero func (i Uint) IsZero() bool { return i.i.Sign() == 0 @@ -378,7 +413,7 @@ func (i Uint) Add(i2 Uint) (res Uint) { return } -// AddRaw adds int64 to Uint +// AddRaw adds uint64 to Uint func (i Uint) AddRaw(i2 uint64) Uint { return i.Add(NewUint(i2)) } @@ -393,7 +428,7 @@ func (i Uint) Sub(i2 Uint) (res Uint) { return } -// SubRaw subtracts int64 from Uint +// SubRaw subtracts uint64 from Uint func (i Uint) SubRaw(i2 uint64) Uint { return i.Sub(NewUint(i2)) } @@ -412,7 +447,7 @@ func (i Uint) Mul(i2 Uint) (res Uint) { return } -// MulRaw multipies Uint and int64 +// MulRaw multipies Uint and uint64 func (i Uint) MulRaw(i2 uint64) Uint { return i.Mul(NewUint(i2)) } @@ -426,16 +461,39 @@ func (i Uint) Div(i2 Uint) (res Uint) { return Uint{div(i.i, i2.i)} } -// Div divides Uint with int64 +// Div divides Uint with uint64 func (i Uint) DivRaw(i2 uint64) Uint { return i.Div(NewUint(i2)) } +// Mod returns remainder after dividing with Uint +func (i Uint) Mod(i2 Uint) Uint { + if i2.Sign() == 0 { + panic("division-by-zero") + } + return Uint{mod(i.i, i2.i)} +} + +// ModRaw returns remainder after dividing with uint64 +func (i Uint) ModRaw(i2 uint64) Uint { + return i.Mod(NewUint(i2)) +} + // Return the minimum of the Uints func MinUint(i1, i2 Uint) Uint { return Uint{min(i1.BigInt(), i2.BigInt())} } +// Human readable string +func (i Uint) String() string { + return i.i.String() +} + +// Testing purpose random Uint generator +func randomUint(i Uint) Uint { + return NewUintFromBigInt(random(i.BigInt())) +} + // MarshalAmino defines custom encoding scheme func (i Uint) MarshalAmino() (string, error) { if i.i == nil { // Necessary since default Uint initialization has i.i as nil diff --git a/types/int_test.go b/types/int_test.go index e81bd6d7e..cd357c4f7 100644 --- a/types/int_test.go +++ b/types/int_test.go @@ -1,8 +1,10 @@ package types import ( + "math" "math/big" "math/rand" + "strconv" "testing" "github.com/stretchr/testify/require" @@ -15,7 +17,7 @@ func TestFromInt64(t *testing.T) { } } -func TestInt(t *testing.T) { +func TestIntPanic(t *testing.T) { // Max Int = 2^255-1 = 5.789e+76 // Min Int = -(2^255-1) = -5.789e+76 require.NotPanics(t, func() { NewIntWithDecimal(1, 76) }) @@ -71,7 +73,7 @@ func TestInt(t *testing.T) { require.Panics(t, func() { i1.Div(NewInt(0)) }) } -func TestUint(t *testing.T) { +func TestUintPanic(t *testing.T) { // Max Uint = 1.15e+77 // Min Uint = 0 require.NotPanics(t, func() { NewUintWithDecimal(5, 76) }) @@ -109,3 +111,482 @@ func TestUint(t *testing.T) { // Division-by-zero check require.Panics(t, func() { i1.Div(uintmin) }) } + +// Tests below uses randomness +// Since we are using *big.Int as underlying value +// and (U/)Int is immutable value(see TestImmutability(U/)Int) +// it is safe to use randomness in the tests +func TestIdentInt(t *testing.T) { + for d := 0; d < 1000; d++ { + n := rand.Int63() + i := NewInt(n) + + ifromstr, ok := NewIntFromString(strconv.FormatInt(n, 10)) + require.True(t, ok) + + cases := []int64{ + i.Int64(), + i.BigInt().Int64(), + ifromstr.Int64(), + NewIntFromBigInt(big.NewInt(n)).Int64(), + NewIntWithDecimal(n, 0).Int64(), + } + + for tcnum, tc := range cases { + require.Equal(t, n, tc, "Int is modified during conversion. tc #%d", tcnum) + } + } +} + +func minint(i1, i2 int64) int64 { + if i1 < i2 { + return i1 + } + return i2 +} + +func TestArithInt(t *testing.T) { + for d := 0; d < 1000; d++ { + n1 := int64(rand.Int31()) + i1 := NewInt(n1) + n2 := int64(rand.Int31()) + i2 := NewInt(n2) + + cases := []struct { + ires Int + nres int64 + }{ + {i1.Add(i2), n1 + n2}, + {i1.Sub(i2), n1 - n2}, + {i1.Mul(i2), n1 * n2}, + {i1.Div(i2), n1 / n2}, + {i1.AddRaw(n2), n1 + n2}, + {i1.SubRaw(n2), n1 - n2}, + {i1.MulRaw(n2), n1 * n2}, + {i1.DivRaw(n2), n1 / n2}, + {MinInt(i1, i2), minint(n1, n2)}, + {i1.Neg(), -n1}, + } + + for tcnum, tc := range cases { + require.Equal(t, tc.nres, tc.ires.Int64(), "Int arithmetic operation does not match with int64 operation. tc #%d", tcnum) + } + } + +} + +func TestCompInt(t *testing.T) { + for d := 0; d < 1000; d++ { + n1 := int64(rand.Int31()) + i1 := NewInt(n1) + n2 := int64(rand.Int31()) + i2 := NewInt(n2) + + cases := []struct { + ires bool + nres bool + }{ + {i1.Equal(i2), n1 == n2}, + {i1.GT(i2), n1 > n2}, + {i1.LT(i2), n1 < n2}, + } + + for tcnum, tc := range cases { + require.Equal(t, tc.nres, tc.ires, "Int comparison operation does not match with int64 operation. tc #%d", tcnum) + } + } +} + +func TestIdentUint(t *testing.T) { + for d := 0; d < 1000; d++ { + n := rand.Uint64() + i := NewUint(n) + + ifromstr, ok := NewUintFromString(strconv.FormatUint(n, 10)) + require.True(t, ok) + + cases := []uint64{ + i.Uint64(), + i.BigInt().Uint64(), + ifromstr.Uint64(), + NewUintFromBigInt(new(big.Int).SetUint64(n)).Uint64(), + NewUintWithDecimal(n, 0).Uint64(), + } + + for tcnum, tc := range cases { + require.Equal(t, n, tc, "Uint is modified during conversion. tc #%d", tcnum) + } + } +} + +func minuint(i1, i2 uint64) uint64 { + if i1 < i2 { + return i1 + } + return i2 +} + +func TestArithUint(t *testing.T) { + for d := 0; d < 1000; d++ { + n1 := uint64(rand.Uint32()) + i1 := NewUint(n1) + n2 := uint64(rand.Uint32()) + i2 := NewUint(n2) + + cases := []struct { + ires Uint + nres uint64 + }{ + {i1.Add(i2), n1 + n2}, + {i1.Mul(i2), n1 * n2}, + {i1.Div(i2), n1 / n2}, + {i1.AddRaw(n2), n1 + n2}, + {i1.MulRaw(n2), n1 * n2}, + {i1.DivRaw(n2), n1 / n2}, + {MinUint(i1, i2), minuint(n1, n2)}, + } + + for tcnum, tc := range cases { + require.Equal(t, tc.nres, tc.ires.Uint64(), "Uint arithmetic operation does not match with uint64 operation. tc #%d", tcnum) + } + + if n2 > n1 { + continue + } + + subs := []struct { + ires Uint + nres uint64 + }{ + {i1.Sub(i2), n1 - n2}, + {i1.SubRaw(n2), n1 - n2}, + } + + for tcnum, tc := range subs { + require.Equal(t, tc.nres, tc.ires.Uint64(), "Uint subtraction does not match with uint64 operation. tc #%d", tcnum) + } + } +} + +func TestCompUint(t *testing.T) { + for d := 0; d < 1000; d++ { + n1 := rand.Uint64() + i1 := NewUint(n1) + n2 := rand.Uint64() + i2 := NewUint(n2) + + cases := []struct { + ires bool + nres bool + }{ + {i1.Equal(i2), n1 == n2}, + {i1.GT(i2), n1 > n2}, + {i1.LT(i2), n1 < n2}, + } + + for tcnum, tc := range cases { + require.Equal(t, tc.nres, tc.ires, "Uint comparison operation does not match with uint64 operation. tc #%d", tcnum) + } + } +} + +func randint() Int { + return NewInt(rand.Int63()) +} + +func TestImmutabilityAllInt(t *testing.T) { + ops := []func(*Int){ + func(i *Int) { _ = i.Add(randint()) }, + func(i *Int) { _ = i.Sub(randint()) }, + func(i *Int) { _ = i.Mul(randint()) }, + func(i *Int) { _ = i.Div(randint()) }, + func(i *Int) { _ = i.AddRaw(rand.Int63()) }, + func(i *Int) { _ = i.SubRaw(rand.Int63()) }, + func(i *Int) { _ = i.MulRaw(rand.Int63()) }, + func(i *Int) { _ = i.DivRaw(rand.Int63()) }, + func(i *Int) { _ = i.Neg() }, + func(i *Int) { _ = i.IsZero() }, + func(i *Int) { _ = i.Sign() }, + func(i *Int) { _ = i.Equal(randint()) }, + func(i *Int) { _ = i.GT(randint()) }, + func(i *Int) { _ = i.LT(randint()) }, + func(i *Int) { _ = i.String() }, + } + + for i := 0; i < 1000; i++ { + n := rand.Int63() + ni := NewInt(n) + + for opnum, op := range ops { + op(&ni) + + require.Equal(t, n, ni.Int64(), "Int is modified by operation. tc #%d", opnum) + require.Equal(t, NewInt(n), ni, "Int is modified by operation. tc #%d", opnum) + } + } +} + +type intop func(Int, *big.Int) (Int, *big.Int) + +func intarith(uifn func(Int, Int) Int, bifn func(*big.Int, *big.Int, *big.Int) *big.Int) intop { + return func(ui Int, bi *big.Int) (Int, *big.Int) { + r := rand.Int63() + br := new(big.Int).SetInt64(r) + return uifn(ui, NewInt(r)), bifn(new(big.Int), bi, br) + } +} + +func intarithraw(uifn func(Int, int64) Int, bifn func(*big.Int, *big.Int, *big.Int) *big.Int) intop { + return func(ui Int, bi *big.Int) (Int, *big.Int) { + r := rand.Int63() + br := new(big.Int).SetInt64(r) + return uifn(ui, r), bifn(new(big.Int), bi, br) + } +} + +func TestImmutabilityArithInt(t *testing.T) { + size := 500 + + ops := []intop{ + intarith(Int.Add, (*big.Int).Add), + intarith(Int.Sub, (*big.Int).Sub), + intarith(Int.Mul, (*big.Int).Mul), + intarith(Int.Div, (*big.Int).Div), + intarithraw(Int.AddRaw, (*big.Int).Add), + intarithraw(Int.SubRaw, (*big.Int).Sub), + intarithraw(Int.MulRaw, (*big.Int).Mul), + intarithraw(Int.DivRaw, (*big.Int).Div), + } + + for i := 0; i < 100; i++ { + uis := make([]Int, size) + bis := make([]*big.Int, size) + + n := rand.Int63() + ui := NewInt(n) + bi := new(big.Int).SetInt64(n) + + for j := 0; j < size; j++ { + op := ops[rand.Intn(len(ops))] + uis[j], bis[j] = op(ui, bi) + } + + for j := 0; j < size; j++ { + require.Equal(t, 0, bis[j].Cmp(uis[j].BigInt()), "Int is different from *big.Int. tc #%d, Int %s, *big.Int %s", j, uis[j].String(), bis[j].String()) + require.Equal(t, NewIntFromBigInt(bis[j]), uis[j], "Int is different from *big.Int. tc #%d, Int %s, *big.Int %s", j, uis[j].String(), bis[j].String()) + require.True(t, uis[j].i != bis[j], "Pointer addresses are equal. tc #%d, Int %s, *big.Int %s", j, uis[j].String(), bis[j].String()) + } + } +} +func TestImmutabilityAllUint(t *testing.T) { + ops := []func(*Uint){ + func(i *Uint) { _ = i.Add(NewUint(rand.Uint64())) }, + func(i *Uint) { _ = i.Sub(NewUint(rand.Uint64() % i.Uint64())) }, + func(i *Uint) { _ = i.Mul(randuint()) }, + func(i *Uint) { _ = i.Div(randuint()) }, + func(i *Uint) { _ = i.AddRaw(rand.Uint64()) }, + func(i *Uint) { _ = i.SubRaw(rand.Uint64() % i.Uint64()) }, + func(i *Uint) { _ = i.MulRaw(rand.Uint64()) }, + func(i *Uint) { _ = i.DivRaw(rand.Uint64()) }, + func(i *Uint) { _ = i.IsZero() }, + func(i *Uint) { _ = i.Sign() }, + func(i *Uint) { _ = i.Equal(randuint()) }, + func(i *Uint) { _ = i.GT(randuint()) }, + func(i *Uint) { _ = i.LT(randuint()) }, + func(i *Uint) { _ = i.String() }, + } + + for i := 0; i < 1000; i++ { + n := rand.Uint64() + ni := NewUint(n) + + for opnum, op := range ops { + op(&ni) + + require.Equal(t, n, ni.Uint64(), "Uint is modified by operation. #%d", opnum) + require.Equal(t, NewUint(n), ni, "Uint is modified by operation. #%d", opnum) + } + } +} + +type uintop func(Uint, *big.Int) (Uint, *big.Int) + +func uintarith(uifn func(Uint, Uint) Uint, bifn func(*big.Int, *big.Int, *big.Int) *big.Int, sub bool) uintop { + return func(ui Uint, bi *big.Int) (Uint, *big.Int) { + r := rand.Uint64() + if sub && ui.IsUint64() { + if ui.IsZero() { + return ui, bi + } + r = r % ui.Uint64() + } + ur := NewUint(r) + br := new(big.Int).SetUint64(r) + return uifn(ui, ur), bifn(new(big.Int), bi, br) + } +} + +func uintarithraw(uifn func(Uint, uint64) Uint, bifn func(*big.Int, *big.Int, *big.Int) *big.Int, sub bool) uintop { + return func(ui Uint, bi *big.Int) (Uint, *big.Int) { + r := rand.Uint64() + if sub && ui.IsUint64() { + if ui.IsZero() { + return ui, bi + } + r = r % ui.Uint64() + } + br := new(big.Int).SetUint64(r) + mui := ui.ModRaw(math.MaxUint64) + mbi := new(big.Int).Mod(bi, new(big.Int).SetUint64(math.MaxUint64)) + return uifn(mui, r), bifn(new(big.Int), mbi, br) + } +} + +func TestImmutabilityArithUint(t *testing.T) { + size := 500 + + ops := []uintop{ + uintarith(Uint.Add, (*big.Int).Add, false), + uintarith(Uint.Sub, (*big.Int).Sub, true), + uintarith(Uint.Mul, (*big.Int).Mul, false), + uintarith(Uint.Div, (*big.Int).Div, false), + uintarithraw(Uint.AddRaw, (*big.Int).Add, false), + uintarithraw(Uint.SubRaw, (*big.Int).Sub, true), + uintarithraw(Uint.MulRaw, (*big.Int).Mul, false), + uintarithraw(Uint.DivRaw, (*big.Int).Div, false), + } + + for i := 0; i < 100; i++ { + uis := make([]Uint, size) + bis := make([]*big.Int, size) + + n := rand.Uint64() + ui := NewUint(n) + bi := new(big.Int).SetUint64(n) + + for j := 0; j < size; j++ { + op := ops[rand.Intn(len(ops))] + uis[j], bis[j] = op(ui, bi) + } + + for j := 0; j < size; j++ { + require.Equal(t, 0, bis[j].Cmp(uis[j].BigInt()), "Int is different from *big.Int. tc #%d, Int %s, *big.Int %s", j, uis[j].String(), bis[j].String()) + require.Equal(t, NewUintFromBigInt(bis[j]), uis[j], "Int is different from *big.Int. tc #%d, Int %s, *big.Int %s", j, uis[j].String(), bis[j].String()) + require.True(t, uis[j].i != bis[j], "Pointer addresses are equal. tc #%d, Int %s, *big.Int %s", j, uis[j].String(), bis[j].String()) + } + } +} + +func randuint() Uint { + return NewUint(rand.Uint64()) +} + +func TestEncodingRandom(t *testing.T) { + for i := 0; i < 1000; i++ { + n := rand.Int63() + ni := NewInt(n) + var ri Int + + str, err := ni.MarshalAmino() + require.Nil(t, err) + err = (&ri).UnmarshalAmino(str) + require.Nil(t, err) + + require.Equal(t, ni, ri, "MarshalAmino * UnmarshalAmino is not identity. tc #%d, Expected %s, Actual %s", i, ni.String(), ri.String()) + require.True(t, ni.i != ri.i, "Pointer addresses are equal. tc #%d", i) + + bz, err := ni.MarshalJSON() + require.Nil(t, err) + err = (&ri).UnmarshalJSON(bz) + require.Nil(t, err) + + require.Equal(t, ni, ri, "MarshalJSON * UnmarshalJSON is not identity. tc #%d, Expected %s, Actual %s", i, ni.String(), ri.String()) + require.True(t, ni.i != ri.i, "Pointer addresses are equal. tc #%d", i) + } + + for i := 0; i < 1000; i++ { + n := rand.Uint64() + ni := NewUint(n) + var ri Uint + + str, err := ni.MarshalAmino() + require.Nil(t, err) + err = (&ri).UnmarshalAmino(str) + require.Nil(t, err) + + require.Equal(t, ni, ri, "MarshalAmino * UnmarshalAmino is not identity. tc #%d, Expected %s, Actual %s", i, ni.String(), ri.String()) + require.True(t, ni.i != ri.i, "Pointer addresses are equal. tc #%d", i) + + bz, err := ni.MarshalJSON() + require.Nil(t, err) + err = (&ri).UnmarshalJSON(bz) + require.Nil(t, err) + + require.Equal(t, ni, ri, "MarshalJSON * UnmarshalJSON is not identity. tc #%d, Expected %s, Actual %s", i, ni.String(), ri.String()) + require.True(t, ni.i != ri.i, "Pointer addresses are equal. tc #%d", i) + } +} + +func TestEncodingTableInt(t *testing.T) { + var i Int + + cases := []struct { + i Int + bz []byte + str string + }{ + {NewInt(0), []byte("\"0\""), "0"}, + {NewInt(100), []byte("\"100\""), "100"}, + {NewInt(51842), []byte("\"51842\""), "51842"}, + {NewInt(19513368), []byte("\"19513368\""), "19513368"}, + {NewInt(999999999999), []byte("\"999999999999\""), "999999999999"}, + } + + for tcnum, tc := range cases { + bz, err := tc.i.MarshalJSON() + require.Nil(t, err, "Error marshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.bz, bz, "Marshaled value is different from expected. tc #%d", tcnum) + err = (&i).UnmarshalJSON(bz) + require.Nil(t, err, "Error unmarshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.i, i, "Unmarshaled value is different from expected. tc #%d", tcnum) + + str, err := tc.i.MarshalAmino() + require.Nil(t, err, "Error marshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.str, str, "Marshaled value is different from expected. tc #%d", tcnum) + err = (&i).UnmarshalAmino(str) + require.Nil(t, err, "Error unmarshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.i, i, "Unmarshaled value is different from expected. tc #%d", tcnum) + } +} + +func TestEncodingTableUint(t *testing.T) { + var i Uint + + cases := []struct { + i Uint + bz []byte + str string + }{ + {NewUint(0), []byte("\"0\""), "0"}, + {NewUint(100), []byte("\"100\""), "100"}, + {NewUint(51842), []byte("\"51842\""), "51842"}, + {NewUint(19513368), []byte("\"19513368\""), "19513368"}, + {NewUint(999999999999), []byte("\"999999999999\""), "999999999999"}, + } + + for tcnum, tc := range cases { + bz, err := tc.i.MarshalJSON() + require.Nil(t, err, "Error marshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.bz, bz, "Marshaled value is different from expected. tc #%d", tcnum) + err = (&i).UnmarshalJSON(bz) + require.Nil(t, err, "Error unmarshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.i, i, "Unmarshaled value is different from expected. tc #%d", tcnum) + + str, err := tc.i.MarshalAmino() + require.Nil(t, err, "Error marshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.str, str, "Marshaled value is different from expected. tc #%d", tcnum) + err = (&i).UnmarshalAmino(str) + require.Nil(t, err, "Error unmarshaling Int. tc #%d, err %s", tcnum, err) + require.Equal(t, tc.i, i, "Unmarshaled value is different from expected. tc #%d", tcnum) + } +} diff --git a/types/lib/linear_test.go b/types/lib/linear_test.go index b14300a98..2b5a6c405 100644 --- a/types/lib/linear_test.go +++ b/types/lib/linear_test.go @@ -31,6 +31,18 @@ func defaultComponents(key sdk.StoreKey) (sdk.Context, *wire.Codec) { return ctx, cdc } +func TestNewLinear(t *testing.T) { + cdc := wire.NewCodec() + require.NotPanics(t, func() { NewLinear(cdc, nil, nil) }) + require.NotPanics(t, func() { NewLinear(cdc, nil, DefaultLinearKeys()) }) + require.NotPanics(t, func() { NewLinear(cdc, nil, &LinearKeys{[]byte{0xAA}, []byte{0xBB}, []byte{0xCC}}) }) + + require.Panics(t, func() { NewLinear(cdc, nil, &LinearKeys{nil, nil, nil}) }) + require.Panics(t, func() { NewLinear(cdc, nil, &LinearKeys{[]byte{0xAA}, nil, nil}) }) + require.Panics(t, func() { NewLinear(cdc, nil, &LinearKeys{nil, []byte{0xBB}, nil}) }) + require.Panics(t, func() { NewLinear(cdc, nil, &LinearKeys{nil, nil, []byte{0xCC}}) }) +} + func TestList(t *testing.T) { key := sdk.NewKVStoreKey("test") ctx, cdc := defaultComponents(key) diff --git a/types/rational.go b/types/rational.go index cb07bf543..89cc76968 100644 --- a/types/rational.go +++ b/types/rational.go @@ -234,7 +234,7 @@ func (r *Rat) UnmarshalAmino(text string) (err error) { //___________________________________________________________________________________ // helpers -// test if two rat arrays are the equal +// test if two rat arrays are equal func RatsEqual(r1s, r2s []Rat) bool { if len(r1s) != len(r2s) { return false diff --git a/types/rational_test.go b/types/rational_test.go index ecbc09e88..940de23dc 100644 --- a/types/rational_test.go +++ b/types/rational_test.go @@ -2,6 +2,7 @@ package types import ( "math/big" + "math/rand" "testing" wire "github.com/cosmos/cosmos-sdk/wire" @@ -48,22 +49,22 @@ func TestNewFromDecimal(t *testing.T) { {"0.foobar.", true, Rat{}}, } - for _, tc := range tests { + for tcIndex, tc := range tests { res, err := NewRatFromDecimal(tc.decimalStr, 4) if tc.expErr { - require.NotNil(t, err, tc.decimalStr) + require.NotNil(t, err, tc.decimalStr, "error expected, tc #%d", tcIndex) } else { - require.Nil(t, err, tc.decimalStr) - require.True(t, res.Equal(tc.exp), tc.decimalStr) + require.Nil(t, err, tc.decimalStr, "unexpected error, tc #%d", tcIndex) + require.True(t, res.Equal(tc.exp), tc.decimalStr, "equality was incorrect, tc #%d", tcIndex) } // negative tc res, err = NewRatFromDecimal("-"+tc.decimalStr, 4) if tc.expErr { - require.NotNil(t, err, tc.decimalStr) + require.NotNil(t, err, tc.decimalStr, "error expected (negative case), tc #%d", tcIndex) } else { - require.Nil(t, err, tc.decimalStr) - require.True(t, res.Equal(tc.exp.Mul(NewRat(-1))), tc.decimalStr) + require.Nil(t, err, tc.decimalStr, "unexpected error (negative case), tc #%d", tcIndex) + require.True(t, res.Equal(tc.exp.Mul(NewRat(-1))), tc.decimalStr, "equality was incorrect (negative case), tc #%d", tcIndex) } } } @@ -99,10 +100,10 @@ func TestEqualities(t *testing.T) { {NewRat(-1, 7), NewRat(-3, 7), true, false, false}, } - for _, tc := range tests { - require.Equal(t, tc.gt, tc.r1.GT(tc.r2)) - require.Equal(t, tc.lt, tc.r1.LT(tc.r2)) - require.Equal(t, tc.eq, tc.r1.Equal(tc.r2)) + for tcIndex, tc := range tests { + require.Equal(t, tc.gt, tc.r1.GT(tc.r2), "GT result is incorrect, tc #%d", tcIndex) + require.Equal(t, tc.lt, tc.r1.LT(tc.r2), "LT result is incorrect, tc #%d", tcIndex) + require.Equal(t, tc.eq, tc.r1.Equal(tc.r2), "equality result is incorrect, tc #%d", tcIndex) } } @@ -135,15 +136,15 @@ func TestArithmetic(t *testing.T) { {NewRat(100), NewRat(1, 7), NewRat(100, 7), NewRat(700), NewRat(701, 7), NewRat(699, 7)}, } - for _, tc := range tests { - require.True(t, tc.resMul.Equal(tc.r1.Mul(tc.r2)), "r1 %v, r2 %v", tc.r1.Rat, tc.r2.Rat) - require.True(t, tc.resAdd.Equal(tc.r1.Add(tc.r2)), "r1 %v, r2 %v", tc.r1.Rat, tc.r2.Rat) - require.True(t, tc.resSub.Equal(tc.r1.Sub(tc.r2)), "r1 %v, r2 %v", tc.r1.Rat, tc.r2.Rat) + for tcIndex, tc := range tests { + require.True(t, tc.resMul.Equal(tc.r1.Mul(tc.r2)), "r1 %v, r2 %v. tc #%d", tc.r1.Rat, tc.r2.Rat, tcIndex) + require.True(t, tc.resAdd.Equal(tc.r1.Add(tc.r2)), "r1 %v, r2 %v. tc #%d", tc.r1.Rat, tc.r2.Rat, tcIndex) + require.True(t, tc.resSub.Equal(tc.r1.Sub(tc.r2)), "r1 %v, r2 %v. tc #%d", tc.r1.Rat, tc.r2.Rat, tcIndex) if tc.r2.Num().IsZero() { // panic for divide by zero require.Panics(t, func() { tc.r1.Quo(tc.r2) }) } else { - require.True(t, tc.resDiv.Equal(tc.r1.Quo(tc.r2)), "r1 %v, r2 %v", tc.r1.Rat, tc.r2.Rat) + require.True(t, tc.resDiv.Equal(tc.r1.Quo(tc.r2)), "r1 %v, r2 %v. tc #%d", tc.r1.Rat, tc.r2.Rat, tcIndex) } } } @@ -168,9 +169,9 @@ func TestEvaluate(t *testing.T) { {NewRat(113, 12), 9}, } - for _, tc := range tests { - require.Equal(t, tc.res, tc.r1.RoundInt64(), "%v", tc.r1) - require.Equal(t, tc.res*-1, tc.r1.Mul(NewRat(-1)).RoundInt64(), "%v", tc.r1.Mul(NewRat(-1))) + for tcIndex, tc := range tests { + require.Equal(t, tc.res, tc.r1.RoundInt64(), "%v. tc #%d", tc.r1, tcIndex) + require.Equal(t, tc.res*-1, tc.r1.Mul(NewRat(-1)).RoundInt64(), "%v. tc #%d", tc.r1.Mul(NewRat(-1)), tcIndex) } } @@ -192,10 +193,10 @@ func TestRound(t *testing.T) { {NewRat(1, 2), NewRat(1, 2), 1000}, } - for _, tc := range tests { - require.Equal(t, tc.res, tc.r.Round(tc.precFactor), "%v", tc.r) + for tcIndex, tc := range tests { + require.Equal(t, tc.res, tc.r.Round(tc.precFactor), "%v", tc.r, "incorrect rounding, tc #%d", tcIndex) negR1, negRes := tc.r.Mul(NewRat(-1)), tc.res.Mul(NewRat(-1)) - require.Equal(t, negRes, negR1.Round(tc.precFactor), "%v", negR1) + require.Equal(t, negRes, negR1.Round(tc.precFactor), "%v", negR1, "incorrect rounding (negative case), tc #%d", tcIndex) } } @@ -211,8 +212,8 @@ func TestToLeftPadded(t *testing.T) { {NewRat(1000, 3), 8, "00000333"}, {NewRat(1000, 3), 12, "000000000333"}, } - for _, tc := range tests { - require.Equal(t, tc.res, tc.rat.ToLeftPadded(tc.digits)) + for tcIndex, tc := range tests { + require.Equal(t, tc.res, tc.rat.ToLeftPadded(tc.digits), "incorrect left padding, tc #%d", tcIndex) } } @@ -296,11 +297,13 @@ func TestRatsEqual(t *testing.T) { {[]Rat{NewRat(1), NewRat(0)}, []Rat{NewRat(1), NewRat(0)}, true}, {[]Rat{NewRat(1), NewRat(0)}, []Rat{NewRat(0), NewRat(1)}, false}, {[]Rat{NewRat(1), NewRat(0)}, []Rat{NewRat(1)}, false}, + {[]Rat{NewRat(1), NewRat(2)}, []Rat{NewRat(2), NewRat(4)}, false}, + {[]Rat{NewRat(3), NewRat(18)}, []Rat{NewRat(1), NewRat(6)}, false}, } - for _, tc := range tests { - require.Equal(t, tc.eq, RatsEqual(tc.r1s, tc.r2s)) - require.Equal(t, tc.eq, RatsEqual(tc.r2s, tc.r1s)) + for tcIndex, tc := range tests { + require.Equal(t, tc.eq, RatsEqual(tc.r1s, tc.r2s), "equality of rational arrays is incorrect, tc #%d", tcIndex) + require.Equal(t, tc.eq, RatsEqual(tc.r2s, tc.r1s), "equality of rational arrays is incorrect (converse), tc #%d", tcIndex) } } @@ -315,3 +318,85 @@ func TestStringOverflow(t *testing.T) { rat3.String(), ) } + +// Tests below uses randomness +// Since we are using *big.Rat as underlying value +// and (U/)Int is immutable value(see TestImmutability(U/)Int) +// it is safe to use randomness in the tests +func TestArithRat(t *testing.T) { + for i := 0; i < 20; i++ { + n1 := NewInt(int64(rand.Int31())) + d1 := NewInt(int64(rand.Int31())) + rat1 := NewRatFromInt(n1, d1) + + n2 := NewInt(int64(rand.Int31())) + d2 := NewInt(int64(rand.Int31())) + rat2 := NewRatFromInt(n2, d2) + + n1d2 := n1.Mul(d2) + n2d1 := n2.Mul(d1) + + cases := []struct { + nres Int + dres Int + rres Rat + }{ + {n1d2.Add(n2d1), d1.Mul(d2), rat1.Add(rat2)}, + {n1d2.Sub(n2d1), d1.Mul(d2), rat1.Sub(rat2)}, + {n1.Mul(n2), d1.Mul(d2), rat1.Mul(rat2)}, + {n1d2, n2d1, rat1.Quo(rat2)}, + } + + for _, tc := range cases { + require.Equal(t, NewRatFromInt(tc.nres, tc.dres), tc.rres) + } + } +} + +func TestCompRat(t *testing.T) { + for i := 0; i < 20; i++ { + n1 := NewInt(int64(rand.Int31())) + d1 := NewInt(int64(rand.Int31())) + rat1 := NewRatFromInt(n1, d1) + + n2 := NewInt(int64(rand.Int31())) + d2 := NewInt(int64(rand.Int31())) + rat2 := NewRatFromInt(n2, d2) + + n1d2 := n1.Mul(d2) + n2d1 := n2.Mul(d1) + + cases := []struct { + ires bool + rres bool + }{ + {n1d2.Equal(n2d1), rat1.Equal(rat2)}, + {n1d2.GT(n2d1), rat1.GT(rat2)}, + {n1d2.LT(n2d1), rat1.LT(rat2)}, + {n1d2.GT(n2d1) || n1d2.Equal(n2d1), rat1.GTE(rat2)}, + {n1d2.LT(n2d1) || n1d2.Equal(n2d1), rat1.LTE(rat2)}, + } + + for _, tc := range cases { + require.Equal(t, tc.ires, tc.rres) + } + } +} + +func TestImmutabilityRat(t *testing.T) { + for i := 0; i < 20; i++ { + n := int64(rand.Int31()) + r := NewRat(n) + z := ZeroRat() + o := OneRat() + + r.Add(z) + r.Sub(z) + r.Mul(o) + r.Quo(o) + + require.Equal(t, n, r.RoundInt64()) + require.True(t, NewRat(n).Equal(r)) + } + +} diff --git a/types/result_test.go b/types/result_test.go new file mode 100644 index 000000000..e0305932c --- /dev/null +++ b/types/result_test.go @@ -0,0 +1,18 @@ +package types + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestResult(t *testing.T) { + var res Result + require.True(t, res.IsOK()) + + res.Data = []byte("data") + require.True(t, res.IsOK()) + + res.Code = ABCICodeType(1) + require.False(t, res.IsOK()) +} diff --git a/types/stake.go b/types/stake.go index c5e03e0d7..f611a2b51 100644 --- a/types/stake.go +++ b/types/stake.go @@ -43,6 +43,7 @@ type Validator interface { GetOwner() AccAddress // owner AccAddress to receive/return validators coins GetPubKey() crypto.PubKey // validation pubkey GetPower() Rat // validation power + GetTokens() Rat // validation tokens GetDelegatorShares() Rat // Total out standing delegator shares GetBondHeight() int64 // height in which the validator became active } @@ -50,8 +51,9 @@ type Validator interface { // validator which fulfills abci validator interface for use in Tendermint func ABCIValidator(v Validator) abci.Validator { return abci.Validator{ - PubKey: tmtypes.TM2PB.PubKey(v.GetPubKey()), - Power: v.GetPower().RoundInt64(), + PubKey: tmtypes.TM2PB.PubKey(v.GetPubKey()), + Address: v.GetPubKey().Address(), + Power: v.GetPower().RoundInt64(), } } diff --git a/types/store.go b/types/store.go index e8fe9067a..e895b24c9 100644 --- a/types/store.go +++ b/types/store.go @@ -65,7 +65,6 @@ type MultiStore interface { //nolint // Convenience for fetching substores. GetStore(StoreKey) Store GetKVStore(StoreKey) KVStore - GetKVStoreWithGas(GasMeter, StoreKey) KVStore // TracingEnabled returns if tracing is enabled for the MultiStore. TracingEnabled() bool @@ -134,9 +133,6 @@ type KVStore interface { // Delete deletes the key. Panics on nil key. Delete(key []byte) - // Prefix applied keys with the argument - Prefix(prefix []byte) KVStore - // Iterator over a domain of keys in ascending order. End is exclusive. // Start must be less than end, or the Iterator is invalid. // Iterator must be closed by caller. @@ -155,6 +151,16 @@ type KVStore interface { // TODO Not yet implemented. // GetSubKVStore(key *storeKey) KVStore + + // Prefix applied keys with the argument + // CONTRACT: when Prefix is called on a KVStore more than once, + // the concatanation of the prefixes is applied + Prefix(prefix []byte) KVStore + + // Gas consuming store + // CONTRACT: when Gas is called on a KVStore more than once, + // the concatanation of the meters/configs is applied + Gas(GasMeter, GasConfig) KVStore } // Alias iterator to db's Iterator for convenience. @@ -186,11 +192,6 @@ type CommitKVStore interface { KVStore } -// Wrapper for StoreKeys to get KVStores -type KVStoreGetter interface { - KVStore(Context) KVStore -} - //---------------------------------------- // CacheWrap @@ -245,7 +246,7 @@ const ( StoreTypeMulti StoreType = iota StoreTypeDB StoreTypeIAVL - StoreTypePrefix + StoreTypeTransient ) //---------------------------------------- @@ -279,11 +280,6 @@ func (key *KVStoreKey) String() string { return fmt.Sprintf("KVStoreKey{%p, %s}", key, key.name) } -// Implements KVStoreGetter -func (key *KVStoreKey) KVStore(ctx Context) KVStore { - return ctx.KVStore(key) -} - // PrefixEndBytes returns the []byte that would end a // range query for all []byte with a certain prefix // Deals with last byte of prefix being FF without overflowing @@ -310,19 +306,27 @@ func PrefixEndBytes(prefix []byte) []byte { return end } -// Getter struct for prefixed stores -type PrefixStoreGetter struct { - key StoreKey - prefix []byte +// TransientStoreKey is used for indexing transient stores in a MultiStore +type TransientStoreKey struct { + name string } -func NewPrefixStoreGetter(key StoreKey, prefix []byte) PrefixStoreGetter { - return PrefixStoreGetter{key, prefix} +// Constructs new TransientStoreKey +// Must return a pointer according to the ocap principle +func NewTransientStoreKey(name string) *TransientStoreKey { + return &TransientStoreKey{ + name: name, + } } -// Implements sdk.KVStoreGetter -func (getter PrefixStoreGetter) KVStore(ctx Context) KVStore { - return ctx.KVStore(getter.key).Prefix(getter.prefix) +// Implements StoreKey +func (key *TransientStoreKey) Name() string { + return key.name +} + +// Implements StoreKey +func (key *TransientStoreKey) String() string { + return fmt.Sprintf("TransientStoreKey{%p, %s}", key, key.name) } //---------------------------------------- diff --git a/types/store_test.go b/types/store_test.go index f376f3be1..b5e36c487 100644 --- a/types/store_test.go +++ b/types/store_test.go @@ -25,3 +25,15 @@ func TestPrefixEndBytes(t *testing.T) { require.Equal(t, test.expected, end) } } + +func TestCommitID(t *testing.T) { + var empty CommitID + require.True(t, empty.IsZero()) + + var nonempty CommitID + nonempty = CommitID{ + Version: 1, + Hash: []byte("testhash"), + } + require.False(t, nonempty.IsZero()) +} diff --git a/types/tags_test.go b/types/tags_test.go index 4ef556124..77bb4041c 100644 --- a/types/tags_test.go +++ b/types/tags_test.go @@ -11,6 +11,7 @@ func TestAppendTags(t *testing.T) { b := NewTags("b", []byte("2")) c := a.AppendTags(b) require.Equal(t, c, Tags{MakeTag("a", []byte("1")), MakeTag("b", []byte("2"))}) + require.Equal(t, c, Tags{MakeTag("a", []byte("1"))}.AppendTag("b", []byte("2"))) } func TestEmptyTags(t *testing.T) { @@ -21,4 +22,14 @@ func TestEmptyTags(t *testing.T) { func TestNewTags(t *testing.T) { b := NewTags("a", []byte("1")) require.Equal(t, b, Tags{MakeTag("a", []byte("1"))}) + + require.Panics(t, func() { NewTags("a", []byte("1"), "b") }) + require.Panics(t, func() { NewTags("a", 1) }) + require.Panics(t, func() { NewTags(1, 1) }) + require.Panics(t, func() { NewTags(true, false) }) +} + +func TestKVPairTags(t *testing.T) { + a := NewTags("a", []byte("1")) + require.Equal(t, a, Tags(a.ToKVPairs())) } diff --git a/types/utils_test.go b/types/utils_test.go index 8c84e2ace..05bc622e7 100644 --- a/types/utils_test.go +++ b/types/utils_test.go @@ -29,11 +29,17 @@ func TestSortJSON(t *testing.T) { wantErr: false}, } - for _, tc := range cases { + for tcIndex, tc := range cases { got, err := SortJSON([]byte(tc.unsortedJSON)) - if tc.wantErr != (err != nil) { - t.Fatalf("got %t, want: %t, err=%s", err != nil, tc.wantErr, err) + if tc.wantErr { + require.NotNil(t, err, "tc #%d", tcIndex) + require.Panics(t, func() { MustSortJSON([]byte(tc.unsortedJSON)) }) + } else { + require.Nil(t, err, "tc #%d, err=%s", tcIndex, err) + require.NotPanics(t, func() { MustSortJSON([]byte(tc.unsortedJSON)) }) + require.Equal(t, got, MustSortJSON([]byte(tc.unsortedJSON))) } + require.Equal(t, string(got), tc.want) } } diff --git a/version/version.go b/version/version.go index 9b332353b..a2bee9eb2 100644 --- a/version/version.go +++ b/version/version.go @@ -2,10 +2,10 @@ package version const Maj = "0" -const Min = "23" -const Fix = "1" +const Min = "24" +const Fix = "0" -const Version = "0.23.1" +const Version = "0.24.0" // GitCommit set by build flags var GitCommit = "" diff --git a/x/auth/account_test.go b/x/auth/account_test.go index e6d669ba6..17878ce6f 100644 --- a/x/auth/account_test.go +++ b/x/auth/account_test.go @@ -56,7 +56,7 @@ func TestBaseAccountCoins(t *testing.T) { _, _, addr := keyPubAddr() acc := NewBaseAccountWithAddress(addr) - someCoins := sdk.Coins{sdk.NewCoin("atom", 123), sdk.NewCoin("eth", 246)} + someCoins := sdk.Coins{sdk.NewInt64Coin("atom", 123), sdk.NewInt64Coin("eth", 246)} err := acc.SetCoins(someCoins) require.Nil(t, err) @@ -78,7 +78,7 @@ func TestBaseAccountMarshal(t *testing.T) { _, pub, addr := keyPubAddr() acc := NewBaseAccountWithAddress(addr) - someCoins := sdk.Coins{sdk.NewCoin("atom", 123), sdk.NewCoin("eth", 246)} + someCoins := sdk.Coins{sdk.NewInt64Coin("atom", 123), sdk.NewInt64Coin("eth", 246)} seq := int64(7) // set everything on the account diff --git a/x/auth/ante.go b/x/auth/ante.go index 9652b37de..60aea8fc7 100644 --- a/x/auth/ante.go +++ b/x/auth/ante.go @@ -17,11 +17,12 @@ const ( // NewAnteHandler returns an AnteHandler that checks // and increments sequence numbers, checks signatures & account numbers, // and deducts fees from the first signer. +// nolint: gocyclo func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler { return func( ctx sdk.Context, tx sdk.Tx, - ) (_ sdk.Context, _ sdk.Result, abort bool) { + ) (newCtx sdk.Context, res sdk.Result, abort bool) { // This AnteHandler requires Txs to be StdTxs stdTx, ok := tx.(StdTx) @@ -29,20 +30,39 @@ func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler { return ctx, sdk.ErrInternal("tx must be StdTx").Result(), true } + // set the gas meter + newCtx = ctx.WithGasMeter(sdk.NewGasMeter(stdTx.Fee.Gas)) + + // AnteHandlers must have their own defer/recover in order + // for the BaseApp to know how much gas was used! + // This is because the GasMeter is created in the AnteHandler, + // but if it panics the context won't be set properly in runTx's recover ... + defer func() { + if r := recover(); r != nil { + switch rType := r.(type) { + case sdk.ErrorOutOfGas: + log := fmt.Sprintf("out of gas in location: %v", rType.Descriptor) + res = sdk.ErrOutOfGas(log).Result() + res.GasWanted = stdTx.Fee.Gas + res.GasUsed = newCtx.GasMeter().GasConsumed() + abort = true + default: + panic(r) + } + } + }() + err := validateBasic(stdTx) if err != nil { - return ctx, err.Result(), true + return newCtx, err.Result(), true } sigs := stdTx.GetSignatures() signerAddrs := stdTx.GetSigners() msgs := tx.GetMsgs() - // set the gas meter - ctx = ctx.WithGasMeter(sdk.NewGasMeter(stdTx.Fee.Gas)) - // charge gas for the memo - ctx.GasMeter().ConsumeGas(memoCostPerByte*sdk.Gas(len(stdTx.GetMemo())), "memo") + newCtx.GasMeter().ConsumeGas(memoCostPerByte*sdk.Gas(len(stdTx.GetMemo())), "memo") // Get the sign bytes (requires all account & sequence numbers and the fee) sequences := make([]int64, len(sigs)) @@ -59,38 +79,38 @@ func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler { signerAddr, sig := signerAddrs[i], sigs[i] // check signature, return account with incremented nonce - signBytes := StdSignBytes(ctx.ChainID(), accNums[i], sequences[i], fee, msgs, stdTx.GetMemo()) + signBytes := StdSignBytes(newCtx.ChainID(), accNums[i], sequences[i], fee, msgs, stdTx.GetMemo()) signerAcc, res := processSig( - ctx, am, + newCtx, am, signerAddr, sig, signBytes, ) if !res.IsOK() { - return ctx, res, true + return newCtx, res, true } // first sig pays the fees // TODO: Add min fees // Can this function be moved outside of the loop? if i == 0 && !fee.Amount.IsZero() { - ctx.GasMeter().ConsumeGas(deductFeesCost, "deductFees") + newCtx.GasMeter().ConsumeGas(deductFeesCost, "deductFees") signerAcc, res = deductFees(signerAcc, fee) if !res.IsOK() { - return ctx, res, true + return newCtx, res, true } - fck.addCollectedFees(ctx, fee.Amount) + fck.addCollectedFees(newCtx, fee.Amount) } // Save the account. - am.SetAccount(ctx, signerAcc) + am.SetAccount(newCtx, signerAcc) signerAccs[i] = signerAcc } // cache the signer accounts in the context - ctx = WithSigners(ctx, signerAccs) + newCtx = WithSigners(newCtx, signerAccs) // TODO: tx tags (?) - return ctx, sdk.Result{}, false // continue... + return newCtx, sdk.Result{GasWanted: stdTx.Fee.Gas}, false // continue... } } diff --git a/x/auth/ante_test.go b/x/auth/ante_test.go index 01fcab012..5fa04d848 100644 --- a/x/auth/ante_test.go +++ b/x/auth/ante_test.go @@ -20,14 +20,14 @@ func newTestMsg(addrs ...sdk.AccAddress) *sdk.TestMsg { func newStdFee() StdFee { return NewStdFee(5000, - sdk.NewCoin("atom", 150), + sdk.NewInt64Coin("atom", 150), ) } // coins to more than cover the fee func newCoins() sdk.Coins { return sdk.Coins{ - sdk.NewCoin("atom", 10000000), + sdk.NewInt64Coin("atom", 10000000), } } @@ -48,21 +48,20 @@ func checkValidTx(t *testing.T, anteHandler sdk.AnteHandler, ctx sdk.Context, tx // run the tx through the anteHandler and ensure it fails with the given code func checkInvalidTx(t *testing.T, anteHandler sdk.AnteHandler, ctx sdk.Context, tx sdk.Tx, code sdk.CodeType) { - defer func() { - if r := recover(); r != nil { - switch r.(type) { - case sdk.ErrorOutOfGas: - require.Equal(t, sdk.ToABCICode(sdk.CodespaceRoot, code), sdk.ToABCICode(sdk.CodespaceRoot, sdk.CodeOutOfGas), - fmt.Sprintf("Expected ErrorOutOfGas, got %v", r)) - default: - panic(r) - } - } - }() - _, result, abort := anteHandler(ctx, tx) + newCtx, result, abort := anteHandler(ctx, tx) require.True(t, abort) require.Equal(t, sdk.ToABCICode(sdk.CodespaceRoot, code), result.Code, fmt.Sprintf("Expected %v, got %v", sdk.ToABCICode(sdk.CodespaceRoot, code), result)) + + if code == sdk.CodeOutOfGas { + stdTx, ok := tx.(StdTx) + require.True(t, ok, "tx must be in form auth.StdTx") + // GasWanted set correctly + require.Equal(t, stdTx.Fee.Gas, result.GasWanted, "Gas wanted not set correctly") + require.True(t, result.GasUsed > result.GasWanted, "GasUsed not greated than GasWanted") + // Check that context is set correctly + require.Equal(t, result.GasUsed, newCtx.GasMeter().GasConsumed(), "Context not updated correctly") + } } func newTestTx(ctx sdk.Context, msgs []sdk.Msg, privs []crypto.PrivKey, accNums []int64, seqs []int64, fee StdFee) sdk.Tx { @@ -326,17 +325,17 @@ func TestAnteHandlerFees(t *testing.T) { tx = newTestTx(ctx, msgs, privs, accnums, seqs, fee) checkInvalidTx(t, anteHandler, ctx, tx, sdk.CodeInsufficientFunds) - acc1.SetCoins(sdk.Coins{sdk.NewCoin("atom", 149)}) + acc1.SetCoins(sdk.Coins{sdk.NewInt64Coin("atom", 149)}) mapper.SetAccount(ctx, acc1) checkInvalidTx(t, anteHandler, ctx, tx, sdk.CodeInsufficientFunds) require.True(t, feeCollector.GetCollectedFees(ctx).IsEqual(emptyCoins)) - acc1.SetCoins(sdk.Coins{sdk.NewCoin("atom", 150)}) + acc1.SetCoins(sdk.Coins{sdk.NewInt64Coin("atom", 150)}) mapper.SetAccount(ctx, acc1) checkValidTx(t, anteHandler, ctx, tx) - require.True(t, feeCollector.GetCollectedFees(ctx).IsEqual(sdk.Coins{sdk.NewCoin("atom", 150)})) + require.True(t, feeCollector.GetCollectedFees(ctx).IsEqual(sdk.Coins{sdk.NewInt64Coin("atom", 150)})) } // Test logic around memo gas consumption. @@ -361,24 +360,24 @@ func TestAnteHandlerMemoGas(t *testing.T) { var tx sdk.Tx msg := newTestMsg(addr1) privs, accnums, seqs := []crypto.PrivKey{priv1}, []int64{0}, []int64{0} - fee := NewStdFee(0, sdk.NewCoin("atom", 0)) + fee := NewStdFee(0, sdk.NewInt64Coin("atom", 0)) // tx does not have enough gas tx = newTestTx(ctx, []sdk.Msg{msg}, privs, accnums, seqs, fee) checkInvalidTx(t, anteHandler, ctx, tx, sdk.CodeOutOfGas) // tx with memo doesn't have enough gas - fee = NewStdFee(801, sdk.NewCoin("atom", 0)) + fee = NewStdFee(801, sdk.NewInt64Coin("atom", 0)) tx = newTestTxWithMemo(ctx, []sdk.Msg{msg}, privs, accnums, seqs, fee, "abcininasidniandsinasindiansdiansdinaisndiasndiadninsd") checkInvalidTx(t, anteHandler, ctx, tx, sdk.CodeOutOfGas) // memo too large - fee = NewStdFee(2001, sdk.NewCoin("atom", 0)) + fee = NewStdFee(2001, sdk.NewInt64Coin("atom", 0)) tx = newTestTxWithMemo(ctx, []sdk.Msg{msg}, privs, accnums, seqs, fee, "abcininasidniandsinasindiansdiansdinaisndiasndiadninsdabcininasidniandsinasindiansdiansdinaisndiasndiadninsdabcininasidniandsinasindiansdiansdinaisndiasndiadninsd") checkInvalidTx(t, anteHandler, ctx, tx, sdk.CodeMemoTooLarge) // tx with memo has enough gas - fee = NewStdFee(1100, sdk.NewCoin("atom", 0)) + fee = NewStdFee(1100, sdk.NewInt64Coin("atom", 0)) tx = newTestTxWithMemo(ctx, []sdk.Msg{msg}, privs, accnums, seqs, fee, "abcininasidniandsinasindiansdiansdinaisndiasndiadninsd") checkValidTx(t, anteHandler, ctx, tx) } diff --git a/x/auth/client/cli/account.go b/x/auth/client/cli/account.go index 5fc8545b9..3b93798a0 100644 --- a/x/auth/client/cli/account.go +++ b/x/auth/client/cli/account.go @@ -1,7 +1,6 @@ package cli import ( - "errors" "fmt" "github.com/spf13/cobra" @@ -12,32 +11,31 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth" ) -// GetAccountCmd for the auth.BaseAccount type +// GetAccountCmdDefault invokes the GetAccountCmd for the auth.BaseAccount type. func GetAccountCmdDefault(storeName string, cdc *wire.Codec) *cobra.Command { return GetAccountCmd(storeName, cdc, GetAccountDecoder(cdc)) } -// Get account decoder for auth.DefaultAccount +// GetAccountDecoder gets the account decoder for auth.DefaultAccount. func GetAccountDecoder(cdc *wire.Codec) auth.AccountDecoder { return func(accBytes []byte) (acct auth.Account, err error) { - // acct := new(auth.BaseAccount) err = cdc.UnmarshalBinaryBare(accBytes, &acct) if err != nil { panic(err) } + return acct, err } } -// GetAccountCmd returns a query account that will display the -// state of the account at a given address +// GetAccountCmd returns a query account that will display the state of the +// account at a given address. func GetAccountCmd(storeName string, cdc *wire.Codec, decoder auth.AccountDecoder) *cobra.Command { return &cobra.Command{ Use: "account [address]", Short: "Query account balance", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - // find the key to look up the account addr := args[0] @@ -46,30 +44,24 @@ func GetAccountCmd(storeName string, cdc *wire.Codec, decoder auth.AccountDecode return err } - // perform query - ctx := context.NewCoreContextFromViper() - res, err := ctx.QueryStore(auth.AddressStoreKey(key), storeName) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithAccountDecoder(decoder) + + if err := cliCtx.EnsureAccountExistsFromAddr(key); err != nil { + return err + } + + acc, err := cliCtx.GetAccount(key) if err != nil { return err } - // Check if account was found - if res == nil { - return errors.New("No account with address " + addr + - " was found in the state.\nAre you sure there has been a transaction involving it?") - } - - // decode the value - account, err := decoder(res) + output, err := wire.MarshalJSONIndent(cdc, acc) if err != nil { return err } - // print out whole account - output, err := wire.MarshalJSONIndent(cdc, account) - if err != nil { - return err - } fmt.Println(string(output)) return nil }, diff --git a/x/auth/client/context/context.go b/x/auth/client/context/context.go new file mode 100644 index 000000000..1cfa435ee --- /dev/null +++ b/x/auth/client/context/context.go @@ -0,0 +1,152 @@ +package context + +import ( + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/keys" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" + "github.com/cosmos/cosmos-sdk/x/auth" + + "github.com/pkg/errors" + "github.com/spf13/viper" +) + +// TxContext implements a transaction context created in SDK modules. +type TxContext struct { + Codec *wire.Codec + AccountNumber int64 + Sequence int64 + Gas int64 + ChainID string + Memo string + Fee string +} + +// NewTxContextFromCLI returns a new initialized TxContext with parameters from +// the command line using Viper. +func NewTxContextFromCLI() TxContext { + // if chain ID is not specified manually, read default chain ID + chainID := viper.GetString(client.FlagChainID) + if chainID == "" { + defaultChainID, err := defaultChainID() + if err != nil { + chainID = defaultChainID + } + } + + return TxContext{ + ChainID: chainID, + Gas: viper.GetInt64(client.FlagGas), + AccountNumber: viper.GetInt64(client.FlagAccountNumber), + Sequence: viper.GetInt64(client.FlagSequence), + Fee: viper.GetString(client.FlagFee), + Memo: viper.GetString(client.FlagMemo), + } +} + +// WithCodec returns a copy of the context with an updated codec. +func (ctx TxContext) WithCodec(cdc *wire.Codec) TxContext { + ctx.Codec = cdc + return ctx +} + +// WithChainID returns a copy of the context with an updated chainID. +func (ctx TxContext) WithChainID(chainID string) TxContext { + ctx.ChainID = chainID + return ctx +} + +// WithGas returns a copy of the context with an updated gas. +func (ctx TxContext) WithGas(gas int64) TxContext { + ctx.Gas = gas + return ctx +} + +// WithFee returns a copy of the context with an updated fee. +func (ctx TxContext) WithFee(fee string) TxContext { + ctx.Fee = fee + return ctx +} + +// WithSequence returns a copy of the context with an updated sequence number. +func (ctx TxContext) WithSequence(sequence int64) TxContext { + ctx.Sequence = sequence + return ctx +} + +// WithMemo returns a copy of the context with an updated memo. +func (ctx TxContext) WithMemo(memo string) TxContext { + ctx.Memo = memo + return ctx +} + +// WithAccountNumber returns a copy of the context with an account number. +func (ctx TxContext) WithAccountNumber(accnum int64) TxContext { + ctx.AccountNumber = accnum + return ctx +} + +// Build builds a single message to be signed from a TxContext given a set of +// messages. It returns an error if a fee is supplied but cannot be parsed. +func (ctx TxContext) Build(msgs []sdk.Msg) (auth.StdSignMsg, error) { + chainID := ctx.ChainID + if chainID == "" { + return auth.StdSignMsg{}, errors.Errorf("chain ID required but not specified") + } + + fee := sdk.Coin{} + if ctx.Fee != "" { + parsedFee, err := sdk.ParseCoin(ctx.Fee) + if err != nil { + return auth.StdSignMsg{}, err + } + + fee = parsedFee + } + + return auth.StdSignMsg{ + ChainID: ctx.ChainID, + AccountNumber: ctx.AccountNumber, + Sequence: ctx.Sequence, + Memo: ctx.Memo, + Msgs: msgs, + + // TODO: run simulate to estimate gas? + Fee: auth.NewStdFee(ctx.Gas, fee), + }, nil +} + +// Sign signs a transaction given a name, passphrase, and a single message to +// signed. An error is returned if signing fails. +func (ctx TxContext) Sign(name, passphrase string, msg auth.StdSignMsg) ([]byte, error) { + keybase, err := keys.GetKeyBase() + if err != nil { + return nil, err + } + + sig, pubkey, err := keybase.Sign(name, passphrase, msg.Bytes()) + if err != nil { + return nil, err + } + + sigs := []auth.StdSignature{{ + AccountNumber: msg.AccountNumber, + Sequence: msg.Sequence, + PubKey: pubkey, + Signature: sig, + }} + + return ctx.Codec.MarshalBinary(auth.NewStdTx(msg.Msgs, msg.Fee, sigs, msg.Memo)) +} + +// BuildAndSign builds a single message to be signed, and signs a transaction +// with the built message given a name, passphrase, and a set of +// messages. +func (ctx TxContext) BuildAndSign(name, passphrase string, msgs []sdk.Msg) ([]byte, error) { + msg, err := ctx.Build(msgs) + if err != nil { + return nil, err + } + + return ctx.Sign(name, passphrase, msg) +} diff --git a/x/auth/client/context/utils.go b/x/auth/client/context/utils.go new file mode 100644 index 000000000..22cc8220b --- /dev/null +++ b/x/auth/client/context/utils.go @@ -0,0 +1,25 @@ +package context + +import ( + tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" + tmtypes "github.com/tendermint/tendermint/types" +) + +// defaultChainID returns the chain ID from the genesis file if present. An +// error is returned if the file cannot be read or parsed. +// +// TODO: This should be removed and the chainID should always be provided by +// the end user. +func defaultChainID() (string, error) { + cfg, err := tcmd.ParseConfig() + if err != nil { + return "", err + } + + doc, err := tmtypes.GenesisDocFromFile(cfg.GenesisFile()) + if err != nil { + return "", err + } + + return doc.ChainID, nil +} diff --git a/x/auth/client/rest/query.go b/x/auth/client/rest/query.go index 5cdc2ee25..431d3d27d 100644 --- a/x/auth/client/rest/query.go +++ b/x/auth/client/rest/query.go @@ -4,25 +4,28 @@ import ( "fmt" "net/http" - "github.com/gorilla/mux" - "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/auth" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + + "github.com/gorilla/mux" ) // register REST routes -func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, storeName string) { +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec, storeName string) { r.HandleFunc( "/accounts/{address}", - QueryAccountRequestHandlerFn(storeName, cdc, authcmd.GetAccountDecoder(cdc), ctx), + QueryAccountRequestHandlerFn(storeName, cdc, authcmd.GetAccountDecoder(cdc), cliCtx), ).Methods("GET") } // query accountREST Handler -func QueryAccountRequestHandlerFn(storeName string, cdc *wire.Codec, decoder auth.AccountDecoder, ctx context.CoreContext) http.HandlerFunc { +func QueryAccountRequestHandlerFn( + storeName string, cdc *wire.Codec, + decoder auth.AccountDecoder, cliCtx context.CLIContext, +) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) bech32addr := vars["address"] @@ -34,7 +37,7 @@ func QueryAccountRequestHandlerFn(storeName string, cdc *wire.Codec, decoder aut return } - res, err := ctx.QueryStore(auth.AddressStoreKey(addr), storeName) + res, err := cliCtx.QueryStore(auth.AddressStoreKey(addr), storeName) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("couldn't query account. Error: %s", err.Error()))) diff --git a/x/auth/feekeeper_test.go b/x/auth/feekeeper_test.go index a53839a8b..243293cc9 100644 --- a/x/auth/feekeeper_test.go +++ b/x/auth/feekeeper_test.go @@ -14,8 +14,8 @@ import ( var ( emptyCoins = sdk.Coins{} - oneCoin = sdk.Coins{sdk.NewCoin("foocoin", 1)} - twoCoins = sdk.Coins{sdk.NewCoin("foocoin", 2)} + oneCoin = sdk.Coins{sdk.NewInt64Coin("foocoin", 1)} + twoCoins = sdk.Coins{sdk.NewInt64Coin("foocoin", 2)} ) func TestFeeCollectionKeeperGetSet(t *testing.T) { diff --git a/x/auth/stdtx.go b/x/auth/stdtx.go index 316ff5e95..c6e280157 100644 --- a/x/auth/stdtx.go +++ b/x/auth/stdtx.go @@ -4,6 +4,7 @@ import ( "encoding/json" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" "github.com/tendermint/tendermint/crypto" ) @@ -157,8 +158,27 @@ func (msg StdSignMsg) Bytes() []byte { // Standard Signature type StdSignature struct { - crypto.PubKey `json:"pub_key"` // optional - crypto.Signature `json:"signature"` - AccountNumber int64 `json:"account_number"` - Sequence int64 `json:"sequence"` + crypto.PubKey `json:"pub_key"` // optional + Signature []byte `json:"signature"` + AccountNumber int64 `json:"account_number"` + Sequence int64 `json:"sequence"` +} + +// logic for standard transaction decoding +func DefaultTxDecoder(cdc *wire.Codec) sdk.TxDecoder { + return func(txBytes []byte) (sdk.Tx, sdk.Error) { + var tx = StdTx{} + + if len(txBytes) == 0 { + return nil, sdk.ErrTxDecode("txBytes are empty") + } + + // StdTx.Msg is an interface. The concrete types + // are registered by MakeTxCodec + err := cdc.UnmarshalBinary(txBytes, &tx) + if err != nil { + return nil, sdk.ErrTxDecode("").TraceSDK(err.Error()) + } + return tx, nil + } } diff --git a/x/bank/app_test.go b/x/bank/app_test.go index 4de8c8416..c8d0a417d 100644 --- a/x/bank/app_test.go +++ b/x/bank/app_test.go @@ -3,20 +3,33 @@ package bank import ( "testing" - "github.com/stretchr/testify/require" - - "math/rand" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" ) -// test bank module in a mock application +type ( + expectedBalance struct { + addr sdk.AccAddress + coins sdk.Coins + } + + appTestCase struct { + expPass bool + msgs []sdk.Msg + accNums []int64 + accSeqs []int64 + privKeys []crypto.PrivKey + expectedBalances []expectedBalance + } +) + var ( priv1 = ed25519.GenPrivKey() addr1 = sdk.AccAddress(priv1.PubKey().Address()) @@ -26,20 +39,15 @@ var ( priv4 = ed25519.GenPrivKey() addr4 = sdk.AccAddress(priv4.PubKey().Address()) - coins = sdk.Coins{sdk.NewCoin("foocoin", 10)} - halfCoins = sdk.Coins{sdk.NewCoin("foocoin", 5)} - manyCoins = sdk.Coins{sdk.NewCoin("foocoin", 1), sdk.NewCoin("barcoin", 1)} - - freeFee = auth.StdFee{ // no fees for a buncha gas - sdk.Coins{sdk.NewCoin("foocoin", 0)}, - 100000, - } + coins = sdk.Coins{sdk.NewInt64Coin("foocoin", 10)} + halfCoins = sdk.Coins{sdk.NewInt64Coin("foocoin", 5)} + manyCoins = sdk.Coins{sdk.NewInt64Coin("foocoin", 1), sdk.NewInt64Coin("barcoin", 1)} + freeFee = auth.NewStdFee(100000, sdk.Coins{sdk.NewInt64Coin("foocoin", 0)}...) sendMsg1 = MsgSend{ Inputs: []Input{NewInput(addr1, coins)}, Outputs: []Output{NewOutput(addr2, coins)}, } - sendMsg2 = MsgSend{ Inputs: []Input{NewInput(addr1, coins)}, Outputs: []Output{ @@ -47,7 +55,6 @@ var ( NewOutput(addr3, halfCoins), }, } - sendMsg3 = MsgSend{ Inputs: []Input{ NewInput(addr1, coins), @@ -58,7 +65,6 @@ var ( NewOutput(addr3, coins), }, } - sendMsg4 = MsgSend{ Inputs: []Input{ NewInput(addr2, coins), @@ -67,7 +73,6 @@ var ( NewOutput(addr1, coins), }, } - sendMsg5 = MsgSend{ Inputs: []Input{ NewInput(addr1, manyCoins), @@ -85,56 +90,57 @@ func getMockApp(t *testing.T) *mock.App { return mapp } -func TestBankWithRandomMessages(t *testing.T) { - mapp := getMockApp(t) - setup := func(r *rand.Rand, keys []crypto.PrivKey) { - return - } - - mapp.RandomizedTesting( - t, - []mock.TestAndRunTx{TestAndRunSingleInputMsgSend}, - []mock.RandSetup{setup}, - []mock.Invariant{ModuleInvariants}, - 100, 30, 30, - ) -} - func TestMsgSendWithAccounts(t *testing.T) { mapp := getMockApp(t) - - // Add an account at genesis acc := &auth.BaseAccount{ Address: addr1, - Coins: sdk.Coins{sdk.NewCoin("foocoin", 67)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 67)}, } - accs := []auth.Account{acc} - // Construct genesis state - mock.SetGenesis(mapp, accs) + mock.SetGenesis(mapp, []auth.Account{acc}) - // A checkTx context (true) ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{}) + res1 := mapp.AccountMapper.GetAccount(ctxCheck, addr1) require.NotNil(t, res1) require.Equal(t, acc, res1.(*auth.BaseAccount)) - // Run a CheckDeliver - mock.SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{sendMsg1}, []int64{0}, []int64{0}, true, priv1) + testCases := []appTestCase{ + { + msgs: []sdk.Msg{sendMsg1}, + accNums: []int64{0}, + accSeqs: []int64{0}, + expPass: true, + privKeys: []crypto.PrivKey{priv1}, + expectedBalances: []expectedBalance{ + {addr1, sdk.Coins{sdk.NewInt64Coin("foocoin", 57)}}, + {addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}}, + }, + }, + { + msgs: []sdk.Msg{sendMsg1, sendMsg2}, + accNums: []int64{0}, + accSeqs: []int64{0}, + expPass: false, + privKeys: []crypto.PrivKey{priv1}, + }, + } - // Check balances - mock.CheckBalance(t, mapp, addr1, sdk.Coins{sdk.NewCoin("foocoin", 57)}) - mock.CheckBalance(t, mapp, addr2, sdk.Coins{sdk.NewCoin("foocoin", 10)}) + for _, tc := range testCases { + mock.SignCheckDeliver(t, mapp.BaseApp, tc.msgs, tc.accNums, tc.accSeqs, tc.expPass, tc.privKeys...) - // Delivering again should cause replay error - mock.SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{sendMsg1, sendMsg2}, []int64{0}, []int64{0}, false, priv1) + for _, eb := range tc.expectedBalances { + mock.CheckBalance(t, mapp, eb.addr, eb.coins) + } + } - // bumping the txnonce number without resigning should be an auth error + // bumping the tx nonce number without resigning should be an auth error mapp.BeginBlock(abci.RequestBeginBlock{}) + tx := mock.GenTx([]sdk.Msg{sendMsg1}, []int64{0}, []int64{0}, priv1) tx.Signatures[0].Sequence = 1 - res := mapp.Deliver(tx) + res := mapp.Deliver(tx) require.Equal(t, sdk.ToABCICode(sdk.CodespaceRoot, sdk.CodeUnauthorized), res.Code, res.Log) // resigning the tx with the bumped sequence should work @@ -146,24 +152,37 @@ func TestMsgSendMultipleOut(t *testing.T) { acc1 := &auth.BaseAccount{ Address: addr1, - Coins: sdk.Coins{sdk.NewCoin("foocoin", 42)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 42)}, } - acc2 := &auth.BaseAccount{ Address: addr2, - Coins: sdk.Coins{sdk.NewCoin("foocoin", 42)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 42)}, } - accs := []auth.Account{acc1, acc2} - mock.SetGenesis(mapp, accs) + mock.SetGenesis(mapp, []auth.Account{acc1, acc2}) - // Simulate a Block - mock.SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{sendMsg2}, []int64{0}, []int64{0}, true, priv1) + testCases := []appTestCase{ + { + msgs: []sdk.Msg{sendMsg2}, + accNums: []int64{0}, + accSeqs: []int64{0}, + expPass: true, + privKeys: []crypto.PrivKey{priv1}, + expectedBalances: []expectedBalance{ + {addr1, sdk.Coins{sdk.NewInt64Coin("foocoin", 32)}}, + {addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 47)}}, + {addr3, sdk.Coins{sdk.NewInt64Coin("foocoin", 5)}}, + }, + }, + } - // Check balances - mock.CheckBalance(t, mapp, addr1, sdk.Coins{sdk.NewCoin("foocoin", 32)}) - mock.CheckBalance(t, mapp, addr2, sdk.Coins{sdk.NewCoin("foocoin", 47)}) - mock.CheckBalance(t, mapp, addr3, sdk.Coins{sdk.NewCoin("foocoin", 5)}) + for _, tc := range testCases { + mock.SignCheckDeliver(t, mapp.BaseApp, tc.msgs, tc.accNums, tc.accSeqs, tc.expPass, tc.privKeys...) + + for _, eb := range tc.expectedBalances { + mock.CheckBalance(t, mapp, eb.addr, eb.coins) + } + } } func TestSengMsgMultipleInOut(t *testing.T) { @@ -171,28 +190,42 @@ func TestSengMsgMultipleInOut(t *testing.T) { acc1 := &auth.BaseAccount{ Address: addr1, - Coins: sdk.Coins{sdk.NewCoin("foocoin", 42)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 42)}, } acc2 := &auth.BaseAccount{ Address: addr2, - Coins: sdk.Coins{sdk.NewCoin("foocoin", 42)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 42)}, } acc4 := &auth.BaseAccount{ Address: addr4, - Coins: sdk.Coins{sdk.NewCoin("foocoin", 42)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 42)}, } - accs := []auth.Account{acc1, acc2, acc4} - mock.SetGenesis(mapp, accs) + mock.SetGenesis(mapp, []auth.Account{acc1, acc2, acc4}) - // CheckDeliver - mock.SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{sendMsg3}, []int64{0, 2}, []int64{0, 0}, true, priv1, priv4) + testCases := []appTestCase{ + { + msgs: []sdk.Msg{sendMsg3}, + accNums: []int64{0, 2}, + accSeqs: []int64{0, 0}, + expPass: true, + privKeys: []crypto.PrivKey{priv1, priv4}, + expectedBalances: []expectedBalance{ + {addr1, sdk.Coins{sdk.NewInt64Coin("foocoin", 32)}}, + {addr4, sdk.Coins{sdk.NewInt64Coin("foocoin", 32)}}, + {addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 52)}}, + {addr3, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}}, + }, + }, + } - // Check balances - mock.CheckBalance(t, mapp, addr1, sdk.Coins{sdk.NewCoin("foocoin", 32)}) - mock.CheckBalance(t, mapp, addr4, sdk.Coins{sdk.NewCoin("foocoin", 32)}) - mock.CheckBalance(t, mapp, addr2, sdk.Coins{sdk.NewCoin("foocoin", 52)}) - mock.CheckBalance(t, mapp, addr3, sdk.Coins{sdk.NewCoin("foocoin", 10)}) + for _, tc := range testCases { + mock.SignCheckDeliver(t, mapp.BaseApp, tc.msgs, tc.accNums, tc.accSeqs, tc.expPass, tc.privKeys...) + + for _, eb := range tc.expectedBalances { + mock.CheckBalance(t, mapp, eb.addr, eb.coins) + } + } } func TestMsgSendDependent(t *testing.T) { @@ -200,22 +233,40 @@ func TestMsgSendDependent(t *testing.T) { acc1 := &auth.BaseAccount{ Address: addr1, - Coins: sdk.Coins{sdk.NewCoin("foocoin", 42)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 42)}, } - accs := []auth.Account{acc1} - mock.SetGenesis(mapp, accs) + mock.SetGenesis(mapp, []auth.Account{acc1}) - // CheckDeliver - mock.SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{sendMsg1}, []int64{0}, []int64{0}, true, priv1) + testCases := []appTestCase{ + { + msgs: []sdk.Msg{sendMsg1}, + accNums: []int64{0}, + accSeqs: []int64{0}, + expPass: true, + privKeys: []crypto.PrivKey{priv1}, + expectedBalances: []expectedBalance{ + {addr1, sdk.Coins{sdk.NewInt64Coin("foocoin", 32)}}, + {addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}}, + }, + }, + { + msgs: []sdk.Msg{sendMsg4}, + accNums: []int64{1}, + accSeqs: []int64{0}, + expPass: true, + privKeys: []crypto.PrivKey{priv2}, + expectedBalances: []expectedBalance{ + {addr1, sdk.Coins{sdk.NewInt64Coin("foocoin", 42)}}, + }, + }, + } - // Check balances - mock.CheckBalance(t, mapp, addr1, sdk.Coins{sdk.NewCoin("foocoin", 32)}) - mock.CheckBalance(t, mapp, addr2, sdk.Coins{sdk.NewCoin("foocoin", 10)}) + for _, tc := range testCases { + mock.SignCheckDeliver(t, mapp.BaseApp, tc.msgs, tc.accNums, tc.accSeqs, tc.expPass, tc.privKeys...) - // Simulate a Block - mock.SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{sendMsg4}, []int64{1}, []int64{0}, true, priv2) - - // Check balances - mock.CheckBalance(t, mapp, addr1, sdk.Coins{sdk.NewCoin("foocoin", 42)}) + for _, eb := range tc.expectedBalances { + mock.CheckBalance(t, mapp, eb.addr, eb.coins) + } + } } diff --git a/x/bank/bench_test.go b/x/bank/bench_test.go index b90d56955..aaa391b39 100644 --- a/x/bank/bench_test.go +++ b/x/bank/bench_test.go @@ -30,7 +30,7 @@ func BenchmarkOneBankSendTxPerBlock(b *testing.B) { acc := &auth.BaseAccount{ Address: addr1, // Some value conceivably higher than the benchmarks would ever go - Coins: sdk.Coins{sdk.NewCoin("foocoin", 100000000000)}, + Coins: sdk.Coins{sdk.NewInt64Coin("foocoin", 100000000000)}, } accs := []auth.Account{acc} diff --git a/x/bank/client/cli/sendtx.go b/x/bank/client/cli/sendtx.go index b294e8cc7..92ac37c1e 100644 --- a/x/bank/client/cli/sendtx.go +++ b/x/bank/client/cli/sendtx.go @@ -1,14 +1,17 @@ package cli import ( - "github.com/pkg/errors" + "os" "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/utils" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" - "github.com/cosmos/cosmos-sdk/x/auth" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/bank/client" + + "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -18,36 +21,29 @@ const ( flagAmount = "amount" ) -// SendTxCmd will create a send tx and sign it with the given key +// SendTxCmd will create a send tx and sign it with the given key. func SendTxCmd(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "send", Short: "Create and sign a send tx", RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - // get the from/to address - from, err := ctx.GetFromAddress() - if err != nil { + if err := cliCtx.EnsureAccountExists(); err != nil { return err } - fromAcc, err := ctx.QueryStore(auth.AddressStoreKey(from), ctx.AccountStore) - if err != nil { - return err - } - - // Check if account was found - if fromAcc == nil { - return errors.Errorf("No account with address %s was found in the state.\nAre you sure there has been a transaction involving it?", from) - } - toStr := viper.GetString(flagTo) to, err := sdk.AccAddressFromBech32(toStr) if err != nil { return err } + // parse coins trying to be sent amount := viper.GetString(flagAmount) coins, err := sdk.ParseCoins(amount) @@ -55,11 +51,17 @@ func SendTxCmd(cdc *wire.Codec) *cobra.Command { return err } - // ensure account has enough coins - account, err := ctx.Decoder(fromAcc) + from, err := cliCtx.GetFromAddress() if err != nil { return err } + + account, err := cliCtx.GetAccount(from) + if err != nil { + return err + } + + // ensure account has enough coins if !account.GetCoins().IsGTE(coins) { return errors.Errorf("Address %s doesn't have enough coins to pay for this transaction.", from) } @@ -67,12 +69,7 @@ func SendTxCmd(cdc *wire.Codec) *cobra.Command { // build and sign the transaction, then broadcast to Tendermint msg := client.BuildMsg(from, to, coins) - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - return nil - + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } diff --git a/x/bank/client/rest/sendtx.go b/x/bank/client/rest/sendtx.go index 872b3cfe3..e060a3bb4 100644 --- a/x/bank/client/rest/sendtx.go +++ b/x/bank/client/rest/sendtx.go @@ -4,19 +4,20 @@ import ( "io/ioutil" "net/http" - "github.com/cosmos/cosmos-sdk/crypto/keys" - "github.com/gorilla/mux" - "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/crypto/keys" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/bank" "github.com/cosmos/cosmos-sdk/x/bank/client" + + "github.com/gorilla/mux" ) // RegisterRoutes - Central function to define routes that get registered by the main application -func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { - r.HandleFunc("/accounts/{address}/send", SendRequestHandlerFn(cdc, kb, ctx)).Methods("POST") +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { + r.HandleFunc("/accounts/{address}/send", SendRequestHandlerFn(cdc, kb, cliCtx)).Methods("POST") } type sendBody struct { @@ -38,7 +39,7 @@ func init() { } // SendRequestHandlerFn - http request handler to send coins to a address -func SendRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) http.HandlerFunc { +func SendRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { // collect data vars := mux.Vars(r) @@ -80,23 +81,22 @@ func SendRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreCont return } - // add gas to context - ctx = ctx.WithGas(m.Gas) - // add chain-id to context - ctx = ctx.WithChainID(m.ChainID) + txCtx := authctx.TxContext{ + Codec: cdc, + Gas: m.Gas, + ChainID: m.ChainID, + AccountNumber: m.AccountNumber, + Sequence: m.Sequence, + } - // sign - ctx = ctx.WithAccountNumber(m.AccountNumber) - ctx = ctx.WithSequence(m.Sequence) - txBytes, err := ctx.SignAndBuild(m.LocalAccountName, m.Password, []sdk.Msg{msg}, cdc) + txBytes, err := txCtx.BuildAndSign(m.LocalAccountName, m.Password, []sdk.Msg{msg}) if err != nil { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte(err.Error())) return } - // send - res, err := ctx.BroadcastTx(txBytes) + res, err := cliCtx.BroadcastTx(txBytes) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) diff --git a/x/bank/keeper_test.go b/x/bank/keeper_test.go index c9d7c4119..a114f75ad 100644 --- a/x/bank/keeper_test.go +++ b/x/bank/keeper_test.go @@ -45,69 +45,69 @@ func TestKeeper(t *testing.T) { accountMapper.SetAccount(ctx, acc) require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{})) - coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 10)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 10)})) + coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) // Test HasCoins - require.True(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 10)})) - require.True(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 5)})) - require.False(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 15)})) - require.False(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 5)})) + require.True(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) + require.True(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 5)})) + require.False(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 15)})) + require.False(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 5)})) // Test AddCoins - coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 15)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 25)})) + coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 15)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 25)})) - coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 15)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 15), sdk.NewCoin("foocoin", 25)})) + coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 15)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 15), sdk.NewInt64Coin("foocoin", 25)})) // Test SubtractCoins - coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 10)}) - coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 5)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 15)})) + coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}) + coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 5)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 15)})) - coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 11)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 15)})) + coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 11)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 15)})) - coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 10)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 15)})) - require.False(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 1)})) + coinKeeper.SubtractCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 10)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 15)})) + require.False(t, coinKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 1)})) // Test SendCoins - coinKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewCoin("foocoin", 5)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 10)})) - require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 5)})) + coinKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 5)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) + require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 5)})) - _, err2 := coinKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewCoin("foocoin", 50)}) + _, err2 := coinKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 50)}) assert.Implements(t, (*sdk.Error)(nil), err2) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 10)})) - require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 5)})) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) + require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 5)})) - coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 30)}) - coinKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 5)}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 20), sdk.NewCoin("foocoin", 5)})) - require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 10)})) + coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 30)}) + coinKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 5)}) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 20), sdk.NewInt64Coin("foocoin", 5)})) + require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 10)})) // Test InputOutputCoins - input1 := NewInput(addr2, sdk.Coins{sdk.NewCoin("foocoin", 2)}) - output1 := NewOutput(addr, sdk.Coins{sdk.NewCoin("foocoin", 2)}) + input1 := NewInput(addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 2)}) + output1 := NewOutput(addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 2)}) coinKeeper.InputOutputCoins(ctx, []Input{input1}, []Output{output1}) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 20), sdk.NewCoin("foocoin", 7)})) - require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 8)})) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 20), sdk.NewInt64Coin("foocoin", 7)})) + require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 8)})) inputs := []Input{ - NewInput(addr, sdk.Coins{sdk.NewCoin("foocoin", 3)}), - NewInput(addr2, sdk.Coins{sdk.NewCoin("barcoin", 3), sdk.NewCoin("foocoin", 2)}), + NewInput(addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 3)}), + NewInput(addr2, sdk.Coins{sdk.NewInt64Coin("barcoin", 3), sdk.NewInt64Coin("foocoin", 2)}), } outputs := []Output{ - NewOutput(addr, sdk.Coins{sdk.NewCoin("barcoin", 1)}), - NewOutput(addr3, sdk.Coins{sdk.NewCoin("barcoin", 2), sdk.NewCoin("foocoin", 5)}), + NewOutput(addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 1)}), + NewOutput(addr3, sdk.Coins{sdk.NewInt64Coin("barcoin", 2), sdk.NewInt64Coin("foocoin", 5)}), } coinKeeper.InputOutputCoins(ctx, inputs, outputs) - require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 21), sdk.NewCoin("foocoin", 4)})) - require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 7), sdk.NewCoin("foocoin", 6)})) - require.True(t, coinKeeper.GetCoins(ctx, addr3).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 2), sdk.NewCoin("foocoin", 5)})) + require.True(t, coinKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 21), sdk.NewInt64Coin("foocoin", 4)})) + require.True(t, coinKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 7), sdk.NewInt64Coin("foocoin", 6)})) + require.True(t, coinKeeper.GetCoins(ctx, addr3).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 2), sdk.NewInt64Coin("foocoin", 5)})) } @@ -131,52 +131,52 @@ func TestSendKeeper(t *testing.T) { accountMapper.SetAccount(ctx, acc) require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{})) - coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 10)}) - require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 10)})) + coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}) + require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) // Test HasCoins - require.True(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 10)})) - require.True(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 5)})) - require.False(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 15)})) - require.False(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 5)})) + require.True(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) + require.True(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 5)})) + require.False(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 15)})) + require.False(t, sendKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 5)})) - coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 15)}) + coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 15)}) // Test SendCoins - sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewCoin("foocoin", 5)}) - require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 10)})) - require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 5)})) + sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 5)}) + require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) + require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 5)})) - _, err2 := sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewCoin("foocoin", 50)}) + _, err2 := sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 50)}) assert.Implements(t, (*sdk.Error)(nil), err2) - require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 10)})) - require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 5)})) + require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) + require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 5)})) - coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 30)}) - sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 5)}) - require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 20), sdk.NewCoin("foocoin", 5)})) - require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 10)})) + coinKeeper.AddCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 30)}) + sendKeeper.SendCoins(ctx, addr, addr2, sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 5)}) + require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 20), sdk.NewInt64Coin("foocoin", 5)})) + require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 10)})) // Test InputOutputCoins - input1 := NewInput(addr2, sdk.Coins{sdk.NewCoin("foocoin", 2)}) - output1 := NewOutput(addr, sdk.Coins{sdk.NewCoin("foocoin", 2)}) + input1 := NewInput(addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 2)}) + output1 := NewOutput(addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 2)}) sendKeeper.InputOutputCoins(ctx, []Input{input1}, []Output{output1}) - require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 20), sdk.NewCoin("foocoin", 7)})) - require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 10), sdk.NewCoin("foocoin", 8)})) + require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 20), sdk.NewInt64Coin("foocoin", 7)})) + require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 10), sdk.NewInt64Coin("foocoin", 8)})) inputs := []Input{ - NewInput(addr, sdk.Coins{sdk.NewCoin("foocoin", 3)}), - NewInput(addr2, sdk.Coins{sdk.NewCoin("barcoin", 3), sdk.NewCoin("foocoin", 2)}), + NewInput(addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 3)}), + NewInput(addr2, sdk.Coins{sdk.NewInt64Coin("barcoin", 3), sdk.NewInt64Coin("foocoin", 2)}), } outputs := []Output{ - NewOutput(addr, sdk.Coins{sdk.NewCoin("barcoin", 1)}), - NewOutput(addr3, sdk.Coins{sdk.NewCoin("barcoin", 2), sdk.NewCoin("foocoin", 5)}), + NewOutput(addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 1)}), + NewOutput(addr3, sdk.Coins{sdk.NewInt64Coin("barcoin", 2), sdk.NewInt64Coin("foocoin", 5)}), } sendKeeper.InputOutputCoins(ctx, inputs, outputs) - require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 21), sdk.NewCoin("foocoin", 4)})) - require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 7), sdk.NewCoin("foocoin", 6)})) - require.True(t, sendKeeper.GetCoins(ctx, addr3).IsEqual(sdk.Coins{sdk.NewCoin("barcoin", 2), sdk.NewCoin("foocoin", 5)})) + require.True(t, sendKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 21), sdk.NewInt64Coin("foocoin", 4)})) + require.True(t, sendKeeper.GetCoins(ctx, addr2).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 7), sdk.NewInt64Coin("foocoin", 6)})) + require.True(t, sendKeeper.GetCoins(ctx, addr3).IsEqual(sdk.Coins{sdk.NewInt64Coin("barcoin", 2), sdk.NewInt64Coin("foocoin", 5)})) } @@ -198,12 +198,12 @@ func TestViewKeeper(t *testing.T) { accountMapper.SetAccount(ctx, acc) require.True(t, viewKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{})) - coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 10)}) - require.True(t, viewKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewCoin("foocoin", 10)})) + coinKeeper.SetCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)}) + require.True(t, viewKeeper.GetCoins(ctx, addr).IsEqual(sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) // Test HasCoins - require.True(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 10)})) - require.True(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 5)})) - require.False(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("foocoin", 15)})) - require.False(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewCoin("barcoin", 5)})) + require.True(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 10)})) + require.True(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 5)})) + require.False(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("foocoin", 15)})) + require.False(t, viewKeeper.HasCoins(ctx, addr, sdk.Coins{sdk.NewInt64Coin("barcoin", 5)})) } diff --git a/x/bank/msgs_test.go b/x/bank/msgs_test.go index b60cc65ad..ac16b1d0b 100644 --- a/x/bank/msgs_test.go +++ b/x/bank/msgs_test.go @@ -15,7 +15,7 @@ func TestMsgSendType(t *testing.T) { // Construct a MsgSend addr1 := sdk.AccAddress([]byte("input")) addr2 := sdk.AccAddress([]byte("output")) - coins := sdk.Coins{sdk.NewCoin("atom", 10)} + coins := sdk.Coins{sdk.NewInt64Coin("atom", 10)} var msg = MsgSend{ Inputs: []Input{NewInput(addr1, coins)}, Outputs: []Output{NewOutput(addr2, coins)}, @@ -28,16 +28,16 @@ func TestMsgSendType(t *testing.T) { func TestInputValidation(t *testing.T) { addr1 := sdk.AccAddress([]byte{1, 2}) addr2 := sdk.AccAddress([]byte{7, 8}) - someCoins := sdk.Coins{sdk.NewCoin("atom", 123)} - multiCoins := sdk.Coins{sdk.NewCoin("atom", 123), sdk.NewCoin("eth", 20)} + someCoins := sdk.Coins{sdk.NewInt64Coin("atom", 123)} + multiCoins := sdk.Coins{sdk.NewInt64Coin("atom", 123), sdk.NewInt64Coin("eth", 20)} var emptyAddr sdk.AccAddress emptyCoins := sdk.Coins{} - emptyCoins2 := sdk.Coins{sdk.NewCoin("eth", 0)} - someEmptyCoins := sdk.Coins{sdk.NewCoin("eth", 10), sdk.NewCoin("atom", 0)} - minusCoins := sdk.Coins{sdk.NewCoin("eth", -34)} - someMinusCoins := sdk.Coins{sdk.NewCoin("atom", 20), sdk.NewCoin("eth", -34)} - unsortedCoins := sdk.Coins{sdk.NewCoin("eth", 1), sdk.NewCoin("atom", 1)} + emptyCoins2 := sdk.Coins{sdk.NewInt64Coin("eth", 0)} + someEmptyCoins := sdk.Coins{sdk.NewInt64Coin("eth", 10), sdk.NewInt64Coin("atom", 0)} + minusCoins := sdk.Coins{sdk.NewInt64Coin("eth", -34)} + someMinusCoins := sdk.Coins{sdk.NewInt64Coin("atom", 20), sdk.NewInt64Coin("eth", -34)} + unsortedCoins := sdk.Coins{sdk.NewInt64Coin("eth", 1), sdk.NewInt64Coin("atom", 1)} cases := []struct { valid bool @@ -70,16 +70,16 @@ func TestInputValidation(t *testing.T) { func TestOutputValidation(t *testing.T) { addr1 := sdk.AccAddress([]byte{1, 2}) addr2 := sdk.AccAddress([]byte{7, 8}) - someCoins := sdk.Coins{sdk.NewCoin("atom", 123)} - multiCoins := sdk.Coins{sdk.NewCoin("atom", 123), sdk.NewCoin("eth", 20)} + someCoins := sdk.Coins{sdk.NewInt64Coin("atom", 123)} + multiCoins := sdk.Coins{sdk.NewInt64Coin("atom", 123), sdk.NewInt64Coin("eth", 20)} var emptyAddr sdk.AccAddress emptyCoins := sdk.Coins{} - emptyCoins2 := sdk.Coins{sdk.NewCoin("eth", 0)} - someEmptyCoins := sdk.Coins{sdk.NewCoin("eth", 10), sdk.NewCoin("atom", 0)} - minusCoins := sdk.Coins{sdk.NewCoin("eth", -34)} - someMinusCoins := sdk.Coins{sdk.NewCoin("atom", 20), sdk.NewCoin("eth", -34)} - unsortedCoins := sdk.Coins{sdk.NewCoin("eth", 1), sdk.NewCoin("atom", 1)} + emptyCoins2 := sdk.Coins{sdk.NewInt64Coin("eth", 0)} + someEmptyCoins := sdk.Coins{sdk.NewInt64Coin("eth", 10), sdk.NewInt64Coin("atom", 0)} + minusCoins := sdk.Coins{sdk.NewInt64Coin("eth", -34)} + someMinusCoins := sdk.Coins{sdk.NewInt64Coin("atom", 20), sdk.NewInt64Coin("eth", -34)} + unsortedCoins := sdk.Coins{sdk.NewInt64Coin("eth", 1), sdk.NewInt64Coin("atom", 1)} cases := []struct { valid bool @@ -112,10 +112,10 @@ func TestOutputValidation(t *testing.T) { func TestMsgSendValidation(t *testing.T) { addr1 := sdk.AccAddress([]byte{1, 2}) addr2 := sdk.AccAddress([]byte{7, 8}) - atom123 := sdk.Coins{sdk.NewCoin("atom", 123)} - atom124 := sdk.Coins{sdk.NewCoin("atom", 124)} - eth123 := sdk.Coins{sdk.NewCoin("eth", 123)} - atom123eth123 := sdk.Coins{sdk.NewCoin("atom", 123), sdk.NewCoin("eth", 123)} + atom123 := sdk.Coins{sdk.NewInt64Coin("atom", 123)} + atom124 := sdk.Coins{sdk.NewInt64Coin("atom", 124)} + eth123 := sdk.Coins{sdk.NewInt64Coin("eth", 123)} + atom123eth123 := sdk.Coins{sdk.NewInt64Coin("atom", 123), sdk.NewInt64Coin("eth", 123)} input1 := NewInput(addr1, atom123) input2 := NewInput(addr1, eth123) @@ -180,7 +180,7 @@ func TestMsgSendValidation(t *testing.T) { func TestMsgSendGetSignBytes(t *testing.T) { addr1 := sdk.AccAddress([]byte("input")) addr2 := sdk.AccAddress([]byte("output")) - coins := sdk.Coins{sdk.NewCoin("atom", 10)} + coins := sdk.Coins{sdk.NewInt64Coin("atom", 10)} var msg = MsgSend{ Inputs: []Input{NewInput(addr1, coins)}, Outputs: []Output{NewOutput(addr2, coins)}, @@ -213,7 +213,7 @@ func TestMsgSendSigners(t *testing.T) { {7, 8, 9}, } - someCoins := sdk.Coins{sdk.NewCoin("atom", 123)} + someCoins := sdk.Coins{sdk.NewInt64Coin("atom", 123)} inputs := make([]Input, len(signers)) for i, signer := range signers { inputs[i] = NewInput(signer, someCoins) @@ -234,7 +234,7 @@ func TestNewMsgIssue(t *testing.T) { func TestMsgIssueType(t *testing.T) { // Construct an MsgIssue addr := sdk.AccAddress([]byte("loan-from-bank")) - coins := sdk.Coins{sdk.NewCoin("atom", 10)} + coins := sdk.Coins{sdk.NewInt64Coin("atom", 10)} var msg = MsgIssue{ Banker: sdk.AccAddress([]byte("input")), Outputs: []Output{NewOutput(addr, coins)}, @@ -250,7 +250,7 @@ func TestMsgIssueValidation(t *testing.T) { func TestMsgIssueGetSignBytes(t *testing.T) { addr := sdk.AccAddress([]byte("loan-from-bank")) - coins := sdk.Coins{sdk.NewCoin("atom", 10)} + coins := sdk.Coins{sdk.NewInt64Coin("atom", 10)} var msg = MsgIssue{ Banker: sdk.AccAddress([]byte("input")), Outputs: []Output{NewOutput(addr, coins)}, diff --git a/x/bank/simulation/invariants.go b/x/bank/simulation/invariants.go new file mode 100644 index 000000000..847288e1f --- /dev/null +++ b/x/bank/simulation/invariants.go @@ -0,0 +1,50 @@ +package simulation + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + abci "github.com/tendermint/tendermint/abci/types" +) + +// NonnegativeBalanceInvariant checks that all accounts in the application have non-negative balances +func NonnegativeBalanceInvariant(mapper auth.AccountMapper) simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + ctx := app.NewContext(false, abci.Header{}) + accts := mock.GetAllAccounts(mapper, ctx) + for _, acc := range accts { + coins := acc.GetCoins() + require.True(t, coins.IsNotNegative(), + fmt.Sprintf("%s has a negative denomination of %s\n%s", + acc.GetAddress().String(), + coins.String(), + log), + ) + } + } +} + +// TotalCoinsInvariant checks that the sum of the coins across all accounts +// is what is expected +func TotalCoinsInvariant(mapper auth.AccountMapper, totalSupplyFn func() sdk.Coins) simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + ctx := app.NewContext(false, abci.Header{}) + totalCoins := sdk.Coins{} + + chkAccount := func(acc auth.Account) bool { + coins := acc.GetCoins() + totalCoins = totalCoins.Plus(coins) + return false + } + + mapper.IterateAccounts(ctx, chkAccount) + require.Equal(t, totalSupplyFn(), totalCoins, log) + } +} diff --git a/x/bank/simulation/msgs.go b/x/bank/simulation/msgs.go new file mode 100644 index 000000000..43d7e1fd7 --- /dev/null +++ b/x/bank/simulation/msgs.go @@ -0,0 +1,121 @@ +package simulation + +import ( + "errors" + "fmt" + "math/big" + "math/rand" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + "github.com/tendermint/tendermint/crypto" +) + +// TestAndRunSingleInputMsgSend tests and runs a single msg send, with one input and one output, where both +// accounts already exist. +func TestAndRunSingleInputMsgSend(mapper auth.AccountMapper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + fromKey := simulation.RandomKey(r, keys) + fromAddr := sdk.AccAddress(fromKey.PubKey().Address()) + toKey := simulation.RandomKey(r, keys) + // Disallow sending money to yourself + for { + if !fromKey.Equals(toKey) { + break + } + toKey = simulation.RandomKey(r, keys) + } + toAddr := sdk.AccAddress(toKey.PubKey().Address()) + initFromCoins := mapper.GetAccount(ctx, fromAddr).GetCoins() + + if len(initFromCoins) == 0 { + return "skipping, no coins at all", nil + } + + denomIndex := r.Intn(len(initFromCoins)) + amt, goErr := randPositiveInt(r, initFromCoins[denomIndex].Amount) + if goErr != nil { + return "skipping bank send due to account having no coins of denomination " + initFromCoins[denomIndex].Denom, nil + } + + action = fmt.Sprintf("%s is sending %s %s to %s", + fromAddr.String(), + amt.String(), + initFromCoins[denomIndex].Denom, + toAddr.String(), + ) + log = fmt.Sprintf("%s\n%s", log, action) + + coins := sdk.Coins{{initFromCoins[denomIndex].Denom, amt}} + var msg = bank.MsgSend{ + Inputs: []bank.Input{bank.NewInput(fromAddr, coins)}, + Outputs: []bank.Output{bank.NewOutput(toAddr, coins)}, + } + sendAndVerifyMsgSend(t, app, mapper, msg, ctx, log, []crypto.PrivKey{fromKey}) + event("bank/sendAndVerifyMsgSend/ok") + + return action, nil + } +} + +// Sends and verifies the transition of a msg send. This fails if there are repeated inputs or outputs +func sendAndVerifyMsgSend(t *testing.T, app *baseapp.BaseApp, mapper auth.AccountMapper, msg bank.MsgSend, ctx sdk.Context, log string, privkeys []crypto.PrivKey) { + initialInputAddrCoins := make([]sdk.Coins, len(msg.Inputs)) + initialOutputAddrCoins := make([]sdk.Coins, len(msg.Outputs)) + AccountNumbers := make([]int64, len(msg.Inputs)) + SequenceNumbers := make([]int64, len(msg.Inputs)) + + for i := 0; i < len(msg.Inputs); i++ { + acc := mapper.GetAccount(ctx, msg.Inputs[i].Address) + AccountNumbers[i] = acc.GetAccountNumber() + SequenceNumbers[i] = acc.GetSequence() + initialInputAddrCoins[i] = acc.GetCoins() + } + for i := 0; i < len(msg.Outputs); i++ { + acc := mapper.GetAccount(ctx, msg.Outputs[i].Address) + initialOutputAddrCoins[i] = acc.GetCoins() + } + tx := mock.GenTx([]sdk.Msg{msg}, + AccountNumbers, + SequenceNumbers, + privkeys...) + res := app.Deliver(tx) + if !res.IsOK() { + // TODO: Do this in a more 'canonical' way + fmt.Println(res) + fmt.Println(log) + t.FailNow() + } + + for i := 0; i < len(msg.Inputs); i++ { + terminalInputCoins := mapper.GetAccount(ctx, msg.Inputs[i].Address).GetCoins() + require.Equal(t, + initialInputAddrCoins[i].Minus(msg.Inputs[i].Coins), + terminalInputCoins, + fmt.Sprintf("Input #%d had an incorrect amount of coins\n%s", i, log), + ) + } + for i := 0; i < len(msg.Outputs); i++ { + terminalOutputCoins := mapper.GetAccount(ctx, msg.Outputs[i].Address).GetCoins() + require.Equal(t, + initialOutputAddrCoins[i].Plus(msg.Outputs[i].Coins), + terminalOutputCoins, + fmt.Sprintf("Output #%d had an incorrect amount of coins\n%s", i, log), + ) + } +} + +func randPositiveInt(r *rand.Rand, max sdk.Int) (sdk.Int, error) { + if !max.GT(sdk.OneInt()) { + return sdk.Int{}, errors.New("max too small") + } + max = max.Sub(sdk.OneInt()) + return sdk.NewIntFromBigInt(new(big.Int).Rand(r, max.BigInt())).Add(sdk.OneInt()), nil +} diff --git a/x/bank/simulation/sim_test.go b/x/bank/simulation/sim_test.go new file mode 100644 index 000000000..8fedeca79 --- /dev/null +++ b/x/bank/simulation/sim_test.go @@ -0,0 +1,47 @@ +package simulation + +import ( + "encoding/json" + "math/rand" + "testing" + + "github.com/tendermint/tendermint/crypto" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" +) + +func TestBankWithRandomMessages(t *testing.T) { + mapp := mock.NewApp() + + bank.RegisterWire(mapp.Cdc) + mapper := mapp.AccountMapper + coinKeeper := bank.NewKeeper(mapper) + mapp.Router().AddRoute("bank", bank.NewHandler(coinKeeper)) + + err := mapp.CompleteSetup([]*sdk.KVStoreKey{}) + if err != nil { + panic(err) + } + + appStateFn := func(r *rand.Rand, keys []crypto.PrivKey, accs []sdk.AccAddress) json.RawMessage { + mock.RandomSetGenesis(r, mapp, accs, []string{"stake"}) + return json.RawMessage("{}") + } + + simulation.Simulate( + t, mapp.BaseApp, appStateFn, + []simulation.TestAndRunTx{ + TestAndRunSingleInputMsgSend(mapper), + }, + []simulation.RandSetup{}, + []simulation.Invariant{ + NonnegativeBalanceInvariant(mapper), + TotalCoinsInvariant(mapper, func() sdk.Coins { return mapp.TotalCoinsSupply }), + }, + 30, 30, + false, + ) +} diff --git a/x/bank/test_helpers.go b/x/bank/test_helpers.go deleted file mode 100644 index 1dad0ba26..000000000 --- a/x/bank/test_helpers.go +++ /dev/null @@ -1,150 +0,0 @@ -package bank - -import ( - "errors" - "fmt" - "math/big" - "math/rand" - "testing" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/auth" - "github.com/cosmos/cosmos-sdk/x/mock" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto" -) - -// ModuleInvariants runs all invariants of the bank module. -// Currently runs non-negative balance invariant and TotalCoinsInvariant -func ModuleInvariants(t *testing.T, app *mock.App, log string) { - NonnegativeBalanceInvariant(t, app, log) - TotalCoinsInvariant(t, app, log) -} - -// NonnegativeBalanceInvariant checks that all accounts in the application have non-negative balances -func NonnegativeBalanceInvariant(t *testing.T, app *mock.App, log string) { - ctx := app.NewContext(false, abci.Header{}) - accts := mock.GetAllAccounts(app.AccountMapper, ctx) - for _, acc := range accts { - coins := acc.GetCoins() - assert.True(t, coins.IsNotNegative(), - fmt.Sprintf("%s has a negative denomination of %s\n%s", - acc.GetAddress().String(), - coins.String(), - log), - ) - } -} - -// TotalCoinsInvariant checks that the sum of the coins across all accounts -// is what is expected -func TotalCoinsInvariant(t *testing.T, app *mock.App, log string) { - ctx := app.BaseApp.NewContext(false, abci.Header{}) - totalCoins := sdk.Coins{} - - chkAccount := func(acc auth.Account) bool { - coins := acc.GetCoins() - totalCoins = totalCoins.Plus(coins) - return false - } - - app.AccountMapper.IterateAccounts(ctx, chkAccount) - require.Equal(t, app.TotalCoinsSupply, totalCoins, log) -} - -// TestAndRunSingleInputMsgSend tests and runs a single msg send, with one input and one output, where both -// accounts already exist. -func TestAndRunSingleInputMsgSend(t *testing.T, r *rand.Rand, app *mock.App, ctx sdk.Context, keys []crypto.PrivKey, log string) (action string, err sdk.Error) { - fromKey := keys[r.Intn(len(keys))] - fromAddr := sdk.AccAddress(fromKey.PubKey().Address()) - toKey := keys[r.Intn(len(keys))] - // Disallow sending money to yourself - for { - if !fromKey.Equals(toKey) { - break - } - toKey = keys[r.Intn(len(keys))] - } - toAddr := sdk.AccAddress(toKey.PubKey().Address()) - initFromCoins := app.AccountMapper.GetAccount(ctx, fromAddr).GetCoins() - - denomIndex := r.Intn(len(initFromCoins)) - amt, goErr := randPositiveInt(r, initFromCoins[denomIndex].Amount) - if goErr != nil { - return "skipping bank send due to account having no coins of denomination " + initFromCoins[denomIndex].Denom, nil - } - - action = fmt.Sprintf("%s is sending %s %s to %s", - fromAddr.String(), - amt.String(), - initFromCoins[denomIndex].Denom, - toAddr.String(), - ) - log = fmt.Sprintf("%s\n%s", log, action) - - coins := sdk.Coins{{initFromCoins[denomIndex].Denom, amt}} - var msg = MsgSend{ - Inputs: []Input{NewInput(fromAddr, coins)}, - Outputs: []Output{NewOutput(toAddr, coins)}, - } - sendAndVerifyMsgSend(t, app, msg, ctx, log, []crypto.PrivKey{fromKey}) - - return action, nil -} - -// Sends and verifies the transition of a msg send. This fails if there are repeated inputs or outputs -func sendAndVerifyMsgSend(t *testing.T, app *mock.App, msg MsgSend, ctx sdk.Context, log string, privkeys []crypto.PrivKey) { - initialInputAddrCoins := make([]sdk.Coins, len(msg.Inputs)) - initialOutputAddrCoins := make([]sdk.Coins, len(msg.Outputs)) - AccountNumbers := make([]int64, len(msg.Inputs)) - SequenceNumbers := make([]int64, len(msg.Inputs)) - - for i := 0; i < len(msg.Inputs); i++ { - acc := app.AccountMapper.GetAccount(ctx, msg.Inputs[i].Address) - AccountNumbers[i] = acc.GetAccountNumber() - SequenceNumbers[i] = acc.GetSequence() - initialInputAddrCoins[i] = acc.GetCoins() - } - for i := 0; i < len(msg.Outputs); i++ { - acc := app.AccountMapper.GetAccount(ctx, msg.Outputs[i].Address) - initialOutputAddrCoins[i] = acc.GetCoins() - } - tx := mock.GenTx([]sdk.Msg{msg}, - AccountNumbers, - SequenceNumbers, - privkeys...) - res := app.Deliver(tx) - if !res.IsOK() { - // TODO: Do this in a more 'canonical' way - fmt.Println(res) - fmt.Println(log) - t.FailNow() - } - - for i := 0; i < len(msg.Inputs); i++ { - terminalInputCoins := app.AccountMapper.GetAccount(ctx, msg.Inputs[i].Address).GetCoins() - require.Equal(t, - initialInputAddrCoins[i].Minus(msg.Inputs[i].Coins), - terminalInputCoins, - fmt.Sprintf("Input #%d had an incorrect amount of coins\n%s", i, log), - ) - } - for i := 0; i < len(msg.Outputs); i++ { - terminalOutputCoins := app.AccountMapper.GetAccount(ctx, msg.Outputs[i].Address).GetCoins() - require.Equal(t, - initialOutputAddrCoins[i].Plus(msg.Outputs[i].Coins), - terminalOutputCoins, - fmt.Sprintf("Output #%d had an incorrect amount of coins\n%s", i, log), - ) - } -} - -func randPositiveInt(r *rand.Rand, max sdk.Int) (sdk.Int, error) { - if !max.GT(sdk.OneInt()) { - return sdk.Int{}, errors.New("max too small") - } - max = max.Sub(sdk.OneInt()) - return sdk.NewIntFromBigInt(new(big.Int).Rand(r, max.BigInt())).Add(sdk.OneInt()), nil -} diff --git a/x/fee_distribution/keeper.go b/x/distribution/keeper.go similarity index 100% rename from x/fee_distribution/keeper.go rename to x/distribution/keeper.go diff --git a/x/fee_distribution/keeper_test.go b/x/distribution/keeper_test.go similarity index 100% rename from x/fee_distribution/keeper_test.go rename to x/distribution/keeper_test.go diff --git a/x/fee_distribution/movement.go b/x/distribution/movement.go similarity index 100% rename from x/fee_distribution/movement.go rename to x/distribution/movement.go diff --git a/x/fee_distribution/types.go b/x/distribution/types.go similarity index 100% rename from x/fee_distribution/types.go rename to x/distribution/types.go diff --git a/x/gov/client/cli/tx.go b/x/gov/client/cli/tx.go index 8f30aefc1..d19de9f07 100644 --- a/x/gov/client/cli/tx.go +++ b/x/gov/client/cli/tx.go @@ -2,31 +2,35 @@ package cli import ( "fmt" - - "github.com/spf13/cobra" - "github.com/spf13/viper" + "os" "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/utils" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/gov" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/viper" ) const ( - flagProposalID = "proposalID" - flagTitle = "title" - flagDescription = "description" - flagProposalType = "type" - flagDeposit = "deposit" - flagProposer = "proposer" - flagDepositer = "depositer" - flagVoter = "voter" - flagOption = "option" + flagProposalID = "proposal-id" + flagTitle = "title" + flagDescription = "description" + flagProposalType = "type" + flagDeposit = "deposit" + flagVoter = "voter" + flagOption = "option" + flagDepositer = "depositer" + flagStatus = "status" + flagLatestProposalIDs = "latest" ) -// submit a proposal tx +// GetCmdSubmitProposal implements submitting a proposal transaction command. func GetCmdSubmitProposal(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "submit-proposal", @@ -37,8 +41,13 @@ func GetCmdSubmitProposal(cdc *wire.Codec) *cobra.Command { strProposalType := viper.GetString(flagProposalType) initialDeposit := viper.GetString(flagDeposit) - // get the from address from the name flag - from, err := sdk.AccAddressFromBech32(viper.GetString(flagProposer)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) + + fromAddr, err := cliCtx.GetFromAddress() if err != nil { return err } @@ -53,24 +62,17 @@ func GetCmdSubmitProposal(cdc *wire.Codec) *cobra.Command { return err } - // create the message - msg := gov.NewMsgSubmitProposal(title, description, proposalType, from, amount) + msg := gov.NewMsgSubmitProposal(title, description, proposalType, fromAddr, amount) err = msg.ValidateBasic() if err != nil { return err } - // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - // proposalID must be returned, and it is a part of response - ctx.PrintResponse = true - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - return nil + // Build and sign the transaction, then broadcast to Tendermint + // proposalID must be returned, and it is a part of response. + cliCtx.PrintResponse = true + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } @@ -78,19 +80,23 @@ func GetCmdSubmitProposal(cdc *wire.Codec) *cobra.Command { cmd.Flags().String(flagDescription, "", "description of proposal") cmd.Flags().String(flagProposalType, "", "proposalType of proposal") cmd.Flags().String(flagDeposit, "", "deposit of proposal") - cmd.Flags().String(flagProposer, "", "proposer of proposal") return cmd } -// set a new Deposit transaction +// GetCmdDeposit implements depositing tokens for an active proposal. func GetCmdDeposit(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "deposit", Short: "deposit tokens for activing proposal", RunE: func(cmd *cobra.Command, args []string) error { - // get the from address from the name flag - depositer, err := sdk.AccAddressFromBech32(viper.GetString(flagDepositer)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) + + depositerAddr, err := cliCtx.GetFromAddress() if err != nil { return err } @@ -102,47 +108,43 @@ func GetCmdDeposit(cdc *wire.Codec) *cobra.Command { return err } - // create the message - msg := gov.NewMsgDeposit(depositer, proposalID, amount) + msg := gov.NewMsgDeposit(depositerAddr, proposalID, amount) err = msg.ValidateBasic() if err != nil { return err } - // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - return nil + // Build and sign the transaction, then broadcast to a Tendermint + // node. + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } cmd.Flags().String(flagProposalID, "", "proposalID of proposal depositing on") - cmd.Flags().String(flagDepositer, "", "depositer of deposit") cmd.Flags().String(flagDeposit, "", "amount of deposit") return cmd } -// set a new Vote transaction +// GetCmdVote implements creating a new vote command. func GetCmdVote(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "vote", Short: "vote for an active proposal, options: Yes/No/NoWithVeto/Abstain", RunE: func(cmd *cobra.Command, args []string) error { + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - bechVoter := viper.GetString(flagVoter) - voter, err := sdk.AccAddressFromBech32(bechVoter) + voterAddr, err := cliCtx.GetFromAddress() if err != nil { return err } proposalID := viper.GetInt64(flagProposalID) - option := viper.GetString(flagOption) byteVoteOption, err := gov.VoteOptionFromString(option) @@ -150,55 +152,51 @@ func GetCmdVote(cdc *wire.Codec) *cobra.Command { return err } - // create the message - msg := gov.NewMsgVote(voter, proposalID, byteVoteOption) + msg := gov.NewMsgVote(voterAddr, proposalID, byteVoteOption) err = msg.ValidateBasic() if err != nil { return err } - fmt.Printf("Vote[Voter:%s,ProposalID:%d,Option:%s]", bechVoter, msg.ProposalID, msg.Option) + fmt.Printf("Vote[Voter:%s,ProposalID:%d,Option:%s]", + voterAddr.String(), msg.ProposalID, msg.Option.String(), + ) - // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - return nil + // Build and sign the transaction, then broadcast to a Tendermint + // node. + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } cmd.Flags().String(flagProposalID, "", "proposalID of proposal voting on") - cmd.Flags().String(flagVoter, "", "bech32 voter address") cmd.Flags().String(flagOption, "", "vote option {Yes, No, NoWithVeto, Abstain}") return cmd } -// Command to Get a Proposal Information +// GetCmdQueryProposal implements the query proposal command. func GetCmdQueryProposal(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "query-proposal", Short: "query proposal details", RunE: func(cmd *cobra.Command, args []string) error { + cliCtx := context.NewCLIContext().WithCodec(cdc) proposalID := viper.GetInt64(flagProposalID) - ctx := context.NewCoreContextFromViper() - - res, err := ctx.QueryStore(gov.KeyProposal(proposalID), storeName) + res, err := cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) if len(res) == 0 || err != nil { return errors.Errorf("proposalID [%d] is not existed", proposalID) } var proposal gov.Proposal cdc.MustUnmarshalBinary(res, &proposal) + output, err := wire.MarshalJSONIndent(cdc, proposal) if err != nil { return err } + fmt.Println(string(output)) return nil }, @@ -209,12 +207,120 @@ func GetCmdQueryProposal(storeName string, cdc *wire.Codec) *cobra.Command { return cmd } +// nolint: gocyclo +// GetCmdQueryProposals implements a query proposals command. +func GetCmdQueryProposals(storeName string, cdc *wire.Codec) *cobra.Command { + cmd := &cobra.Command{ + Use: "query-proposals", + Short: "query proposals with optional filters", + RunE: func(cmd *cobra.Command, args []string) error { + bechDepositerAddr := viper.GetString(flagDepositer) + bechVoterAddr := viper.GetString(flagVoter) + strProposalStatus := viper.GetString(flagStatus) + latestProposalsIDs := viper.GetInt64(flagLatestProposalIDs) + + var err error + var voterAddr sdk.AccAddress + var depositerAddr sdk.AccAddress + var proposalStatus gov.ProposalStatus + + if len(bechDepositerAddr) != 0 { + depositerAddr, err = sdk.AccAddressFromBech32(bechDepositerAddr) + if err != nil { + return err + } + } + + if len(bechVoterAddr) != 0 { + voterAddr, err = sdk.AccAddressFromBech32(bechVoterAddr) + if err != nil { + return err + } + } + + if len(strProposalStatus) != 0 { + proposalStatus, err = gov.ProposalStatusFromString(strProposalStatus) + if err != nil { + return err + } + } + + cliCtx := context.NewCLIContext().WithCodec(cdc) + + res, err := cliCtx.QueryStore(gov.KeyNextProposalID, storeName) + if err != nil { + return err + } + var maxProposalID int64 + cdc.MustUnmarshalBinary(res, &maxProposalID) + + matchingProposals := []gov.Proposal{} + + if latestProposalsIDs == 0 { + latestProposalsIDs = maxProposalID + } + + for proposalID := maxProposalID - latestProposalsIDs; proposalID < maxProposalID; proposalID++ { + if voterAddr != nil { + res, err = cliCtx.QueryStore(gov.KeyVote(proposalID, voterAddr), storeName) + if err != nil || len(res) == 0 { + continue + } + } + + if depositerAddr != nil { + res, err = cliCtx.QueryStore(gov.KeyDeposit(proposalID, depositerAddr), storeName) + if err != nil || len(res) == 0 { + continue + } + } + + res, err = cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) + if err != nil || len(res) == 0 { + continue + } + + var proposal gov.Proposal + cdc.MustUnmarshalBinary(res, &proposal) + + if len(strProposalStatus) != 0 { + if proposal.GetStatus() != proposalStatus { + continue + } + } + + matchingProposals = append(matchingProposals, proposal) + } + + if len(matchingProposals) == 0 { + fmt.Println("No matching proposals found") + return nil + } + + for _, proposal := range matchingProposals { + fmt.Printf(" %d - %s\n", proposal.GetProposalID(), proposal.GetTitle()) + } + + return nil + }, + } + + cmd.Flags().String(flagLatestProposalIDs, "", "(optional) limit to latest [number] proposals. Defaults to all proposals") + cmd.Flags().String(flagDepositer, "", "(optional) filter by proposals deposited on by depositer") + cmd.Flags().String(flagVoter, "", "(optional) filter by proposals voted on by voted") + cmd.Flags().String(flagStatus, "", "(optional) filter proposals by proposal status") + + return cmd +} + // Command to Get a Proposal Information +// GetCmdQueryVote implements the query proposal vote command. func GetCmdQueryVote(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "query-vote", Short: "query vote", RunE: func(cmd *cobra.Command, args []string) error { + cliCtx := context.NewCLIContext().WithCodec(cdc) proposalID := viper.GetInt64(flagProposalID) voterAddr, err := sdk.AccAddressFromBech32(viper.GetString(flagVoter)) @@ -222,19 +328,19 @@ func GetCmdQueryVote(storeName string, cdc *wire.Codec) *cobra.Command { return err } - ctx := context.NewCoreContextFromViper() - - res, err := ctx.QueryStore(gov.KeyVote(proposalID, voterAddr), storeName) + res, err := cliCtx.QueryStore(gov.KeyVote(proposalID, voterAddr), storeName) if len(res) == 0 || err != nil { return errors.Errorf("proposalID [%d] does not exist", proposalID) } var vote gov.Vote cdc.MustUnmarshalBinary(res, &vote) + output, err := wire.MarshalJSONIndent(cdc, vote) if err != nil { return err } + fmt.Println(string(output)) return nil }, @@ -246,17 +352,16 @@ func GetCmdQueryVote(storeName string, cdc *wire.Codec) *cobra.Command { return cmd } -// Command to Get a Proposal Information +// GetCmdQueryVotes implements the command to query for proposal votes. func GetCmdQueryVotes(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "query-votes", Short: "query votes on a proposal", RunE: func(cmd *cobra.Command, args []string) error { + cliCtx := context.NewCLIContext().WithCodec(cdc) proposalID := viper.GetInt64(flagProposalID) - ctx := context.NewCoreContextFromViper() - - res, err := ctx.QueryStore(gov.KeyProposal(proposalID), storeName) + res, err := cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) if len(res) == 0 || err != nil { return errors.Errorf("proposalID [%d] does not exist", proposalID) } @@ -269,7 +374,7 @@ func GetCmdQueryVotes(storeName string, cdc *wire.Codec) *cobra.Command { return nil } - res2, err := ctx.QuerySubspace(cdc, gov.KeyVotesSubspace(proposalID), storeName) + res2, err := cliCtx.QuerySubspace(gov.KeyVotesSubspace(proposalID), storeName) if err != nil { return err } @@ -287,7 +392,6 @@ func GetCmdQueryVotes(storeName string, cdc *wire.Codec) *cobra.Command { } fmt.Println(string(output)) - return nil }, } diff --git a/x/gov/client/rest/rest.go b/x/gov/client/rest/rest.go index b8fc781c0..a410c7791 100644 --- a/x/gov/client/rest/rest.go +++ b/x/gov/client/rest/rest.go @@ -9,6 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/gov" + "github.com/gorilla/mux" "github.com/pkg/errors" ) @@ -16,17 +17,18 @@ import ( // REST Variable names // nolint const ( - RestProposalID = "proposalID" - RestDepositer = "depositer" - RestVoter = "voter" - storeName = "gov" + RestProposalID = "proposalID" + RestDepositer = "depositer" + RestVoter = "voter" + RestProposalStatus = "status" + storeName = "gov" ) // RegisterRoutes - Central function to define routes that get registered by the main application -func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec) { - r.HandleFunc("/gov/proposals", postProposalHandlerFn(cdc, ctx)).Methods("POST") - r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/deposits", RestProposalID), depositHandlerFn(cdc, ctx)).Methods("POST") - r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/votes", RestProposalID), voteHandlerFn(cdc, ctx)).Methods("POST") +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec) { + r.HandleFunc("/gov/proposals", postProposalHandlerFn(cdc, cliCtx)).Methods("POST") + r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/deposits", RestProposalID), depositHandlerFn(cdc, cliCtx)).Methods("POST") + r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/votes", RestProposalID), voteHandlerFn(cdc, cliCtx)).Methods("POST") r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}", RestProposalID), queryProposalHandlerFn(cdc)).Methods("GET") r.HandleFunc(fmt.Sprintf("/gov/proposals/{%s}/deposits/{%s}", RestProposalID, RestDepositer), queryDepositHandlerFn(cdc)).Methods("GET") @@ -58,7 +60,7 @@ type voteReq struct { Option gov.VoteOption `json:"option"` // option from OptionSet chosen by the voter } -func postProposalHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { +func postProposalHandlerFn(cdc *wire.Codec, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req postProposalReq err := buildReq(w, r, cdc, &req) @@ -78,12 +80,11 @@ func postProposalHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.Handle return } - // sign - signAndBuild(w, ctx, req.BaseReq, msg, cdc) + signAndBuild(w, cliCtx, req.BaseReq, msg, cdc) } } -func depositHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { +func depositHandlerFn(cdc *wire.Codec, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) strProposalID := vars[RestProposalID] @@ -92,6 +93,7 @@ func depositHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc w.WriteHeader(http.StatusBadRequest) err := errors.New("proposalId required but not specified") w.Write([]byte(err.Error())) + return } @@ -99,6 +101,7 @@ func depositHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc if err != nil { err := errors.Errorf("proposalID [%d] is not positive", proposalID) w.Write([]byte(err.Error())) + return } @@ -119,12 +122,11 @@ func depositHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc return } - // sign - signAndBuild(w, ctx, req.BaseReq, msg, cdc) + signAndBuild(w, cliCtx, req.BaseReq, msg, cdc) } } -func voteHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { +func voteHandlerFn(cdc *wire.Codec, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) strProposalID := vars[RestProposalID] @@ -133,6 +135,7 @@ func voteHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.New("proposalId required but not specified") w.Write([]byte(err.Error())) + return } @@ -160,8 +163,7 @@ func voteHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { return } - // sign - signAndBuild(w, ctx, req.BaseReq, msg, cdc) + signAndBuild(w, cliCtx, req.BaseReq, msg, cdc) } } @@ -174,6 +176,7 @@ func queryProposalHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.New("proposalId required but not specified") w.Write([]byte(err.Error())) + return } @@ -181,26 +184,31 @@ func queryProposalHandlerFn(cdc *wire.Codec) http.HandlerFunc { if err != nil { err := errors.Errorf("proposalID [%d] is not positive", proposalID) w.Write([]byte(err.Error())) + return } - ctx := context.NewCoreContextFromViper() + cliCtx := context.NewCLIContext().WithCodec(cdc) - res, err := ctx.QueryStore(gov.KeyProposal(proposalID), storeName) + res, err := cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) if err != nil || len(res) == 0 { err := errors.Errorf("proposalID [%d] does not exist", proposalID) w.Write([]byte(err.Error())) + return } var proposal gov.Proposal cdc.MustUnmarshalBinary(res, &proposal) + output, err := wire.MarshalJSONIndent(cdc, proposal) if err != nil { w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) + return } + w.Write(output) } } @@ -215,6 +223,7 @@ func queryDepositHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.New("proposalId required but not specified") w.Write([]byte(err.Error())) + return } @@ -223,6 +232,7 @@ func queryDepositHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.Errorf("proposalID [%d] is not positive", proposalID) w.Write([]byte(err.Error())) + return } @@ -230,6 +240,7 @@ func queryDepositHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.New("depositer address required but not specified") w.Write([]byte(err.Error())) + return } @@ -238,34 +249,41 @@ func queryDepositHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.Errorf("'%s' needs to be bech32 encoded", RestDepositer) w.Write([]byte(err.Error())) + return } - ctx := context.NewCoreContextFromViper() + cliCtx := context.NewCLIContext().WithCodec(cdc) - res, err := ctx.QueryStore(gov.KeyDeposit(proposalID, depositerAddr), storeName) + res, err := cliCtx.QueryStore(gov.KeyDeposit(proposalID, depositerAddr), storeName) if err != nil || len(res) == 0 { - res, err := ctx.QueryStore(gov.KeyProposal(proposalID), storeName) + res, err := cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) if err != nil || len(res) == 0 { w.WriteHeader(http.StatusNotFound) err := errors.Errorf("proposalID [%d] does not exist", proposalID) w.Write([]byte(err.Error())) + return } + w.WriteHeader(http.StatusNotFound) err = errors.Errorf("depositer [%s] did not deposit on proposalID [%d]", bechDepositerAddr, proposalID) w.Write([]byte(err.Error())) + return } var deposit gov.Deposit cdc.MustUnmarshalBinary(res, &deposit) + output, err := wire.MarshalJSONIndent(cdc, deposit) if err != nil { w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) + return } + w.Write(output) } } @@ -288,6 +306,7 @@ func queryVoteHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.Errorf("proposalID [%s] is not positive", proposalID) w.Write([]byte(err.Error())) + return } @@ -303,35 +322,41 @@ func queryVoteHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.Errorf("'%s' needs to be bech32 encoded", RestVoter) w.Write([]byte(err.Error())) + return } - ctx := context.NewCoreContextFromViper() + cliCtx := context.NewCLIContext().WithCodec(cdc) - res, err := ctx.QueryStore(gov.KeyVote(proposalID, voterAddr), storeName) + res, err := cliCtx.QueryStore(gov.KeyVote(proposalID, voterAddr), storeName) if err != nil || len(res) == 0 { - - res, err := ctx.QueryStore(gov.KeyProposal(proposalID), storeName) + res, err := cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) if err != nil || len(res) == 0 { w.WriteHeader(http.StatusNotFound) err := errors.Errorf("proposalID [%d] does not exist", proposalID) w.Write([]byte(err.Error())) + return } + w.WriteHeader(http.StatusNotFound) err = errors.Errorf("voter [%s] did not vote on proposalID [%d]", bechVoterAddr, proposalID) w.Write([]byte(err.Error())) + return } var vote gov.Vote cdc.MustUnmarshalBinary(res, &vote) + output, err := wire.MarshalJSONIndent(cdc, vote) if err != nil { w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) + return } + w.Write(output) } } @@ -347,6 +372,7 @@ func queryVotesOnProposalHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.New("proposalId required but not specified") w.Write([]byte(err.Error())) + return } @@ -355,15 +381,17 @@ func queryVotesOnProposalHandlerFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.Errorf("proposalID [%s] is not positive", proposalID) w.Write([]byte(err.Error())) + return } - ctx := context.NewCoreContextFromViper() + cliCtx := context.NewCLIContext().WithCodec(cdc) - res, err := ctx.QueryStore(gov.KeyProposal(proposalID), storeName) + res, err := cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) if err != nil || len(res) == 0 { err := errors.Errorf("proposalID [%d] does not exist", proposalID) w.Write([]byte(err.Error())) + return } @@ -373,10 +401,11 @@ func queryVotesOnProposalHandlerFn(cdc *wire.Codec) http.HandlerFunc { if proposal.GetStatus() != gov.StatusVotingPeriod { err := errors.Errorf("proposal is not in Voting Period", proposalID) w.Write([]byte(err.Error())) + return } - res2, err := ctx.QuerySubspace(cdc, gov.KeyVotesSubspace(proposalID), storeName) + res2, err := cliCtx.QuerySubspace(gov.KeyVotesSubspace(proposalID), storeName) if err != nil { err = errors.New("ProposalID doesn't exist") w.Write([]byte(err.Error())) @@ -395,8 +424,10 @@ func queryVotesOnProposalHandlerFn(cdc *wire.Codec) http.HandlerFunc { if err != nil { w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) + return } + w.Write(output) } } @@ -407,10 +438,12 @@ func queryProposalsWithParameterFn(cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { bechVoterAddr := r.URL.Query().Get(RestVoter) bechDepositerAddr := r.URL.Query().Get(RestDepositer) + strProposalStatus := r.URL.Query().Get(RestProposalStatus) var err error var voterAddr sdk.AccAddress var depositerAddr sdk.AccAddress + var proposalStatus gov.ProposalStatus if len(bechVoterAddr) != 0 { voterAddr, err = sdk.AccAddressFromBech32(bechVoterAddr) @@ -428,18 +461,32 @@ func queryProposalsWithParameterFn(cdc *wire.Codec) http.HandlerFunc { w.WriteHeader(http.StatusBadRequest) err := errors.Errorf("'%s' needs to be bech32 encoded", RestDepositer) w.Write([]byte(err.Error())) + return } } - ctx := context.NewCoreContextFromViper() + if len(strProposalStatus) != 0 { + proposalStatus, err = gov.ProposalStatusFromString(strProposalStatus) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + err := errors.Errorf("'%s' is not a valid Proposal Status", strProposalStatus) + w.Write([]byte(err.Error())) - res, err := ctx.QueryStore(gov.KeyNextProposalID, storeName) + return + } + } + + cliCtx := context.NewCLIContext().WithCodec(cdc) + + res, err := cliCtx.QueryStore(gov.KeyNextProposalID, storeName) if err != nil { err = errors.New("no proposals exist yet and proposalID has not been set") w.Write([]byte(err.Error())) + return } + var maxProposalID int64 cdc.MustUnmarshalBinary(res, &maxProposalID) @@ -447,26 +494,33 @@ func queryProposalsWithParameterFn(cdc *wire.Codec) http.HandlerFunc { for proposalID := int64(0); proposalID < maxProposalID; proposalID++ { if voterAddr != nil { - res, err = ctx.QueryStore(gov.KeyVote(proposalID, voterAddr), storeName) + res, err = cliCtx.QueryStore(gov.KeyVote(proposalID, voterAddr), storeName) if err != nil || len(res) == 0 { continue } } if depositerAddr != nil { - res, err = ctx.QueryStore(gov.KeyDeposit(proposalID, depositerAddr), storeName) + res, err = cliCtx.QueryStore(gov.KeyDeposit(proposalID, depositerAddr), storeName) if err != nil || len(res) == 0 { continue } } - res, err = ctx.QueryStore(gov.KeyProposal(proposalID), storeName) + res, err = cliCtx.QueryStore(gov.KeyProposal(proposalID), storeName) if err != nil || len(res) == 0 { continue } + var proposal gov.Proposal cdc.MustUnmarshalBinary(res, &proposal) + if len(strProposalStatus) != 0 { + if proposal.GetStatus() != proposalStatus { + continue + } + } + matchingProposals = append(matchingProposals, proposal) } @@ -474,8 +528,10 @@ func queryProposalsWithParameterFn(cdc *wire.Codec) http.HandlerFunc { if err != nil { w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) + return } + w.Write(output) } } diff --git a/x/gov/client/rest/util.go b/x/gov/client/rest/util.go index 341f0b057..58d96b591 100644 --- a/x/gov/client/rest/util.go +++ b/x/gov/client/rest/util.go @@ -7,6 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" + "github.com/pkg/errors" ) @@ -67,23 +69,24 @@ func writeErr(w *http.ResponseWriter, status int, msg string) { (*w).Write([]byte(err.Error())) } -// TODO: Build this function out into a more generic base-request (probably should live in client/lcd) -func signAndBuild(w http.ResponseWriter, ctx context.CoreContext, baseReq baseReq, msg sdk.Msg, cdc *wire.Codec) { - ctx = ctx.WithAccountNumber(baseReq.AccountNumber) - ctx = ctx.WithSequence(baseReq.Sequence) - ctx = ctx.WithChainID(baseReq.ChainID) +// TODO: Build this function out into a more generic base-request +// (probably should live in client/lcd). +func signAndBuild(w http.ResponseWriter, cliCtx context.CLIContext, baseReq baseReq, msg sdk.Msg, cdc *wire.Codec) { + txCtx := authctx.TxContext{ + Codec: cdc, + AccountNumber: baseReq.AccountNumber, + Sequence: baseReq.Sequence, + ChainID: baseReq.ChainID, + Gas: baseReq.Gas, + } - // add gas to context - ctx = ctx.WithGas(baseReq.Gas) - - txBytes, err := ctx.SignAndBuild(baseReq.Name, baseReq.Password, []sdk.Msg{msg}, cdc) + txBytes, err := txCtx.BuildAndSign(baseReq.Name, baseReq.Password, []sdk.Msg{msg}) if err != nil { writeErr(&w, http.StatusUnauthorized, err.Error()) return } - // send - res, err := ctx.BroadcastTx(txBytes) + res, err := cliCtx.BroadcastTx(txBytes) if err != nil { writeErr(&w, http.StatusInternalServerError, err.Error()) return diff --git a/x/gov/endblocker_test.go b/x/gov/endblocker_test.go index 0070bb577..9dd241aab 100644 --- a/x/gov/endblocker_test.go +++ b/x/gov/endblocker_test.go @@ -6,6 +6,7 @@ import ( "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/stake" abci "github.com/tendermint/tendermint/abci/types" ) @@ -18,7 +19,7 @@ func TestTickExpiredDepositPeriod(t *testing.T) { require.Nil(t, keeper.InactiveProposalQueuePeek(ctx)) require.False(t, shouldPopInactiveProposalQueue(ctx, keeper)) - newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewCoin("steak", 5)}) + newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewInt64Coin("steak", 5)}) res := govHandler(ctx, newProposalMsg) require.True(t, res.IsOK()) @@ -49,7 +50,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { require.Nil(t, keeper.InactiveProposalQueuePeek(ctx)) require.False(t, shouldPopInactiveProposalQueue(ctx, keeper)) - newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewCoin("steak", 5)}) + newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewInt64Coin("steak", 5)}) res := govHandler(ctx, newProposalMsg) require.True(t, res.IsOK()) @@ -63,7 +64,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { require.NotNil(t, keeper.InactiveProposalQueuePeek(ctx)) require.False(t, shouldPopInactiveProposalQueue(ctx, keeper)) - newProposalMsg2 := NewMsgSubmitProposal("Test2", "test2", ProposalTypeText, addrs[1], sdk.Coins{sdk.NewCoin("steak", 5)}) + newProposalMsg2 := NewMsgSubmitProposal("Test2", "test2", ProposalTypeText, addrs[1], sdk.Coins{sdk.NewInt64Coin("steak", 5)}) res = govHandler(ctx, newProposalMsg2) require.True(t, res.IsOK()) @@ -93,7 +94,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { require.Nil(t, keeper.ActiveProposalQueuePeek(ctx)) require.False(t, shouldPopActiveProposalQueue(ctx, keeper)) - newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewCoin("steak", 5)}) + newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewInt64Coin("steak", 5)}) res := govHandler(ctx, newProposalMsg) require.True(t, res.IsOK()) @@ -109,7 +110,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { require.NotNil(t, keeper.InactiveProposalQueuePeek(ctx)) require.False(t, shouldPopInactiveProposalQueue(ctx, keeper)) - newDepositMsg := NewMsgDeposit(addrs[1], proposalID, sdk.Coins{sdk.NewCoin("steak", 5)}) + newDepositMsg := NewMsgDeposit(addrs[1], proposalID, sdk.Coins{sdk.NewInt64Coin("steak", 5)}) res = govHandler(ctx, newDepositMsg) require.True(t, res.IsOK()) @@ -123,6 +124,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { require.False(t, shouldPopInactiveProposalQueue(ctx, keeper)) require.NotNil(t, keeper.ActiveProposalQueuePeek(ctx)) require.False(t, shouldPopActiveProposalQueue(ctx, keeper)) + } func TestTickPassedVotingPeriod(t *testing.T) { @@ -137,7 +139,7 @@ func TestTickPassedVotingPeriod(t *testing.T) { require.Nil(t, keeper.ActiveProposalQueuePeek(ctx)) require.False(t, shouldPopActiveProposalQueue(ctx, keeper)) - newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewCoin("steak", 5)}) + newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewInt64Coin("steak", 5)}) res := govHandler(ctx, newProposalMsg) require.True(t, res.IsOK()) @@ -145,7 +147,7 @@ func TestTickPassedVotingPeriod(t *testing.T) { keeper.cdc.UnmarshalBinaryBare(res.Data, &proposalID) ctx = ctx.WithBlockHeight(10) - newDepositMsg := NewMsgDeposit(addrs[1], proposalID, sdk.Coins{sdk.NewCoin("steak", 5)}) + newDepositMsg := NewMsgDeposit(addrs[1], proposalID, sdk.Coins{sdk.NewInt64Coin("steak", 5)}) res = govHandler(ctx, newDepositMsg) require.True(t, res.IsOK()) @@ -165,4 +167,53 @@ func TestTickPassedVotingPeriod(t *testing.T) { require.False(t, depositsIterator.Valid()) depositsIterator.Close() require.Equal(t, StatusRejected, keeper.GetProposal(ctx, proposalID).GetStatus()) + require.True(t, keeper.GetProposal(ctx, proposalID).GetTallyResult().Equals(EmptyTallyResult())) +} + +func TestSlashing(t *testing.T) { + mapp, keeper, sk, addrs, _, _ := getMockApp(t, 10) + SortAddresses(addrs) + mapp.BeginBlock(abci.RequestBeginBlock{}) + ctx := mapp.BaseApp.NewContext(false, abci.Header{}) + govHandler := NewHandler(keeper) + stakeHandler := stake.NewHandler(sk) + + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{25, 6, 7}) + + initTotalPower := keeper.ds.GetValidatorSet().TotalPower(ctx) + val0Initial := keeper.ds.GetValidatorSet().Validator(ctx, addrs[0]).GetPower().Quo(initTotalPower) + val1Initial := keeper.ds.GetValidatorSet().Validator(ctx, addrs[1]).GetPower().Quo(initTotalPower) + val2Initial := keeper.ds.GetValidatorSet().Validator(ctx, addrs[2]).GetPower().Quo(initTotalPower) + + newProposalMsg := NewMsgSubmitProposal("Test", "test", ProposalTypeText, addrs[0], sdk.Coins{sdk.NewInt64Coin("steak", 15)}) + + res := govHandler(ctx, newProposalMsg) + require.True(t, res.IsOK()) + var proposalID int64 + keeper.cdc.UnmarshalBinaryBare(res.Data, &proposalID) + + ctx = ctx.WithBlockHeight(10) + require.Equal(t, StatusVotingPeriod, keeper.GetProposal(ctx, proposalID).GetStatus()) + + newVoteMsg := NewMsgVote(addrs[0], proposalID, OptionYes) + res = govHandler(ctx, newVoteMsg) + require.True(t, res.IsOK()) + + EndBlocker(ctx, keeper) + + ctx = ctx.WithBlockHeight(215) + require.Equal(t, StatusVotingPeriod, keeper.GetProposal(ctx, proposalID).GetStatus()) + + EndBlocker(ctx, keeper) + + require.False(t, keeper.GetProposal(ctx, proposalID).GetTallyResult().Equals(EmptyTallyResult())) + + endTotalPower := keeper.ds.GetValidatorSet().TotalPower(ctx) + val0End := keeper.ds.GetValidatorSet().Validator(ctx, addrs[0]).GetPower().Quo(endTotalPower) + val1End := keeper.ds.GetValidatorSet().Validator(ctx, addrs[1]).GetPower().Quo(endTotalPower) + val2End := keeper.ds.GetValidatorSet().Validator(ctx, addrs[2]).GetPower().Quo(endTotalPower) + + require.True(t, val0End.GTE(val0Initial)) + require.True(t, val1End.LT(val1Initial)) + require.True(t, val2End.LT(val2Initial)) } diff --git a/x/gov/genesis.go b/x/gov/genesis.go index 40218ca86..78b39ff1c 100644 --- a/x/gov/genesis.go +++ b/x/gov/genesis.go @@ -6,12 +6,18 @@ import ( // GenesisState - all staking state that must be provided at genesis type GenesisState struct { - StartingProposalID int64 `json:"starting_proposalID"` + StartingProposalID int64 `json:"starting_proposalID"` + DepositProcedure DepositProcedure `json:"deposit_period"` + VotingProcedure VotingProcedure `json:"voting_period"` + TallyingProcedure TallyingProcedure `json:"tallying_procedure"` } -func NewGenesisState(startingProposalID int64) GenesisState { +func NewGenesisState(startingProposalID int64, dp DepositProcedure, vp VotingProcedure, tp TallyingProcedure) GenesisState { return GenesisState{ StartingProposalID: startingProposalID, + DepositProcedure: dp, + VotingProcedure: vp, + TallyingProcedure: tp, } } @@ -19,6 +25,18 @@ func NewGenesisState(startingProposalID int64) GenesisState { func DefaultGenesisState() GenesisState { return GenesisState{ StartingProposalID: 1, + DepositProcedure: DepositProcedure{ + MinDeposit: sdk.Coins{sdk.NewInt64Coin("steak", 10)}, + MaxDepositPeriod: 200, + }, + VotingProcedure: VotingProcedure{ + VotingPeriod: 200, + }, + TallyingProcedure: TallyingProcedure{ + Threshold: sdk.NewRat(1, 2), + Veto: sdk.NewRat(1, 3), + GovernancePenalty: sdk.NewRat(1, 100), + }, } } @@ -29,13 +47,22 @@ func InitGenesis(ctx sdk.Context, k Keeper, data GenesisState) { // TODO: Handle this with #870 panic(err) } + k.setDepositProcedure(ctx, data.DepositProcedure) + k.setVotingProcedure(ctx, data.VotingProcedure) + k.setTallyingProcedure(ctx, data.TallyingProcedure) } // WriteGenesis - output genesis parameters func WriteGenesis(ctx sdk.Context, k Keeper) GenesisState { - initalProposalID, _ := k.getNewProposalID(ctx) + startingProposalID, _ := k.getNewProposalID(ctx) + depositProcedure := k.GetDepositProcedure(ctx) + votingProcedure := k.GetVotingProcedure(ctx) + tallyingProcedure := k.GetTallyingProcedure(ctx) return GenesisState{ - initalProposalID, + StartingProposalID: startingProposalID, + DepositProcedure: depositProcedure, + VotingProcedure: votingProcedure, + TallyingProcedure: tallyingProcedure, } } diff --git a/x/gov/handler.go b/x/gov/handler.go index 636454571..d1de0cbab 100644 --- a/x/gov/handler.go +++ b/x/gov/handler.go @@ -1,7 +1,10 @@ package gov import ( + "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/gov/tags" ) // Handle all "gov" type messages. @@ -32,19 +35,19 @@ func handleMsgSubmitProposal(ctx sdk.Context, keeper Keeper, msg MsgSubmitPropos proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(proposal.GetProposalID()) - tags := sdk.NewTags( - "action", []byte("submitProposal"), - "proposer", []byte(msg.Proposer.String()), - "proposalId", proposalIDBytes, + resTags := sdk.NewTags( + tags.Action, tags.ActionSubmitProposal, + tags.Proposer, []byte(msg.Proposer.String()), + tags.ProposalID, proposalIDBytes, ) if votingStarted { - tags.AppendTag("votingPeriodStart", proposalIDBytes) + resTags.AppendTag(tags.VotingPeriodStart, proposalIDBytes) } return sdk.Result{ Data: proposalIDBytes, - Tags: tags, + Tags: resTags, } } @@ -58,18 +61,18 @@ func handleMsgDeposit(ctx sdk.Context, keeper Keeper, msg MsgDeposit) sdk.Result proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(msg.ProposalID) // TODO: Add tag for if voting period started - tags := sdk.NewTags( - "action", []byte("deposit"), - "depositer", []byte(msg.Depositer.String()), - "proposalId", proposalIDBytes, + resTags := sdk.NewTags( + tags.Action, tags.ActionDeposit, + tags.Depositer, []byte(msg.Depositer.String()), + tags.ProposalID, proposalIDBytes, ) if votingStarted { - tags.AppendTag("votingPeriodStart", proposalIDBytes) + resTags.AppendTag(tags.VotingPeriodStart, proposalIDBytes) } return sdk.Result{ - Tags: tags, + Tags: resTags, } } @@ -82,61 +85,87 @@ func handleMsgVote(ctx sdk.Context, keeper Keeper, msg MsgVote) sdk.Result { proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(msg.ProposalID) - tags := sdk.NewTags( - "action", []byte("vote"), - "voter", []byte(msg.Voter.String()), - "proposalId", proposalIDBytes, + resTags := sdk.NewTags( + tags.Action, tags.ActionVote, + tags.Voter, []byte(msg.Voter.String()), + tags.ProposalID, proposalIDBytes, ) return sdk.Result{ - Tags: tags, + Tags: resTags, } } // Called every block, process inflation, update validator set -func EndBlocker(ctx sdk.Context, keeper Keeper) (tags sdk.Tags, nonVotingVals []sdk.AccAddress) { +func EndBlocker(ctx sdk.Context, keeper Keeper) (resTags sdk.Tags) { - tags = sdk.NewTags() + logger := ctx.Logger().With("module", "x/gov") + + resTags = sdk.NewTags() // Delete proposals that haven't met minDeposit for shouldPopInactiveProposalQueue(ctx, keeper) { inactiveProposal := keeper.InactiveProposalQueuePop(ctx) - if inactiveProposal.GetStatus() == StatusDepositPeriod { - proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(inactiveProposal.GetProposalID()) - keeper.DeleteProposal(ctx, inactiveProposal) - tags.AppendTag("action", []byte("proposalDropped")) - tags.AppendTag("proposalId", proposalIDBytes) + if inactiveProposal.GetStatus() != StatusDepositPeriod { + continue } - } - var passes bool + proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(inactiveProposal.GetProposalID()) + keeper.DeleteProposal(ctx, inactiveProposal) + resTags.AppendTag(tags.Action, tags.ActionProposalDropped) + resTags.AppendTag(tags.ProposalID, proposalIDBytes) + + logger.Info("Proposal %d - \"%s\" - didn't mean minimum deposit (had only %s), deleted", + inactiveProposal.GetProposalID(), inactiveProposal.GetTitle(), inactiveProposal.GetTotalDeposit()) + } // Check if earliest Active Proposal ended voting period yet for shouldPopActiveProposalQueue(ctx, keeper) { activeProposal := keeper.ActiveProposalQueuePop(ctx) - if ctx.BlockHeight() >= activeProposal.GetVotingStartBlock()+keeper.GetVotingProcedure().VotingPeriod { - passes, nonVotingVals = tally(ctx, keeper, activeProposal) - proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(activeProposal.GetProposalID()) - if passes { - keeper.RefundDeposits(ctx, activeProposal.GetProposalID()) - activeProposal.SetStatus(StatusPassed) - tags.AppendTag("action", []byte("proposalPassed")) - tags.AppendTag("proposalId", proposalIDBytes) - } else { - keeper.DeleteDeposits(ctx, activeProposal.GetProposalID()) - activeProposal.SetStatus(StatusRejected) - tags.AppendTag("action", []byte("proposalRejected")) - tags.AppendTag("proposalId", proposalIDBytes) - } - - keeper.SetProposal(ctx, activeProposal) + proposalStartBlock := activeProposal.GetVotingStartBlock() + votingPeriod := keeper.GetVotingProcedure(ctx).VotingPeriod + if ctx.BlockHeight() < proposalStartBlock+votingPeriod { + continue } + + passes, tallyResults, nonVotingVals := tally(ctx, keeper, activeProposal) + proposalIDBytes := keeper.cdc.MustMarshalBinaryBare(activeProposal.GetProposalID()) + var action []byte + if passes { + keeper.RefundDeposits(ctx, activeProposal.GetProposalID()) + activeProposal.SetStatus(StatusPassed) + action = tags.ActionProposalPassed + } else { + keeper.DeleteDeposits(ctx, activeProposal.GetProposalID()) + activeProposal.SetStatus(StatusRejected) + action = tags.ActionProposalRejected + } + activeProposal.SetTallyResult(tallyResults) + keeper.SetProposal(ctx, activeProposal) + + logger.Info("Proposal %d - \"%s\" - tallied, passed: %v", + activeProposal.GetProposalID(), activeProposal.GetTitle(), passes) + + for _, valAddr := range nonVotingVals { + val := keeper.ds.GetValidatorSet().Validator(ctx, valAddr) + keeper.ds.GetValidatorSet().Slash(ctx, + val.GetPubKey(), + ctx.BlockHeight(), + val.GetPower().RoundInt64(), + keeper.GetTallyingProcedure(ctx).GovernancePenalty) + + logger.Info(fmt.Sprintf("Validator %s failed to vote on proposal %d, slashing", + val.GetOwner(), activeProposal.GetProposalID())) + } + + resTags.AppendTag(tags.Action, action) + resTags.AppendTag(tags.ProposalID, proposalIDBytes) } - return tags, nonVotingVals + return resTags } func shouldPopInactiveProposalQueue(ctx sdk.Context, keeper Keeper) bool { - depositProcedure := keeper.GetDepositProcedure() + depositProcedure := keeper.GetDepositProcedure(ctx) peekProposal := keeper.InactiveProposalQueuePeek(ctx) if peekProposal == nil { @@ -150,7 +179,7 @@ func shouldPopInactiveProposalQueue(ctx sdk.Context, keeper Keeper) bool { } func shouldPopActiveProposalQueue(ctx sdk.Context, keeper Keeper) bool { - votingProcedure := keeper.GetVotingProcedure() + votingProcedure := keeper.GetVotingProcedure(ctx) peekProposal := keeper.ActiveProposalQueuePeek(ctx) if peekProposal == nil { diff --git a/x/gov/keeper.go b/x/gov/keeper.go index 572c5388e..8a23ad248 100644 --- a/x/gov/keeper.go +++ b/x/gov/keeper.go @@ -4,10 +4,21 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" wire "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/params" +) + +// nolint +const ( + ParamStoreKeyDepositProcedure = "gov/depositprocedure" + ParamStoreKeyVotingProcedure = "gov/votingprocedure" + ParamStoreKeyTallyingProcedure = "gov/tallyingprocedure" ) // Governance Keeper type Keeper struct { + // The reference to the ParamSetter to get and set Global Params + ps params.Setter + // The reference to the CoinKeeper to modify balances ck bank.Keeper @@ -28,9 +39,10 @@ type Keeper struct { } // NewGovernanceMapper returns a mapper that uses go-wire to (binary) encode and decode gov types. -func NewKeeper(cdc *wire.Codec, key sdk.StoreKey, ck bank.Keeper, ds sdk.DelegationSet, codespace sdk.CodespaceType) Keeper { +func NewKeeper(cdc *wire.Codec, key sdk.StoreKey, ps params.Setter, ck bank.Keeper, ds sdk.DelegationSet, codespace sdk.CodespaceType) Keeper { return Keeper{ storeKey: key, + ps: ps, ck: ck, ds: ds, vs: ds.GetValidatorSet(), @@ -59,6 +71,7 @@ func (keeper Keeper) NewTextProposal(ctx sdk.Context, title string, description Description: description, ProposalType: proposalType, Status: StatusDepositPeriod, + TallyResult: EmptyTallyResult(), TotalDeposit: sdk.Coins{}, SubmitBlock: ctx.BlockHeight(), VotingStartBlock: -1, // TODO: Make Time @@ -106,6 +119,18 @@ func (keeper Keeper) setInitialProposalID(ctx sdk.Context, proposalID int64) sdk return nil } +// Get the last used proposal ID +func (keeper Keeper) GetLastProposalID(ctx sdk.Context) (proposalID int64) { + store := ctx.KVStore(keeper.storeKey) + bz := store.Get(KeyNextProposalID) + if bz == nil { + return 0 + } + keeper.cdc.MustUnmarshalBinary(bz, &proposalID) + proposalID-- + return +} + func (keeper Keeper) getNewProposalID(ctx sdk.Context) (proposalID int64, err sdk.Error) { store := ctx.KVStore(keeper.storeKey) bz := store.Get(KeyNextProposalID) @@ -128,34 +153,37 @@ func (keeper Keeper) activateVotingPeriod(ctx sdk.Context, proposal Proposal) { // ===================================================== // Procedures -var ( - defaultMinDeposit int64 = 10 - defaultMaxDepositPeriod int64 = 10000 - defaultVotingPeriod int64 = 10000 -) - -// Gets procedure from store. TODO: move to global param store and allow for updating of this -func (keeper Keeper) GetDepositProcedure() DepositProcedure { - return DepositProcedure{ - MinDeposit: sdk.Coins{sdk.NewCoin("steak", defaultMinDeposit)}, - MaxDepositPeriod: defaultMaxDepositPeriod, - } +// Returns the current Deposit Procedure from the global param store +func (keeper Keeper) GetDepositProcedure(ctx sdk.Context) DepositProcedure { + var depositProcedure DepositProcedure + keeper.ps.Get(ctx, ParamStoreKeyDepositProcedure, &depositProcedure) + return depositProcedure } -// Gets procedure from store. TODO: move to global param store and allow for updating of this -func (keeper Keeper) GetVotingProcedure() VotingProcedure { - return VotingProcedure{ - VotingPeriod: defaultVotingPeriod, - } +// Returns the current Voting Procedure from the global param store +func (keeper Keeper) GetVotingProcedure(ctx sdk.Context) VotingProcedure { + var votingProcedure VotingProcedure + keeper.ps.Get(ctx, ParamStoreKeyVotingProcedure, &votingProcedure) + return votingProcedure } -// Gets procedure from store. TODO: move to global param store and allow for updating of this -func (keeper Keeper) GetTallyingProcedure() TallyingProcedure { - return TallyingProcedure{ - Threshold: sdk.NewRat(1, 2), - Veto: sdk.NewRat(1, 3), - GovernancePenalty: sdk.NewRat(1, 100), - } +// Returns the current Tallying Procedure from the global param store +func (keeper Keeper) GetTallyingProcedure(ctx sdk.Context) TallyingProcedure { + var tallyingProcedure TallyingProcedure + keeper.ps.Get(ctx, ParamStoreKeyTallyingProcedure, &tallyingProcedure) + return tallyingProcedure +} + +func (keeper Keeper) setDepositProcedure(ctx sdk.Context, depositProcedure DepositProcedure) { + keeper.ps.Set(ctx, ParamStoreKeyDepositProcedure, &depositProcedure) +} + +func (keeper Keeper) setVotingProcedure(ctx sdk.Context, votingProcedure VotingProcedure) { + keeper.ps.Set(ctx, ParamStoreKeyVotingProcedure, &votingProcedure) +} + +func (keeper Keeper) setTallyingProcedure(ctx sdk.Context, tallyingProcedure TallyingProcedure) { + keeper.ps.Set(ctx, ParamStoreKeyTallyingProcedure, &tallyingProcedure) } // ===================================================== @@ -262,7 +290,7 @@ func (keeper Keeper) AddDeposit(ctx sdk.Context, proposalID int64, depositerAddr // Check if deposit tipped proposal into voting period // Active voting period if so activatedVotingPeriod := false - if proposal.GetStatus() == StatusDepositPeriod && proposal.GetTotalDeposit().IsGTE(keeper.GetDepositProcedure().MinDeposit) { + if proposal.GetStatus() == StatusDepositPeriod && proposal.GetTotalDeposit().IsGTE(keeper.GetDepositProcedure(ctx).MinDeposit) { keeper.activateVotingPeriod(ctx, proposal) activatedVotingPeriod = true } diff --git a/x/gov/keeper_test.go b/x/gov/keeper_test.go index 988a8a6a7..442caee90 100644 --- a/x/gov/keeper_test.go +++ b/x/gov/keeper_test.go @@ -10,13 +10,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// overwrite defaults for testing -func init() { - defaultMinDeposit = 10 - defaultMaxDepositPeriod = 200 - defaultVotingPeriod = 200 -} - func TestGetSetProposal(t *testing.T) { mapp, keeper, _, _, _, _ := getMockApp(t, 0) mapp.BeginBlock(abci.RequestBeginBlock{}) @@ -70,14 +63,14 @@ func TestDeposits(t *testing.T) { proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() - fourSteak := sdk.Coins{sdk.NewCoin("steak", 4)} - fiveSteak := sdk.Coins{sdk.NewCoin("steak", 5)} + fourSteak := sdk.Coins{sdk.NewInt64Coin("steak", 4)} + fiveSteak := sdk.Coins{sdk.NewInt64Coin("steak", 5)} addr0Initial := keeper.ck.GetCoins(ctx, addrs[0]) addr1Initial := keeper.ck.GetCoins(ctx, addrs[1]) - // require.True(t, addr0Initial.IsEqual(sdk.Coins{sdk.NewCoin("steak", 42)})) - require.Equal(t, sdk.Coins{sdk.NewCoin("steak", 42)}, addr0Initial) + // require.True(t, addr0Initial.IsEqual(sdk.Coins{sdk.NewInt64Coin("steak", 42)})) + require.Equal(t, sdk.Coins{sdk.NewInt64Coin("steak", 42)}, addr0Initial) require.True(t, proposal.GetTotalDeposit().IsEqual(sdk.Coins{})) diff --git a/x/gov/msgs_test.go b/x/gov/msgs_test.go index 186b8365b..6d2b8bb38 100644 --- a/x/gov/msgs_test.go +++ b/x/gov/msgs_test.go @@ -10,11 +10,11 @@ import ( ) var ( - coinsPos = sdk.Coins{sdk.NewCoin("steak", 1000)} + coinsPos = sdk.Coins{sdk.NewInt64Coin("steak", 1000)} coinsZero = sdk.Coins{} - coinsNeg = sdk.Coins{sdk.NewCoin("steak", -10000)} - coinsPosNotAtoms = sdk.Coins{sdk.NewCoin("foo", 10000)} - coinsMulti = sdk.Coins{sdk.NewCoin("foo", 10000), sdk.NewCoin("steak", 1000)} + coinsNeg = sdk.Coins{sdk.NewInt64Coin("steak", -10000)} + coinsPosNotAtoms = sdk.Coins{sdk.NewInt64Coin("foo", 10000)} + coinsMulti = sdk.Coins{sdk.NewInt64Coin("foo", 10000), sdk.NewInt64Coin("steak", 1000)} ) // test ValidateBasic for MsgCreateValidator diff --git a/x/gov/proposals.go b/x/gov/proposals.go index 61aafe577..0a7f5de70 100644 --- a/x/gov/proposals.go +++ b/x/gov/proposals.go @@ -27,6 +27,9 @@ type Proposal interface { GetStatus() ProposalStatus SetStatus(ProposalStatus) + GetTallyResult() TallyResult + SetTallyResult(TallyResult) + GetSubmitBlock() int64 SetSubmitBlock(int64) @@ -39,17 +42,18 @@ type Proposal interface { // checks if two proposals are equal func ProposalEqual(proposalA Proposal, proposalB Proposal) bool { - if proposalA.GetProposalID() != proposalB.GetProposalID() || - proposalA.GetTitle() != proposalB.GetTitle() || - proposalA.GetDescription() != proposalB.GetDescription() || - proposalA.GetProposalType() != proposalB.GetProposalType() || - proposalA.GetStatus() != proposalB.GetStatus() || - proposalA.GetSubmitBlock() != proposalB.GetSubmitBlock() || - !(proposalA.GetTotalDeposit().IsEqual(proposalB.GetTotalDeposit())) || - proposalA.GetVotingStartBlock() != proposalB.GetVotingStartBlock() { - return false + if proposalA.GetProposalID() == proposalB.GetProposalID() && + proposalA.GetTitle() == proposalB.GetTitle() && + proposalA.GetDescription() == proposalB.GetDescription() && + proposalA.GetProposalType() == proposalB.GetProposalType() && + proposalA.GetStatus() == proposalB.GetStatus() && + proposalA.GetTallyResult().Equals(proposalB.GetTallyResult()) && + proposalA.GetSubmitBlock() == proposalB.GetSubmitBlock() && + proposalA.GetTotalDeposit().IsEqual(proposalB.GetTotalDeposit()) && + proposalA.GetVotingStartBlock() == proposalB.GetVotingStartBlock() { + return true } - return true + return false } //----------------------------------------------------------- @@ -60,7 +64,8 @@ type TextProposal struct { Description string `json:"description"` // Description of the proposal ProposalType ProposalKind `json:"proposal_type"` // Type of proposal. Initial set {PlainTextProposal, SoftwareUpgradeProposal} - Status ProposalStatus `json:"proposal_status"` // Status of the Proposal {Pending, Active, Passed, Rejected} + Status ProposalStatus `json:"proposal_status"` // Status of the Proposal {Pending, Active, Passed, Rejected} + TallyResult TallyResult `json:"tally_result"` // Result of Tallys SubmitBlock int64 `json:"submit_block"` // Height of the block where TxGovSubmitProposal was included TotalDeposit sdk.Coins `json:"total_deposit"` // Current deposit on this proposal. Initial value is set at InitialDeposit @@ -82,6 +87,8 @@ func (tp TextProposal) GetProposalType() ProposalKind { return tp.P func (tp *TextProposal) SetProposalType(proposalType ProposalKind) { tp.ProposalType = proposalType } func (tp TextProposal) GetStatus() ProposalStatus { return tp.Status } func (tp *TextProposal) SetStatus(status ProposalStatus) { tp.Status = status } +func (tp TextProposal) GetTallyResult() TallyResult { return tp.TallyResult } +func (tp *TextProposal) SetTallyResult(tallyResult TallyResult) { tp.TallyResult = tallyResult } func (tp TextProposal) GetSubmitBlock() int64 { return tp.SubmitBlock } func (tp *TextProposal) SetSubmitBlock(submitBlock int64) { tp.SubmitBlock = submitBlock } func (tp TextProposal) GetTotalDeposit() sdk.Coins { return tp.TotalDeposit } @@ -286,3 +293,33 @@ func (status ProposalStatus) Format(s fmt.State, verb rune) { s.Write([]byte(fmt.Sprintf("%v", byte(status)))) } } + +//----------------------------------------------------------- +// Tally Results +type TallyResult struct { + Yes sdk.Rat `json:"yes"` + Abstain sdk.Rat `json:"abstain"` + No sdk.Rat `json:"no"` + NoWithVeto sdk.Rat `json:"no_with_veto"` +} + +// checks if two proposals are equal +func EmptyTallyResult() TallyResult { + return TallyResult{ + Yes: sdk.ZeroRat(), + Abstain: sdk.ZeroRat(), + No: sdk.ZeroRat(), + NoWithVeto: sdk.ZeroRat(), + } +} + +// checks if two proposals are equal +func (resultA TallyResult) Equals(resultB TallyResult) bool { + if resultA.Yes.Equal(resultB.Yes) && + resultA.Abstain.Equal(resultB.Abstain) && + resultA.No.Equal(resultB.No) && + resultA.NoWithVeto.Equal(resultB.NoWithVeto) { + return true + } + return false +} diff --git a/x/gov/simulation/invariants.go b/x/gov/simulation/invariants.go new file mode 100644 index 000000000..e9275f3c1 --- /dev/null +++ b/x/gov/simulation/invariants.go @@ -0,0 +1,19 @@ +package simulation + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" +) + +// AllInvariants tests all governance invariants +func AllInvariants() simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + // TODO Add some invariants! + // Checking proposal queues, no passed-but-unexecuted proposals, etc. + require.Nil(t, nil) + } +} diff --git a/x/gov/simulation/msgs.go b/x/gov/simulation/msgs.go new file mode 100644 index 000000000..596a013d3 --- /dev/null +++ b/x/gov/simulation/msgs.go @@ -0,0 +1,132 @@ +package simulation + +import ( + "fmt" + "math/rand" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/tendermint/tendermint/crypto" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/gov" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + "github.com/cosmos/cosmos-sdk/x/stake" +) + +const ( + denom = "steak" +) + +// SimulateMsgSubmitProposal +func SimulateMsgSubmitProposal(k gov.Keeper, sk stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + key := simulation.RandomKey(r, keys) + addr := sdk.AccAddress(key.PubKey().Address()) + deposit := randomDeposit(r) + msg := gov.NewMsgSubmitProposal( + simulation.RandStringOfLength(r, 5), + simulation.RandStringOfLength(r, 5), + gov.ProposalTypeText, + addr, + deposit, + ) + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := gov.NewHandler(k)(ctx, msg) + if result.IsOK() { + // Update pool to keep invariants + pool := sk.GetPool(ctx) + pool.LooseTokens = pool.LooseTokens.Sub(sdk.NewRatFromInt(deposit.AmountOf(denom))) + sk.SetPool(ctx, pool) + write() + } + event(fmt.Sprintf("gov/MsgSubmitProposal/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgSubmitProposal: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgDeposit +func SimulateMsgDeposit(k gov.Keeper, sk stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + key := simulation.RandomKey(r, keys) + addr := sdk.AccAddress(key.PubKey().Address()) + proposalID, ok := randomProposalID(r, k, ctx) + if !ok { + return "no-operation", nil + } + deposit := randomDeposit(r) + msg := gov.NewMsgDeposit(addr, proposalID, deposit) + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := gov.NewHandler(k)(ctx, msg) + if result.IsOK() { + // Update pool to keep invariants + pool := sk.GetPool(ctx) + pool.LooseTokens = pool.LooseTokens.Sub(sdk.NewRatFromInt(deposit.AmountOf(denom))) + sk.SetPool(ctx, pool) + write() + } + event(fmt.Sprintf("gov/MsgDeposit/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgDeposit: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgVote +func SimulateMsgVote(k gov.Keeper, sk stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + key := simulation.RandomKey(r, keys) + addr := sdk.AccAddress(key.PubKey().Address()) + proposalID, ok := randomProposalID(r, k, ctx) + if !ok { + return "no-operation", nil + } + option := randomVotingOption(r) + msg := gov.NewMsgVote(addr, proposalID, option) + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := gov.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("gov/MsgVote/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgVote: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// Pick a random deposit +func randomDeposit(r *rand.Rand) sdk.Coins { + // TODO Choose based on account balance and min deposit + amount := int64(r.Intn(20)) + 1 + return sdk.Coins{sdk.NewInt64Coin(denom, amount)} +} + +// Pick a random proposal ID +func randomProposalID(r *rand.Rand, k gov.Keeper, ctx sdk.Context) (proposalID int64, ok bool) { + lastProposalID := k.GetLastProposalID(ctx) + if lastProposalID < 1 { + return 0, false + } + proposalID = int64(r.Intn(int(lastProposalID))) + return proposalID, true +} + +// Pick a random voting option +func randomVotingOption(r *rand.Rand) gov.VoteOption { + switch r.Intn(4) { + case 0: + return gov.OptionYes + case 1: + return gov.OptionAbstain + case 2: + return gov.OptionNo + case 3: + return gov.OptionNoWithVeto + } + panic("should not happen") +} diff --git a/x/gov/simulation/sim_test.go b/x/gov/simulation/sim_test.go new file mode 100644 index 000000000..691aa1cd2 --- /dev/null +++ b/x/gov/simulation/sim_test.go @@ -0,0 +1,69 @@ +package simulation + +import ( + "encoding/json" + "math/rand" + "testing" + + abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/gov" + "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + "github.com/cosmos/cosmos-sdk/x/params" + "github.com/cosmos/cosmos-sdk/x/stake" +) + +// TestGovWithRandomMessages +func TestGovWithRandomMessages(t *testing.T) { + mapp := mock.NewApp() + + bank.RegisterWire(mapp.Cdc) + gov.RegisterWire(mapp.Cdc) + mapper := mapp.AccountMapper + coinKeeper := bank.NewKeeper(mapper) + stakeKey := sdk.NewKVStoreKey("stake") + stakeKeeper := stake.NewKeeper(mapp.Cdc, stakeKey, coinKeeper, stake.DefaultCodespace) + paramKey := sdk.NewKVStoreKey("params") + paramKeeper := params.NewKeeper(mapp.Cdc, paramKey) + govKey := sdk.NewKVStoreKey("gov") + govKeeper := gov.NewKeeper(mapp.Cdc, govKey, paramKeeper.Setter(), coinKeeper, stakeKeeper, gov.DefaultCodespace) + mapp.Router().AddRoute("gov", gov.NewHandler(govKeeper)) + mapp.SetEndBlocker(func(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { + gov.EndBlocker(ctx, govKeeper) + return abci.ResponseEndBlock{} + }) + + err := mapp.CompleteSetup([]*sdk.KVStoreKey{stakeKey, paramKey, govKey}) + if err != nil { + panic(err) + } + + appStateFn := func(r *rand.Rand, keys []crypto.PrivKey, accs []sdk.AccAddress) json.RawMessage { + mock.RandomSetGenesis(r, mapp, accs, []string{"stake"}) + return json.RawMessage("{}") + } + + setup := func(r *rand.Rand, privKeys []crypto.PrivKey) { + ctx := mapp.NewContext(false, abci.Header{}) + stake.InitGenesis(ctx, stakeKeeper, stake.DefaultGenesisState()) + gov.InitGenesis(ctx, govKeeper, gov.DefaultGenesisState()) + } + + simulation.Simulate( + t, mapp.BaseApp, appStateFn, + []simulation.TestAndRunTx{ + SimulateMsgSubmitProposal(govKeeper, stakeKeeper), + SimulateMsgDeposit(govKeeper, stakeKeeper), + SimulateMsgVote(govKeeper, stakeKeeper), + }, []simulation.RandSetup{ + setup, + }, []simulation.Invariant{ + AllInvariants(), + }, 10, 100, + false, + ) +} diff --git a/x/gov/tags/tags.go b/x/gov/tags/tags.go new file mode 100644 index 000000000..2eded1901 --- /dev/null +++ b/x/gov/tags/tags.go @@ -0,0 +1,22 @@ +// nolint +package tags + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var ( + ActionSubmitProposal = []byte("submit-proposal") + ActionDeposit = []byte("deposit") + ActionVote = []byte("vote") + ActionProposalDropped = []byte("proposal-dropped") + ActionProposalPassed = []byte("proposal-passed") + ActionProposalRejected = []byte("proposal-rejected") + + Action = sdk.TagAction + Proposer = "proposer" + ProposalID = "proposal-id" + VotingPeriodStart = "voting-period-start" + Depositer = "depositer" + Voter = "voter" +) diff --git a/x/gov/tally.go b/x/gov/tally.go index 2d8e85f7b..f8a341e1e 100644 --- a/x/gov/tally.go +++ b/x/gov/tally.go @@ -13,7 +13,7 @@ type validatorGovInfo struct { Vote VoteOption // Vote of the validator } -func tally(ctx sdk.Context, keeper Keeper, proposal Proposal) (passes bool, nonVoting []sdk.AccAddress) { +func tally(ctx sdk.Context, keeper Keeper, proposal Proposal) (passes bool, tallyResults TallyResult, nonVoting []sdk.AccAddress) { results := make(map[VoteOption]sdk.Rat) results[OptionYes] = sdk.ZeroRat() results[OptionAbstain] = sdk.ZeroRat() @@ -81,20 +81,27 @@ func tally(ctx sdk.Context, keeper Keeper, proposal Proposal) (passes bool, nonV totalVotingPower = totalVotingPower.Add(votingPower) } - tallyingProcedure := keeper.GetTallyingProcedure() + tallyingProcedure := keeper.GetTallyingProcedure(ctx) + + tallyResults = TallyResult{ + Yes: results[OptionYes], + Abstain: results[OptionAbstain], + No: results[OptionNo], + NoWithVeto: results[OptionNoWithVeto], + } // If no one votes, proposal fails if totalVotingPower.Sub(results[OptionAbstain]).Equal(sdk.ZeroRat()) { - return false, nonVoting + return false, tallyResults, nonVoting } // If more than 1/3 of voters veto, proposal fails if results[OptionNoWithVeto].Quo(totalVotingPower).GT(tallyingProcedure.Veto) { - return false, nonVoting + return false, tallyResults, nonVoting } // If more than 1/2 of non-abstaining voters vote Yes, proposal passes if results[OptionYes].Quo(totalVotingPower.Sub(results[OptionAbstain])).GT(tallyingProcedure.Threshold) { - return true, nonVoting + return true, tallyResults, nonVoting } // If more than 1/2 of non-abstaining voters vote No, proposal fails - return false, nonVoting + return false, tallyResults, nonVoting } diff --git a/x/gov/tally_test.go b/x/gov/tally_test.go index 545912a81..730885266 100644 --- a/x/gov/tally_test.go +++ b/x/gov/tally_test.go @@ -7,31 +7,43 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" "github.com/cosmos/cosmos-sdk/x/stake" ) +var ( + pubkeys = []crypto.PubKey{ed25519.GenPrivKey().PubKey(), ed25519.GenPrivKey().PubKey(), ed25519.GenPrivKey().PubKey()} +) + +func createValidators(t *testing.T, stakeHandler sdk.Handler, ctx sdk.Context, addrs []sdk.AccAddress, coinAmt []int64) { + require.True(t, len(addrs) <= len(pubkeys), "Not enough pubkeys specified at top of file.") + dummyDescription := stake.NewDescription("T", "E", "S", "T") + for i := 0; i < len(addrs); i++ { + valCreateMsg := stake.NewMsgCreateValidator(addrs[i], pubkeys[i], sdk.NewInt64Coin("steak", coinAmt[i]), dummyDescription) + res := stakeHandler(ctx, valCreateMsg) + require.True(t, res.IsOK()) + } +} + func TestTallyNoOneVotes(t *testing.T) { mapp, keeper, sk, addrs, _, _ := getMockApp(t, 10) mapp.BeginBlock(abci.RequestBeginBlock{}) ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - stakeHandler(ctx, val2CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:2], []int64{5, 5}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() proposal.SetStatus(StatusVotingPeriod) keeper.SetProposal(ctx, proposal) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) + require.True(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyOnlyValidatorsAllYes(t *testing.T) { @@ -40,13 +52,7 @@ func TestTallyOnlyValidatorsAllYes(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - res := stakeHandler(ctx, val1CreateMsg) - require.True(t, res.IsOK()) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - res = stakeHandler(ctx, val2CreateMsg) - require.True(t, res.IsOK()) + createValidators(t, stakeHandler, ctx, addrs[:2], []int64{5, 5}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() @@ -58,9 +64,10 @@ func TestTallyOnlyValidatorsAllYes(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[1], OptionYes) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.True(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyOnlyValidators51No(t *testing.T) { @@ -69,11 +76,7 @@ func TestTallyOnlyValidators51No(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:2], []int64{5, 6}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() @@ -85,7 +88,7 @@ func TestTallyOnlyValidators51No(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[1], OptionNo) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, _, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) } @@ -96,13 +99,7 @@ func TestTallyOnlyValidators51Yes(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{6, 6, 7}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() @@ -116,9 +113,10 @@ func TestTallyOnlyValidators51Yes(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionNo) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.True(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyOnlyValidatorsVetoed(t *testing.T) { @@ -127,13 +125,7 @@ func TestTallyOnlyValidatorsVetoed(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{6, 6, 7}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() @@ -147,9 +139,10 @@ func TestTallyOnlyValidatorsVetoed(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionNoWithVeto) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) { @@ -158,13 +151,7 @@ func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{6, 6, 7}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() @@ -178,9 +165,10 @@ func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionYes) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.True(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyOnlyValidatorsAbstainFails(t *testing.T) { @@ -189,13 +177,7 @@ func TestTallyOnlyValidatorsAbstainFails(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{6, 6, 7}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() @@ -209,9 +191,10 @@ func TestTallyOnlyValidatorsAbstainFails(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionNo) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyOnlyValidatorsNonVoter(t *testing.T) { @@ -220,13 +203,7 @@ func TestTallyOnlyValidatorsNonVoter(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{6, 6, 7}) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) proposalID := proposal.GetProposalID() @@ -238,11 +215,12 @@ func TestTallyOnlyValidatorsNonVoter(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionNo) require.Nil(t, err) - passes, nonVoting := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, nonVoting := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) require.Equal(t, 1, len(nonVoting)) require.Equal(t, addrs[0], nonVoting[0]) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyDelgatorOverride(t *testing.T) { @@ -251,15 +229,9 @@ func TestTallyDelgatorOverride(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{5, 6, 7}) - delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewCoin("steak", 30)) + delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewInt64Coin("steak", 30)) stakeHandler(ctx, delegator1Msg) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) @@ -276,9 +248,10 @@ func TestTallyDelgatorOverride(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[3], OptionNo) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyDelgatorInherit(t *testing.T) { @@ -287,15 +260,9 @@ func TestTallyDelgatorInherit(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{5, 6, 7}) - delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewCoin("steak", 30)) + delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewInt64Coin("steak", 30)) stakeHandler(ctx, delegator1Msg) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) @@ -310,10 +277,11 @@ func TestTallyDelgatorInherit(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionYes) require.Nil(t, err) - passes, nonVoting := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, nonVoting := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.True(t, passes) require.Equal(t, 0, len(nonVoting)) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyDelgatorMultipleOverride(t *testing.T) { @@ -322,17 +290,11 @@ func TestTallyDelgatorMultipleOverride(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 5), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{5, 6, 7}) - delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewCoin("steak", 10)) + delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewInt64Coin("steak", 10)) stakeHandler(ctx, delegator1Msg) - delegator1Msg2 := stake.NewMsgDelegate(addrs[3], addrs[1], sdk.NewCoin("steak", 10)) + delegator1Msg2 := stake.NewMsgDelegate(addrs[3], addrs[1], sdk.NewInt64Coin("steak", 10)) stakeHandler(ctx, delegator1Msg2) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) @@ -349,9 +311,10 @@ func TestTallyDelgatorMultipleOverride(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[3], OptionNo) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyDelgatorMultipleInherit(t *testing.T) { @@ -361,16 +324,16 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) { stakeHandler := stake.NewHandler(sk) dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 25), dummyDescription) + val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewInt64Coin("steak", 25), dummyDescription) stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) + val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewInt64Coin("steak", 6), dummyDescription) stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) + val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewInt64Coin("steak", 7), dummyDescription) stakeHandler(ctx, val3CreateMsg) - delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewCoin("steak", 10)) + delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewInt64Coin("steak", 10)) stakeHandler(ctx, delegator1Msg) - delegator1Msg2 := stake.NewMsgDelegate(addrs[3], addrs[1], sdk.NewCoin("steak", 10)) + delegator1Msg2 := stake.NewMsgDelegate(addrs[3], addrs[1], sdk.NewInt64Coin("steak", 10)) stakeHandler(ctx, delegator1Msg2) proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText) @@ -385,9 +348,10 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionNo) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.False(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } func TestTallyRevokedValidator(t *testing.T) { @@ -396,17 +360,10 @@ func TestTallyRevokedValidator(t *testing.T) { ctx := mapp.BaseApp.NewContext(false, abci.Header{}) stakeHandler := stake.NewHandler(sk) - dummyDescription := stake.NewDescription("T", "E", "S", "T") - val1CreateMsg := stake.NewMsgCreateValidator(addrs[0], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 25), dummyDescription) - stakeHandler(ctx, val1CreateMsg) - val2CreateMsg := stake.NewMsgCreateValidator(addrs[1], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 6), dummyDescription) - stakeHandler(ctx, val2CreateMsg) - val3CreateMsg := stake.NewMsgCreateValidator(addrs[2], ed25519.GenPrivKey().PubKey(), sdk.NewCoin("steak", 7), dummyDescription) - stakeHandler(ctx, val3CreateMsg) - - delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewCoin("steak", 10)) + createValidators(t, stakeHandler, ctx, addrs[:3], []int64{25, 6, 7}) + delegator1Msg := stake.NewMsgDelegate(addrs[3], addrs[2], sdk.NewInt64Coin("steak", 10)) stakeHandler(ctx, delegator1Msg) - delegator1Msg2 := stake.NewMsgDelegate(addrs[3], addrs[1], sdk.NewCoin("steak", 10)) + delegator1Msg2 := stake.NewMsgDelegate(addrs[3], addrs[1], sdk.NewInt64Coin("steak", 10)) stakeHandler(ctx, delegator1Msg2) val2, found := sk.GetValidator(ctx, addrs[1]) @@ -425,7 +382,8 @@ func TestTallyRevokedValidator(t *testing.T) { err = keeper.AddVote(ctx, proposalID, addrs[2], OptionNo) require.Nil(t, err) - passes, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) + passes, tallyResults, _ := tally(ctx, keeper, keeper.GetProposal(ctx, proposalID)) require.True(t, passes) + require.False(t, tallyResults.Equals(EmptyTallyResult())) } diff --git a/x/gov/test_common.go b/x/gov/test_common.go index 5567e4697..df66fa40c 100644 --- a/x/gov/test_common.go +++ b/x/gov/test_common.go @@ -6,6 +6,8 @@ import ( "sort" "testing" + "github.com/cosmos/cosmos-sdk/x/params" + "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" @@ -24,20 +26,23 @@ func getMockApp(t *testing.T, numGenAccs int) (*mock.App, Keeper, stake.Keeper, stake.RegisterWire(mapp.Cdc) RegisterWire(mapp.Cdc) + keyGlobalParams := sdk.NewKVStoreKey("params") keyStake := sdk.NewKVStoreKey("stake") keyGov := sdk.NewKVStoreKey("gov") + pk := params.NewKeeper(mapp.Cdc, keyGlobalParams) ck := bank.NewKeeper(mapp.AccountMapper) sk := stake.NewKeeper(mapp.Cdc, keyStake, ck, mapp.RegisterCodespace(stake.DefaultCodespace)) - keeper := NewKeeper(mapp.Cdc, keyGov, ck, sk, DefaultCodespace) + keeper := NewKeeper(mapp.Cdc, keyGov, pk.Setter(), ck, sk, DefaultCodespace) mapp.Router().AddRoute("gov", NewHandler(keeper)) - require.NoError(t, mapp.CompleteSetup([]*sdk.KVStoreKey{keyStake, keyGov})) - mapp.SetEndBlocker(getEndBlocker(keeper)) mapp.SetInitChainer(getInitChainer(mapp, keeper, sk)) - genAccs, addrs, pubKeys, privKeys := mock.CreateGenAccounts(numGenAccs, sdk.Coins{sdk.NewCoin("steak", 42)}) + require.NoError(t, mapp.CompleteSetup([]*sdk.KVStoreKey{keyStake, keyGov, keyGlobalParams})) + + genAccs, addrs, pubKeys, privKeys := mock.CreateGenAccounts(numGenAccs, sdk.Coins{sdk.NewInt64Coin("steak", 42)}) + mock.SetGenesis(mapp, genAccs) return mapp, keeper, sk, addrs, pubKeys, privKeys @@ -46,7 +51,7 @@ func getMockApp(t *testing.T, numGenAccs int) (*mock.App, Keeper, stake.Keeper, // gov and stake endblocker func getEndBlocker(keeper Keeper) sdk.EndBlocker { return func(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { - tags, _ := EndBlocker(ctx, keeper) + tags := EndBlocker(ctx, keeper) return abci.ResponseEndBlock{ Tags: tags, } @@ -61,12 +66,14 @@ func getInitChainer(mapp *mock.App, keeper Keeper, stakeKeeper stake.Keeper) sdk stakeGenesis := stake.DefaultGenesisState() stakeGenesis.Pool.LooseTokens = sdk.NewRat(100000) - err := stake.InitGenesis(ctx, stakeKeeper, stakeGenesis) + validators, err := stake.InitGenesis(ctx, stakeKeeper, stakeGenesis) if err != nil { panic(err) } InitGenesis(ctx, keeper, DefaultGenesisState()) - return abci.ResponseInitChain{} + return abci.ResponseInitChain{ + Validators: validators, + } } } diff --git a/x/ibc/app_test.go b/x/ibc/app_test.go index d853c7987..5c3a0df78 100644 --- a/x/ibc/app_test.go +++ b/x/ibc/app_test.go @@ -36,7 +36,7 @@ func TestIBCMsgs(t *testing.T) { priv1 := ed25519.GenPrivKey() addr1 := sdk.AccAddress(priv1.PubKey().Address()) - coins := sdk.Coins{sdk.NewCoin("foocoin", 10)} + coins := sdk.Coins{sdk.NewInt64Coin("foocoin", 10)} var emptyCoins sdk.Coins acc := &auth.BaseAccount{ diff --git a/x/ibc/client/cli/ibctx.go b/x/ibc/client/cli/ibctx.go index f5505d9a4..f44c736d8 100644 --- a/x/ibc/client/cli/ibctx.go +++ b/x/ibc/client/cli/ibctx.go @@ -2,18 +2,19 @@ package cli import ( "encoding/hex" - - "github.com/spf13/cobra" - "github.com/spf13/viper" + "os" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" - + "github.com/cosmos/cosmos-sdk/client/utils" sdk "github.com/cosmos/cosmos-sdk/types" wire "github.com/cosmos/cosmos-sdk/wire" - authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/ibc" + + "github.com/spf13/cobra" + "github.com/spf13/viper" ) const ( @@ -22,37 +23,35 @@ const ( flagChain = "chain" ) -// IBC transfer command +// IBCTransferCmd implements the IBC transfer command. func IBCTransferCmd(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "transfer", RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - // get the from address - from, err := ctx.GetFromAddress() + from, err := cliCtx.GetFromAddress() if err != nil { return err } - // build the message msg, err := buildMsg(from) if err != nil { return err } - // get password - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } cmd.Flags().String(flagTo, "", "Address to send coins") cmd.Flags().String(flagAmount, "", "Amount of coins to send") cmd.Flags().String(flagChain, "", "Destination chain to send coins") + return cmd } diff --git a/x/ibc/client/cli/relay.go b/x/ibc/client/cli/relay.go index 58d8f272b..92b03a66f 100644 --- a/x/ibc/client/cli/relay.go +++ b/x/ibc/client/cli/relay.go @@ -4,17 +4,19 @@ import ( "os" "time" - "github.com/spf13/cobra" - "github.com/spf13/viper" - - "github.com/tendermint/tendermint/libs/log" - "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/keys" sdk "github.com/cosmos/cosmos-sdk/types" wire "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/auth" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/ibc" + + "github.com/spf13/cobra" + "github.com/spf13/viper" + + "github.com/tendermint/tendermint/libs/log" ) // flags @@ -36,7 +38,7 @@ type relayCommander struct { logger log.Logger } -// IBC relay command +// IBCRelayCmd implements the IBC relay command. func IBCRelayCmd(cdc *wire.Codec) *cobra.Command { cmdr := relayCommander{ cdc: cdc, @@ -77,10 +79,12 @@ func (c relayCommander) runIBCRelay(cmd *cobra.Command, args []string) { fromChainNode := viper.GetString(FlagFromChainNode) toChainID := viper.GetString(FlagToChainID) toChainNode := viper.GetString(FlagToChainNode) - address, err := context.NewCoreContextFromViper().GetFromAddress() + + address, err := context.NewCLIContext().GetFromAddress() if err != nil { panic(err) } + c.address = address c.loop(fromChainID, fromChainNode, toChainID, toChainNode) @@ -88,12 +92,10 @@ func (c relayCommander) runIBCRelay(cmd *cobra.Command, args []string) { // This is nolinted as someone is in the process of refactoring this to remove the goto // nolint: gocyclo -func (c relayCommander) loop(fromChainID, fromChainNode, toChainID, - toChainNode string) { +func (c relayCommander) loop(fromChainID, fromChainNode, toChainID, toChainNode string) { + cliCtx := context.NewCLIContext() - ctx := context.NewCoreContextFromViper() - // get password - passphrase, err := ctx.GetPassphraseFromStdin(ctx.FromAddressName) + passphrase, err := keys.ReadPassphraseFromStdin(cliCtx.FromAddressName) if err != nil { panic(err) } @@ -122,12 +124,14 @@ OUTER: c.logger.Error("error querying outgoing packet list length", "err", err) continue OUTER //TODO replace with continue (I think it should just to the correct place where OUTER is now) } + var egressLength int64 if egressLengthbz == nil { egressLength = 0 } else if err = c.cdc.UnmarshalBinary(egressLengthbz, &egressLength); err != nil { panic(err) } + if egressLength > processed { c.logger.Info("Detected IBC packet", "number", egressLength-1) } @@ -142,7 +146,9 @@ OUTER: } err = c.broadcastTx(seq, toChainNode, c.refine(egressbz, i, passphrase)) + seq++ + if err != nil { c.logger.Error("error broadcasting ingress packet", "err", err) continue OUTER // TODO replace to break, will break first loop then send back to the beginning (aka OUTER) @@ -154,11 +160,11 @@ OUTER: } func query(node string, key []byte, storeName string) (res []byte, err error) { - return context.NewCoreContextFromViper().WithNodeURI(node).QueryStore(key, storeName) + return context.NewCLIContext().WithNodeURI(node).QueryStore(key, storeName) } func (c relayCommander) broadcastTx(seq int64, node string, tx []byte) error { - _, err := context.NewCoreContextFromViper().WithNodeURI(node).WithSequence(seq + 1).BroadcastTx(tx) + _, err := context.NewCLIContext().WithNodeURI(node).BroadcastTx(tx) return err } @@ -167,6 +173,7 @@ func (c relayCommander) getSequence(node string) int64 { if err != nil { panic(err) } + if nil != res { account, err := c.decoder(res) if err != nil { @@ -191,10 +198,13 @@ func (c relayCommander) refine(bz []byte, sequence int64, passphrase string) []b Sequence: sequence, } - ctx := context.NewCoreContextFromViper().WithSequence(sequence) - res, err := ctx.SignAndBuild(ctx.FromAddressName, passphrase, []sdk.Msg{msg}, c.cdc) + txCtx := authctx.NewTxContextFromCLI().WithSequence(sequence).WithCodec(c.cdc) + cliCtx := context.NewCLIContext() + + res, err := txCtx.BuildAndSign(cliCtx.FromAddressName, passphrase, []sdk.Msg{msg}) if err != nil { panic(err) } + return res } diff --git a/x/ibc/client/rest/transfer.go b/x/ibc/client/rest/transfer.go index bee9f955f..4470f556e 100644 --- a/x/ibc/client/rest/transfer.go +++ b/x/ibc/client/rest/transfer.go @@ -4,18 +4,19 @@ import ( "io/ioutil" "net/http" - "github.com/cosmos/cosmos-sdk/crypto/keys" - "github.com/gorilla/mux" - "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/crypto/keys" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/ibc" + + "github.com/gorilla/mux" ) // RegisterRoutes - Central function to define routes that get registered by the main application -func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { - r.HandleFunc("/ibc/{destchain}/{address}/send", TransferRequestHandlerFn(cdc, kb, ctx)).Methods("POST") +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { + r.HandleFunc("/ibc/{destchain}/{address}/send", TransferRequestHandlerFn(cdc, kb, cliCtx)).Methods("POST") } type transferBody struct { @@ -31,9 +32,8 @@ type transferBody struct { // TransferRequestHandler - http request handler to transfer coins to a address // on a different chain via IBC -func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) http.HandlerFunc { +func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - // collect data vars := mux.Vars(r) destChainID := vars["destchain"] bech32addr := vars["address"] @@ -52,6 +52,7 @@ func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.Core w.Write([]byte(err.Error())) return } + err = cdc.UnmarshalJSON(body, &m) if err != nil { w.WriteHeader(http.StatusBadRequest) @@ -70,21 +71,22 @@ func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.Core packet := ibc.NewIBCPacket(sdk.AccAddress(info.GetPubKey().Address()), to, m.Amount, m.SrcChainID, destChainID) msg := ibc.IBCTransferMsg{packet} - // add gas to context - ctx = ctx.WithGas(m.Gas) + txCtx := authctx.TxContext{ + Codec: cdc, + ChainID: m.SrcChainID, + AccountNumber: m.AccountNumber, + Sequence: m.Sequence, + Gas: m.Gas, + } - // sign - ctx = ctx.WithAccountNumber(m.AccountNumber) - ctx = ctx.WithSequence(m.Sequence) - txBytes, err := ctx.SignAndBuild(m.LocalAccountName, m.Password, []sdk.Msg{msg}, cdc) + txBytes, err := txCtx.BuildAndSign(m.LocalAccountName, m.Password, []sdk.Msg{msg}) if err != nil { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte(err.Error())) return } - // send - res, err := ctx.BroadcastTx(txBytes) + res, err := cliCtx.BroadcastTx(txBytes) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) diff --git a/x/ibc/ibc_test.go b/x/ibc/ibc_test.go index d88204c70..88718b4a2 100644 --- a/x/ibc/ibc_test.go +++ b/x/ibc/ibc_test.go @@ -71,7 +71,7 @@ func TestIBC(t *testing.T) { dest := newAddress() chainid := "ibcchain" zero := sdk.Coins(nil) - mycoins := sdk.Coins{sdk.NewCoin("mycoin", 10)} + mycoins := sdk.Coins{sdk.NewInt64Coin("mycoin", 10)} coins, _, err := ck.AddCoins(ctx, src, mycoins) require.Nil(t, err) diff --git a/x/ibc/types_test.go b/x/ibc/types_test.go index cfe73ed13..e7c51d6b2 100644 --- a/x/ibc/types_test.go +++ b/x/ibc/types_test.go @@ -100,7 +100,7 @@ func TestIBCReceiveMsgValidation(t *testing.T) { func constructIBCPacket(valid bool) IBCPacket { srcAddr := sdk.AccAddress([]byte("source")) destAddr := sdk.AccAddress([]byte("destination")) - coins := sdk.Coins{sdk.NewCoin("atom", 10)} + coins := sdk.Coins{sdk.NewInt64Coin("atom", 10)} srcChain := "source-chain" destChain := "dest-chain" diff --git a/x/mock/app.go b/x/mock/app.go index cb013f972..f472c5531 100644 --- a/x/mock/app.go +++ b/x/mock/app.go @@ -11,6 +11,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" + "github.com/tendermint/tendermint/crypto/secp256k1" dbm "github.com/tendermint/tendermint/libs/db" "github.com/tendermint/tendermint/libs/log" ) @@ -48,7 +49,7 @@ func NewApp() *App { // Create your application object app := &App{ - BaseApp: bam.NewBaseApp("mock", cdc, logger, db), + BaseApp: bam.NewBaseApp("mock", logger, db, auth.DefaultTxDecoder(cdc)), Cdc: cdc, KeyMain: sdk.NewKVStoreKey("main"), KeyAccount: sdk.NewKVStoreKey("acc"), @@ -67,6 +68,8 @@ func NewApp() *App { app.SetInitChainer(app.InitChainer) app.SetAnteHandler(auth.NewAnteHandler(app.AccountMapper, app.FeeCollectionKeeper)) + // Not sealing for custom extension + return app } @@ -130,7 +133,7 @@ func SetGenesis(app *App, accs []auth.Account) { func GenTx(msgs []sdk.Msg, accnums []int64, seq []int64, priv ...crypto.PrivKey) auth.StdTx { // Make the transaction free fee := auth.StdFee{ - Amount: sdk.Coins{sdk.NewCoin("foocoin", 0)}, + Amount: sdk.Coins{sdk.NewInt64Coin("foocoin", 0)}, Gas: 100000, } @@ -171,7 +174,32 @@ func GeneratePrivKeyAddressPairs(n int) (keys []crypto.PrivKey, addrs []sdk.AccA keys = make([]crypto.PrivKey, n, n) addrs = make([]sdk.AccAddress, n, n) for i := 0; i < n; i++ { - keys[i] = ed25519.GenPrivKey() + if rand.Int63()%2 == 0 { + keys[i] = secp256k1.GenPrivKey() + } else { + keys[i] = ed25519.GenPrivKey() + } + addrs[i] = sdk.AccAddress(keys[i].PubKey().Address()) + } + return +} + +// GeneratePrivKeyAddressPairsFromRand generates a total of n private key, address +// pairs using the provided randomness source. +func GeneratePrivKeyAddressPairsFromRand(rand *rand.Rand, n int) (keys []crypto.PrivKey, addrs []sdk.AccAddress) { + keys = make([]crypto.PrivKey, n, n) + addrs = make([]sdk.AccAddress, n, n) + for i := 0; i < n; i++ { + secret := make([]byte, 32) + _, err := rand.Read(secret) + if err != nil { + panic("Could not read randomness") + } + if rand.Int63()%2 == 0 { + keys[i] = secp256k1.GenPrivKeySecp256k1(secret) + } else { + keys[i] = ed25519.GenPrivKeyFromSecret(secret) + } addrs[i] = sdk.AccAddress(keys[i].PubKey().Address()) } return @@ -203,8 +231,7 @@ func RandomSetGenesis(r *rand.Rand, app *App, addrs []sdk.AccAddress, denoms []s (&baseAcc).SetCoins(coins) accts[i] = &baseAcc } - - SetGenesis(app, accts) + app.GenesisAccounts = accts } // GetAllAccounts returns all accounts in the accountMapper. diff --git a/x/mock/app_test.go b/x/mock/app_test.go index 0c548280a..7477e1204 100644 --- a/x/mock/app_test.go +++ b/x/mock/app_test.go @@ -13,7 +13,7 @@ const msgType = "testMsg" var ( numAccts = 2 - genCoins = sdk.Coins{sdk.NewCoin("foocoin", 77)} + genCoins = sdk.Coins{sdk.NewInt64Coin("foocoin", 77)} accs, addrs, pubKeys, privKeys = CreateGenAccounts(numAccts, genCoins) ) diff --git a/x/mock/random_simulate_blocks.go b/x/mock/random_simulate_blocks.go deleted file mode 100644 index a37913065..000000000 --- a/x/mock/random_simulate_blocks.go +++ /dev/null @@ -1,95 +0,0 @@ -package mock - -import ( - "fmt" - "math/big" - "math/rand" - "testing" - "time" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" -) - -// RandomizedTesting tests application by sending random messages. -func (app *App) RandomizedTesting( - t *testing.T, ops []TestAndRunTx, setups []RandSetup, - invariants []Invariant, numKeys int, numBlocks int, blockSize int, -) { - time := time.Now().UnixNano() - app.RandomizedTestingFromSeed(t, time, ops, setups, invariants, numKeys, numBlocks, blockSize) -} - -// RandomizedTestingFromSeed tests an application by running the provided -// operations, testing the provided invariants, but using the provided seed. -func (app *App) RandomizedTestingFromSeed( - t *testing.T, seed int64, ops []TestAndRunTx, setups []RandSetup, - invariants []Invariant, numKeys int, numBlocks int, blockSize int, -) { - log := fmt.Sprintf("Starting SingleModuleTest with randomness created with seed %d", int(seed)) - keys, addrs := GeneratePrivKeyAddressPairs(numKeys) - r := rand.New(rand.NewSource(seed)) - - for i := 0; i < len(setups); i++ { - setups[i](r, keys) - } - - RandomSetGenesis(r, app, addrs, []string{"foocoin"}) - header := abci.Header{Height: 0} - - for i := 0; i < numBlocks; i++ { - app.BeginBlock(abci.RequestBeginBlock{}) - - // Make sure invariants hold at beginning of block and when nothing was - // done. - app.assertAllInvariants(t, invariants, log) - - ctx := app.NewContext(false, header) - - // TODO: Add modes to simulate "no load", "medium load", and - // "high load" blocks. - for j := 0; j < blockSize; j++ { - logUpdate, err := ops[r.Intn(len(ops))](t, r, app, ctx, keys, log) - log += "\n" + logUpdate - - require.Nil(t, err, log) - app.assertAllInvariants(t, invariants, log) - } - - app.EndBlock(abci.RequestEndBlock{}) - header.Height++ - } -} - -func (app *App) assertAllInvariants(t *testing.T, tests []Invariant, log string) { - for i := 0; i < len(tests); i++ { - tests[i](t, app, log) - } -} - -// BigInterval is a representation of the interval [lo, hi), where -// lo and hi are both of type sdk.Int -type BigInterval struct { - lo sdk.Int - hi sdk.Int -} - -// RandFromBigInterval chooses an interval uniformly from the provided list of -// BigIntervals, and then chooses an element from an interval uniformly at random. -func RandFromBigInterval(r *rand.Rand, intervals []BigInterval) sdk.Int { - if len(intervals) == 0 { - return sdk.ZeroInt() - } - - interval := intervals[r.Intn(len(intervals))] - - lo := interval.lo - hi := interval.hi - - diff := hi.Sub(lo) - result := sdk.NewIntFromBigInt(new(big.Int).Rand(r, diff.BigInt())) - result = result.Add(lo) - - return result -} diff --git a/x/mock/simulation/constants.go b/x/mock/simulation/constants.go new file mode 100644 index 000000000..985a22dca --- /dev/null +++ b/x/mock/simulation/constants.go @@ -0,0 +1,31 @@ +package simulation + +const ( + // Fraction of double-signing evidence from a past height + pastEvidenceFraction float64 = 0.5 + + // Minimum time per block + minTimePerBlock int64 = 86400 / 2 + + // Maximum time per block + maxTimePerBlock int64 = 86400 + + // Number of keys + numKeys int = 250 + + // Chance that double-signing evidence is found on a given block + evidenceFraction float64 = 0.01 + + // TODO Remove in favor of binary search for invariant violation + onOperation bool = false +) + +var ( + // Currently there are 3 different liveness types, fully online, spotty connection, offline. + initialLivenessWeightings = []int{40, 5, 5} + livenessTransitionMatrix, _ = CreateTransitionMatrix([][]int{ + {90, 20, 1}, + {10, 50, 5}, + {0, 10, 1000}, + }) +) diff --git a/x/mock/simulation/random_simulate_blocks.go b/x/mock/simulation/random_simulate_blocks.go new file mode 100644 index 000000000..c7e616614 --- /dev/null +++ b/x/mock/simulation/random_simulate_blocks.go @@ -0,0 +1,235 @@ +package simulation + +import ( + "encoding/json" + "fmt" + "math/rand" + "sort" + "testing" + "time" + + abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto" + tmtypes "github.com/tendermint/tendermint/types" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/stretchr/testify/require" +) + +// Simulate tests application by sending random messages. +func Simulate( + t *testing.T, app *baseapp.BaseApp, appStateFn func(r *rand.Rand, keys []crypto.PrivKey, accs []sdk.AccAddress) json.RawMessage, ops []TestAndRunTx, setups []RandSetup, + invariants []Invariant, numBlocks int, blockSize int, commit bool, +) { + time := time.Now().UnixNano() + SimulateFromSeed(t, app, appStateFn, time, ops, setups, invariants, numBlocks, blockSize, commit) +} + +// SimulateFromSeed tests an application by running the provided +// operations, testing the provided invariants, but using the provided seed. +func SimulateFromSeed( + t *testing.T, app *baseapp.BaseApp, appStateFn func(r *rand.Rand, keys []crypto.PrivKey, accs []sdk.AccAddress) json.RawMessage, seed int64, ops []TestAndRunTx, setups []RandSetup, + invariants []Invariant, numBlocks int, blockSize int, commit bool, +) { + log := fmt.Sprintf("Starting SimulateFromSeed with randomness created with seed %d", int(seed)) + fmt.Printf("%s\n", log) + r := rand.New(rand.NewSource(seed)) + keys, accs := mock.GeneratePrivKeyAddressPairsFromRand(r, numKeys) + + // Setup event stats + events := make(map[string]uint) + event := func(what string) { + log += "\nevent - " + what + events[what]++ + } + + timestamp := time.Unix(0, 0) + timeDiff := maxTimePerBlock - minTimePerBlock + + res := app.InitChain(abci.RequestInitChain{AppStateBytes: appStateFn(r, keys, accs)}) + validators := make(map[string]mockValidator) + for _, validator := range res.Validators { + validators[string(validator.Address)] = mockValidator{validator, GetMemberOfInitialState(r, initialLivenessWeightings)} + } + + for i := 0; i < len(setups); i++ { + setups[i](r, keys) + } + + header := abci.Header{Height: 0, Time: timestamp} + opCount := 0 + + request := abci.RequestBeginBlock{Header: header} + + var pastTimes []time.Time + + for i := 0; i < numBlocks; i++ { + + // Log the header time for future lookup + pastTimes = append(pastTimes, header.Time) + + // Run the BeginBlock handler + app.BeginBlock(request) + + log += "\nBeginBlock" + + // Make sure invariants hold at beginning of block + AssertAllInvariants(t, app, invariants, log) + + ctx := app.NewContext(false, header) + + var thisBlockSize int + load := r.Float64() + switch { + case load < 0.33: + thisBlockSize = 0 + case load < 0.66: + thisBlockSize = r.Intn(blockSize * 2) + default: + thisBlockSize = r.Intn(blockSize * 4) + } + for j := 0; j < thisBlockSize; j++ { + logUpdate, err := ops[r.Intn(len(ops))](t, r, app, ctx, keys, log, event) + log += "\n" + logUpdate + + require.Nil(t, err, log) + if onOperation { + AssertAllInvariants(t, app, invariants, log) + } + if opCount%200 == 0 { + fmt.Printf("\rSimulating... block %d/%d, operation %d.", header.Height, numBlocks, opCount) + } + opCount++ + } + + res := app.EndBlock(abci.RequestEndBlock{}) + header.Height++ + header.Time = header.Time.Add(time.Duration(minTimePerBlock) * time.Second).Add(time.Duration(int64(r.Intn(int(timeDiff)))) * time.Second) + + log += "\nEndBlock" + + // Make sure invariants hold at end of block + AssertAllInvariants(t, app, invariants, log) + + if commit { + app.Commit() + } + + // Generate a random RequestBeginBlock with the current validator set for the next block + request = RandomRequestBeginBlock(t, r, validators, livenessTransitionMatrix, evidenceFraction, pastTimes, event, header, log) + + // Update the validator set + validators = updateValidators(t, r, validators, res.ValidatorUpdates, event) + } + + fmt.Printf("\nSimulation complete. Final height (blocks): %d, final time (seconds): %v\n", header.Height, header.Time) + DisplayEvents(events) +} + +func getKeys(validators map[string]mockValidator) []string { + keys := make([]string, len(validators)) + i := 0 + for key := range validators { + keys[i] = key + i++ + } + sort.Strings(keys) + return keys +} + +// RandomRequestBeginBlock generates a list of signing validators according to the provided list of validators, signing fraction, and evidence fraction +func RandomRequestBeginBlock(t *testing.T, r *rand.Rand, validators map[string]mockValidator, livenessTransitions TransitionMatrix, evidenceFraction float64, + pastTimes []time.Time, event func(string), header abci.Header, log string) abci.RequestBeginBlock { + if len(validators) == 0 { + return abci.RequestBeginBlock{Header: header} + } + signingValidators := make([]abci.SigningValidator, len(validators)) + i := 0 + + for _, key := range getKeys(validators) { + mVal := validators[key] + mVal.livenessState = livenessTransitions.NextState(r, mVal.livenessState) + signed := true + + if mVal.livenessState == 1 { + // spotty connection, 50% probability of success + // See https://github.com/golang/go/issues/23804#issuecomment-365370418 + // for reasoning behind computing like this + signed = r.Int63()%2 == 0 + } else if mVal.livenessState == 2 { + // offline + signed = false + } + if signed { + event("beginblock/signing/signed") + } else { + event("beginblock/signing/missed") + } + signingValidators[i] = abci.SigningValidator{ + Validator: mVal.val, + SignedLastBlock: signed, + } + i++ + } + evidence := make([]abci.Evidence, 0) + for r.Float64() < evidenceFraction { + height := header.Height + time := header.Time + if r.Float64() < pastEvidenceFraction { + height = int64(r.Intn(int(header.Height))) + time = pastTimes[height] + } + validator := signingValidators[r.Intn(len(signingValidators))].Validator + var currentTotalVotingPower int64 + for _, mVal := range validators { + currentTotalVotingPower += mVal.val.Power + } + evidence = append(evidence, abci.Evidence{ + Type: tmtypes.ABCIEvidenceTypeDuplicateVote, + Validator: validator, + Height: height, + Time: time, + TotalVotingPower: currentTotalVotingPower, + }) + event("beginblock/evidence") + } + return abci.RequestBeginBlock{ + Header: header, + LastCommitInfo: abci.LastCommitInfo{ + Validators: signingValidators, + }, + ByzantineValidators: evidence, + } +} + +// AssertAllInvariants asserts a list of provided invariants against application state +func AssertAllInvariants(t *testing.T, app *baseapp.BaseApp, tests []Invariant, log string) { + for i := 0; i < len(tests); i++ { + tests[i](t, app, log) + } +} + +// updateValidators mimicks Tendermint's update logic +func updateValidators(t *testing.T, r *rand.Rand, current map[string]mockValidator, updates []abci.Validator, event func(string)) map[string]mockValidator { + for _, update := range updates { + switch { + case update.Power == 0: + require.NotNil(t, current[string(update.PubKey.Data)], "tried to delete a nonexistent validator") + event("endblock/validatorupdates/kicked") + delete(current, string(update.PubKey.Data)) + default: + // Does validator already exist? + if mVal, ok := current[string(update.PubKey.Data)]; ok { + mVal.val = update + event("endblock/validatorupdates/updated") + } else { + // Set this new validator + current[string(update.PubKey.Data)] = mockValidator{update, GetMemberOfInitialState(r, initialLivenessWeightings)} + event("endblock/validatorupdates/added") + } + } + } + return current +} diff --git a/x/mock/simulation/transition_matrix.go b/x/mock/simulation/transition_matrix.go new file mode 100644 index 000000000..39bdb1e4f --- /dev/null +++ b/x/mock/simulation/transition_matrix.go @@ -0,0 +1,70 @@ +package simulation + +import ( + "fmt" + "math/rand" +) + +// TransitionMatrix is _almost_ a left stochastic matrix. +// It is technically not one due to not normalizing the column values. +// In the future, if we want to find the steady state distribution, +// it will be quite easy to normalize these values to get a stochastic matrix. +// Floats aren't currently used as the default due to non-determinism across +// architectures +type TransitionMatrix struct { + weights [][]int + // total in each column + totals []int + n int +} + +// CreateTransitionMatrix creates a transition matrix from the provided weights. +// TODO: Provide example usage +func CreateTransitionMatrix(weights [][]int) (TransitionMatrix, error) { + n := len(weights) + for i := 0; i < n; i++ { + if len(weights[i]) != n { + return TransitionMatrix{}, fmt.Errorf("Transition Matrix: Non-square matrix provided, error on row %d", i) + } + } + totals := make([]int, n) + for row := 0; row < n; row++ { + for col := 0; col < n; col++ { + totals[col] += weights[row][col] + } + } + return TransitionMatrix{weights, totals, n}, nil +} + +// NextState returns the next state randomly chosen using r, and the weightings provided +// in the transition matrix. +func (t TransitionMatrix) NextState(r *rand.Rand, i int) int { + randNum := r.Intn(t.totals[i]) + for row := 0; row < t.n; row++ { + if randNum < t.weights[row][i] { + return row + } + randNum -= t.weights[row][i] + } + // This line should never get executed + return -1 +} + +// GetMemberOfInitialState takes an initial array of weights, of size n. +// It returns a weighted random number in [0,n). +func GetMemberOfInitialState(r *rand.Rand, weights []int) int { + n := len(weights) + total := 0 + for i := 0; i < n; i++ { + total += weights[i] + } + randNum := r.Intn(total) + for state := 0; state < n; state++ { + if randNum < weights[state] { + return state + } + randNum -= weights[state] + } + // This line should never get executed + return -1 +} diff --git a/x/mock/types.go b/x/mock/simulation/types.go similarity index 69% rename from x/mock/types.go rename to x/mock/simulation/types.go index 50957e1c4..35769b0b2 100644 --- a/x/mock/types.go +++ b/x/mock/simulation/types.go @@ -1,10 +1,12 @@ -package mock +package simulation import ( "math/rand" "testing" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" ) @@ -13,8 +15,8 @@ type ( // transition was as expected. It returns a descriptive message "action" // about what this fuzzed tx actually did, for ease of debugging. TestAndRunTx func( - t *testing.T, r *rand.Rand, app *App, ctx sdk.Context, - privKeys []crypto.PrivKey, log string, + t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, + privKeys []crypto.PrivKey, log string, event func(string), ) (action string, err sdk.Error) // RandSetup performs the random setup the mock module needs. @@ -23,14 +25,19 @@ type ( // An Invariant is a function which tests a particular invariant. // If the invariant has been broken, the function should halt the // test and output the log. - Invariant func(t *testing.T, app *App, log string) + Invariant func(t *testing.T, app *baseapp.BaseApp, log string) + + mockValidator struct { + val abci.Validator + livenessState int + } ) // PeriodicInvariant returns an Invariant function closure that asserts // a given invariant if the mock application's last block modulo the given // period is congruent to the given offset. func PeriodicInvariant(invariant Invariant, period int, offset int) Invariant { - return func(t *testing.T, app *App, log string) { + return func(t *testing.T, app *baseapp.BaseApp, log string) { if int(app.LastBlockHeight())%period == offset { invariant(t, app, log) } diff --git a/x/mock/simulation/util.go b/x/mock/simulation/util.go new file mode 100644 index 000000000..1d64ba30d --- /dev/null +++ b/x/mock/simulation/util.go @@ -0,0 +1,64 @@ +package simulation + +import ( + "fmt" + "math/rand" + "sort" + + "github.com/tendermint/tendermint/crypto" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// shamelessly copied from https://stackoverflow.com/questions/22892120/how-to-generate-a-random-string-of-a-fixed-length-in-golang#31832326 +// TODO we should probably move this to tendermint/libs/common/random.go + +const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +const ( + letterIdxBits = 6 // 6 bits to represent a letter index + letterIdxMask = 1<<letterIdxBits - 1 // All 1-bits, as many as letterIdxBits + letterIdxMax = 63 / letterIdxBits // # of letter indices fitting in 63 bits +) + +// Generate a random string of a particular length +func RandStringOfLength(r *rand.Rand, n int) string { + b := make([]byte, n) + // A src.Int63() generates 63 random bits, enough for letterIdxMax characters! + for i, cache, remain := n-1, r.Int63(), letterIdxMax; i >= 0; { + if remain == 0 { + cache, remain = r.Int63(), letterIdxMax + } + if idx := int(cache & letterIdxMask); idx < len(letterBytes) { + b[i] = letterBytes[idx] + i-- + } + cache >>= letterIdxBits + remain-- + } + return string(b) +} + +// Pretty-print events as a table +func DisplayEvents(events map[string]uint) { + var keys []string + for key := range events { + keys = append(keys, key) + } + sort.Strings(keys) + fmt.Printf("Event statistics: \n") + for _, key := range keys { + fmt.Printf(" % 60s => %d\n", key, events[key]) + } +} + +// Pick a random key from an array +func RandomKey(r *rand.Rand, keys []crypto.PrivKey) crypto.PrivKey { + return keys[r.Intn( + len(keys), + )] +} + +// Generate a random amount +func RandomAmount(r *rand.Rand, max sdk.Int) sdk.Int { + return sdk.NewInt(int64(r.Intn(int(max.Int64())))) +} diff --git a/x/mock/test_utils.go b/x/mock/test_utils.go index f9e1e8f5e..c97f1c0c8 100644 --- a/x/mock/test_utils.go +++ b/x/mock/test_utils.go @@ -1,6 +1,8 @@ package mock import ( + "math/big" + "math/rand" "testing" "github.com/cosmos/cosmos-sdk/baseapp" @@ -10,6 +12,32 @@ import ( "github.com/tendermint/tendermint/crypto" ) +// BigInterval is a representation of the interval [lo, hi), where +// lo and hi are both of type sdk.Int +type BigInterval struct { + lo sdk.Int + hi sdk.Int +} + +// RandFromBigInterval chooses an interval uniformly from the provided list of +// BigIntervals, and then chooses an element from an interval uniformly at random. +func RandFromBigInterval(r *rand.Rand, intervals []BigInterval) sdk.Int { + if len(intervals) == 0 { + return sdk.ZeroInt() + } + + interval := intervals[r.Intn(len(intervals))] + + lo := interval.lo + hi := interval.hi + + diff := hi.Sub(lo) + result := sdk.NewIntFromBigInt(new(big.Int).Rand(r, diff.BigInt())) + result = result.Add(lo) + + return result +} + // CheckBalance checks the balance of an account. func CheckBalance(t *testing.T, app *App, addr sdk.AccAddress, exp sdk.Coins) { ctxCheck := app.BaseApp.NewContext(true, abci.Header{}) @@ -46,7 +74,8 @@ func SignCheckDeliver( seq []int64, expPass bool, priv ...crypto.PrivKey, ) sdk.Result { tx := GenTx(msgs, accNums, seq, priv...) - res := app.Check(tx) + // Must simulate now as CheckTx doesn't run Msgs anymore + res := app.Simulate(tx) if expPass { require.Equal(t, sdk.ABCICodeOK, res.Code, res.Log) diff --git a/x/params/keeper.go b/x/params/keeper.go new file mode 100644 index 000000000..8817b7c6c --- /dev/null +++ b/x/params/keeper.go @@ -0,0 +1,405 @@ +package params + +import ( + "fmt" + "reflect" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" +) + +// Keeper manages global parameter store +type Keeper struct { + cdc *wire.Codec + key sdk.StoreKey +} + +// NewKeeper constructs a new Keeper +func NewKeeper(cdc *wire.Codec, key sdk.StoreKey) Keeper { + return Keeper{ + cdc: cdc, + key: key, + } +} + +// InitKeeper constructs a new Keeper with initial parameters +func InitKeeper(ctx sdk.Context, cdc *wire.Codec, key sdk.StoreKey, params ...interface{}) Keeper { + if len(params)%2 != 0 { + panic("Odd params list length for InitKeeper") + } + + k := NewKeeper(cdc, key) + + for i := 0; i < len(params); i += 2 { + k.set(ctx, params[i].(string), params[i+1]) + } + + return k +} + +// get automatically unmarshalls parameter to pointer +func (k Keeper) get(ctx sdk.Context, key string, ptr interface{}) error { + store := ctx.KVStore(k.key) + bz := store.Get([]byte(key)) + return k.cdc.UnmarshalBinary(bz, ptr) +} + +// getRaw returns raw byte slice +func (k Keeper) getRaw(ctx sdk.Context, key string) []byte { + store := ctx.KVStore(k.key) + return store.Get([]byte(key)) +} + +// set automatically marshalls and type check parameter +func (k Keeper) set(ctx sdk.Context, key string, param interface{}) error { + store := ctx.KVStore(k.key) + bz := store.Get([]byte(key)) + if bz != nil { + ptrty := reflect.PtrTo(reflect.TypeOf(param)) + ptr := reflect.New(ptrty).Interface() + + if k.cdc.UnmarshalBinary(bz, ptr) != nil { + return fmt.Errorf("Type mismatch with stored param and provided param") + } + } + + bz, err := k.cdc.MarshalBinary(param) + if err != nil { + return err + } + store.Set([]byte(key), bz) + + return nil +} + +// setRaw sets raw byte slice +func (k Keeper) setRaw(ctx sdk.Context, key string, param []byte) { + store := ctx.KVStore(k.key) + store.Set([]byte(key), param) +} + +// Getter returns readonly struct +func (k Keeper) Getter() Getter { + return Getter{k} +} + +// Setter returns read/write struct +func (k Keeper) Setter() Setter { + return Setter{Getter{k}} +} + +// Getter exposes methods related with only getting params +type Getter struct { + k Keeper +} + +// Get exposes get +func (k Getter) Get(ctx sdk.Context, key string, ptr interface{}) error { + return k.k.get(ctx, key, ptr) +} + +// GetRaw exposes getRaw +func (k Getter) GetRaw(ctx sdk.Context, key string) []byte { + return k.k.getRaw(ctx, key) +} + +// GetString is helper function for string params +func (k Getter) GetString(ctx sdk.Context, key string) (res string, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetBool is helper function for bool params +func (k Getter) GetBool(ctx sdk.Context, key string) (res bool, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetInt16 is helper function for int16 params +func (k Getter) GetInt16(ctx sdk.Context, key string) (res int16, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetInt32 is helper function for int32 params +func (k Getter) GetInt32(ctx sdk.Context, key string) (res int32, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetInt64 is helper function for int64 params +func (k Getter) GetInt64(ctx sdk.Context, key string) (res int64, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetUint16 is helper function for uint16 params +func (k Getter) GetUint16(ctx sdk.Context, key string) (res uint16, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetUint32 is helper function for uint32 params +func (k Getter) GetUint32(ctx sdk.Context, key string) (res uint32, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetUint64 is helper function for uint64 params +func (k Getter) GetUint64(ctx sdk.Context, key string) (res uint64, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetInt is helper function for sdk.Int params +func (k Getter) GetInt(ctx sdk.Context, key string) (res sdk.Int, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetUint is helper function for sdk.Uint params +func (k Getter) GetUint(ctx sdk.Context, key string) (res sdk.Uint, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetRat is helper function for rat params +func (k Getter) GetRat(ctx sdk.Context, key string) (res sdk.Rat, err error) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + err = k.k.cdc.UnmarshalBinary(bz, &res) + return +} + +// GetStringWithDefault is helper function for string params with default value +func (k Getter) GetStringWithDefault(ctx sdk.Context, key string, def string) (res string) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetBoolWithDefault is helper function for bool params with default value +func (k Getter) GetBoolWithDefault(ctx sdk.Context, key string, def bool) (res bool) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetInt16WithDefault is helper function for int16 params with default value +func (k Getter) GetInt16WithDefault(ctx sdk.Context, key string, def int16) (res int16) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetInt32WithDefault is helper function for int32 params with default value +func (k Getter) GetInt32WithDefault(ctx sdk.Context, key string, def int32) (res int32) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetInt64WithDefault is helper function for int64 params with default value +func (k Getter) GetInt64WithDefault(ctx sdk.Context, key string, def int64) (res int64) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetUint16WithDefault is helper function for uint16 params with default value +func (k Getter) GetUint16WithDefault(ctx sdk.Context, key string, def uint16) (res uint16) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetUint32WithDefault is helper function for uint32 params with default value +func (k Getter) GetUint32WithDefault(ctx sdk.Context, key string, def uint32) (res uint32) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetUint64WithDefault is helper function for uint64 params with default value +func (k Getter) GetUint64WithDefault(ctx sdk.Context, key string, def uint64) (res uint64) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetIntWithDefault is helper function for sdk.Int params with default value +func (k Getter) GetIntWithDefault(ctx sdk.Context, key string, def sdk.Int) (res sdk.Int) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetUintWithDefault is helper function for sdk.Uint params with default value +func (k Getter) GetUintWithDefault(ctx sdk.Context, key string, def sdk.Uint) (res sdk.Uint) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// GetRatWithDefault is helper function for sdk.Rat params with default value +func (k Getter) GetRatWithDefault(ctx sdk.Context, key string, def sdk.Rat) (res sdk.Rat) { + store := ctx.KVStore(k.k.key) + bz := store.Get([]byte(key)) + if bz == nil { + return def + } + k.k.cdc.MustUnmarshalBinary(bz, &res) + return +} + +// Setter exposes all methods including Set +type Setter struct { + Getter +} + +// Set exposes set +func (k Setter) Set(ctx sdk.Context, key string, param interface{}) error { + return k.k.set(ctx, key, param) +} + +// SetRaw exposes setRaw +func (k Setter) SetRaw(ctx sdk.Context, key string, param []byte) { + k.k.setRaw(ctx, key, param) +} + +// SetString is helper function for string params +func (k Setter) SetString(ctx sdk.Context, key string, param string) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetBool is helper function for bool params +func (k Setter) SetBool(ctx sdk.Context, key string, param bool) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetInt16 is helper function for int16 params +func (k Setter) SetInt16(ctx sdk.Context, key string, param int16) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetInt32 is helper function for int32 params +func (k Setter) SetInt32(ctx sdk.Context, key string, param int32) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetInt64 is helper function for int64 params +func (k Setter) SetInt64(ctx sdk.Context, key string, param int64) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetUint16 is helper function for uint16 params +func (k Setter) SetUint16(ctx sdk.Context, key string, param uint16) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetUint32 is helper function for uint32 params +func (k Setter) SetUint32(ctx sdk.Context, key string, param uint32) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetUint64 is helper function for uint64 params +func (k Setter) SetUint64(ctx sdk.Context, key string, param uint64) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetInt is helper function for sdk.Int params +func (k Setter) SetInt(ctx sdk.Context, key string, param sdk.Int) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetUint is helper function for sdk.Uint params +func (k Setter) SetUint(ctx sdk.Context, key string, param sdk.Uint) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} + +// SetRat is helper function for rat params +func (k Setter) SetRat(ctx sdk.Context, key string, param sdk.Rat) { + if err := k.k.set(ctx, key, param); err != nil { + panic(err) + } +} diff --git a/x/params/keeper_test.go b/x/params/keeper_test.go new file mode 100644 index 000000000..4bb5744ea --- /dev/null +++ b/x/params/keeper_test.go @@ -0,0 +1,280 @@ +package params + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + abci "github.com/tendermint/tendermint/abci/types" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" + + "github.com/cosmos/cosmos-sdk/store" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" +) + +func defaultContext(key sdk.StoreKey) sdk.Context { + db := dbm.NewMemDB() + cms := store.NewCommitMultiStore(db) + cms.MountStoreWithDB(key, sdk.StoreTypeIAVL, db) + cms.LoadLatestVersion() + ctx := sdk.NewContext(cms, abci.Header{}, false, log.NewNopLogger()) + return ctx +} + +func TestKeeper(t *testing.T) { + kvs := []struct { + key string + param int64 + }{ + {"key1", 10}, + {"key2", 55}, + {"key3", 182}, + {"key4", 17582}, + {"key5", 2768554}, + } + + skey := sdk.NewKVStoreKey("test") + ctx := defaultContext(skey) + setter := NewKeeper(wire.NewCodec(), skey).Setter() + + for _, kv := range kvs { + err := setter.Set(ctx, kv.key, kv.param) + assert.Nil(t, err) + } + + for _, kv := range kvs { + var param int64 + err := setter.Get(ctx, kv.key, ¶m) + assert.Nil(t, err) + assert.Equal(t, kv.param, param) + } + + cdc := wire.NewCodec() + for _, kv := range kvs { + var param int64 + bz := setter.GetRaw(ctx, kv.key) + err := cdc.UnmarshalBinary(bz, ¶m) + assert.Nil(t, err) + assert.Equal(t, kv.param, param) + } + + for _, kv := range kvs { + var param bool + err := setter.Get(ctx, kv.key, ¶m) + assert.NotNil(t, err) + } + + for _, kv := range kvs { + err := setter.Set(ctx, kv.key, true) + assert.NotNil(t, err) + } +} + +func TestGetter(t *testing.T) { + key := sdk.NewKVStoreKey("test") + ctx := defaultContext(key) + keeper := NewKeeper(wire.NewCodec(), key) + + g := keeper.Getter() + s := keeper.Setter() + + kvs := []struct { + key string + param interface{} + }{ + {"string", "test"}, + {"bool", true}, + {"int16", int16(1)}, + {"int32", int32(1)}, + {"int64", int64(1)}, + {"uint16", uint16(1)}, + {"uint32", uint32(1)}, + {"uint64", uint64(1)}, + {"int", sdk.NewInt(1)}, + {"uint", sdk.NewUint(1)}, + {"rat", sdk.NewRat(1)}, + } + + assert.NotPanics(t, func() { s.SetString(ctx, kvs[0].key, "test") }) + assert.NotPanics(t, func() { s.SetBool(ctx, kvs[1].key, true) }) + assert.NotPanics(t, func() { s.SetInt16(ctx, kvs[2].key, int16(1)) }) + assert.NotPanics(t, func() { s.SetInt32(ctx, kvs[3].key, int32(1)) }) + assert.NotPanics(t, func() { s.SetInt64(ctx, kvs[4].key, int64(1)) }) + assert.NotPanics(t, func() { s.SetUint16(ctx, kvs[5].key, uint16(1)) }) + assert.NotPanics(t, func() { s.SetUint32(ctx, kvs[6].key, uint32(1)) }) + assert.NotPanics(t, func() { s.SetUint64(ctx, kvs[7].key, uint64(1)) }) + assert.NotPanics(t, func() { s.SetInt(ctx, kvs[8].key, sdk.NewInt(1)) }) + assert.NotPanics(t, func() { s.SetUint(ctx, kvs[9].key, sdk.NewUint(1)) }) + assert.NotPanics(t, func() { s.SetRat(ctx, kvs[10].key, sdk.NewRat(1)) }) + + var res interface{} + var err error + + // String + def0 := "default" + res, err = g.GetString(ctx, kvs[0].key) + assert.Nil(t, err) + assert.Equal(t, kvs[0].param, res) + + _, err = g.GetString(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetStringWithDefault(ctx, kvs[0].key, def0) + assert.Equal(t, kvs[0].param, res) + + res = g.GetStringWithDefault(ctx, "invalid", def0) + assert.Equal(t, def0, res) + + // Bool + def1 := false + res, err = g.GetBool(ctx, kvs[1].key) + assert.Nil(t, err) + assert.Equal(t, kvs[1].param, res) + + _, err = g.GetBool(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetBoolWithDefault(ctx, kvs[1].key, def1) + assert.Equal(t, kvs[1].param, res) + + res = g.GetBoolWithDefault(ctx, "invalid", def1) + assert.Equal(t, def1, res) + + // Int16 + def2 := int16(0) + res, err = g.GetInt16(ctx, kvs[2].key) + assert.Nil(t, err) + assert.Equal(t, kvs[2].param, res) + + _, err = g.GetInt16(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetInt16WithDefault(ctx, kvs[2].key, def2) + assert.Equal(t, kvs[2].param, res) + + res = g.GetInt16WithDefault(ctx, "invalid", def2) + assert.Equal(t, def2, res) + + // Int32 + def3 := int32(0) + res, err = g.GetInt32(ctx, kvs[3].key) + assert.Nil(t, err) + assert.Equal(t, kvs[3].param, res) + + _, err = g.GetInt32(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetInt32WithDefault(ctx, kvs[3].key, def3) + assert.Equal(t, kvs[3].param, res) + + res = g.GetInt32WithDefault(ctx, "invalid", def3) + assert.Equal(t, def3, res) + + // Int64 + def4 := int64(0) + res, err = g.GetInt64(ctx, kvs[4].key) + assert.Nil(t, err) + assert.Equal(t, kvs[4].param, res) + + _, err = g.GetInt64(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetInt64WithDefault(ctx, kvs[4].key, def4) + assert.Equal(t, kvs[4].param, res) + + res = g.GetInt64WithDefault(ctx, "invalid", def4) + assert.Equal(t, def4, res) + + // Uint16 + def5 := uint16(0) + res, err = g.GetUint16(ctx, kvs[5].key) + assert.Nil(t, err) + assert.Equal(t, kvs[5].param, res) + + _, err = g.GetUint16(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetUint16WithDefault(ctx, kvs[5].key, def5) + assert.Equal(t, kvs[5].param, res) + + res = g.GetUint16WithDefault(ctx, "invalid", def5) + assert.Equal(t, def5, res) + + // Uint32 + def6 := uint32(0) + res, err = g.GetUint32(ctx, kvs[6].key) + assert.Nil(t, err) + assert.Equal(t, kvs[6].param, res) + + _, err = g.GetUint32(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetUint32WithDefault(ctx, kvs[6].key, def6) + assert.Equal(t, kvs[6].param, res) + + res = g.GetUint32WithDefault(ctx, "invalid", def6) + assert.Equal(t, def6, res) + + // Uint64 + def7 := uint64(0) + res, err = g.GetUint64(ctx, kvs[7].key) + assert.Nil(t, err) + assert.Equal(t, kvs[7].param, res) + + _, err = g.GetUint64(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetUint64WithDefault(ctx, kvs[7].key, def7) + assert.Equal(t, kvs[7].param, res) + + res = g.GetUint64WithDefault(ctx, "invalid", def7) + assert.Equal(t, def7, res) + + // Int + def8 := sdk.NewInt(0) + res, err = g.GetInt(ctx, kvs[8].key) + assert.Nil(t, err) + assert.Equal(t, kvs[8].param, res) + + _, err = g.GetInt(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetIntWithDefault(ctx, kvs[8].key, def8) + assert.Equal(t, kvs[8].param, res) + + res = g.GetIntWithDefault(ctx, "invalid", def8) + assert.Equal(t, def8, res) + + // Uint + def9 := sdk.NewUint(0) + res, err = g.GetUint(ctx, kvs[9].key) + assert.Nil(t, err) + assert.Equal(t, kvs[9].param, res) + + _, err = g.GetUint(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetUintWithDefault(ctx, kvs[9].key, def9) + assert.Equal(t, kvs[9].param, res) + + res = g.GetUintWithDefault(ctx, "invalid", def9) + assert.Equal(t, def9, res) + + // Rat + def10 := sdk.NewRat(0) + res, err = g.GetRat(ctx, kvs[10].key) + assert.Nil(t, err) + assert.Equal(t, kvs[10].param, res) + + _, err = g.GetRat(ctx, "invalid") + assert.NotNil(t, err) + + res = g.GetRatWithDefault(ctx, kvs[10].key, def10) + assert.Equal(t, kvs[10].param, res) + + res = g.GetRatWithDefault(ctx, "invalid", def10) + assert.Equal(t, def10, res) + +} diff --git a/x/params/msg_status.go b/x/params/msg_status.go new file mode 100644 index 000000000..72704e4dc --- /dev/null +++ b/x/params/msg_status.go @@ -0,0 +1,36 @@ +package params + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// GenesisState defines initial activated msg types +type GenesisState struct { + ActivatedTypes []string `json:"activated-types"` +} + +// ActivatedParamKey - paramstore key for msg type activation +func ActivatedParamKey(ty string) string { + return "Activated/" + ty +} + +// InitGenesis stores activated type to param store +func InitGenesis(ctx sdk.Context, k Keeper, data GenesisState) { + for _, ty := range data.ActivatedTypes { + k.set(ctx, ActivatedParamKey(ty), true) + } +} + +// NewAnteHandler returns an AnteHandler that checks +// whether msg type is activate or not +func NewAnteHandler(k Keeper) sdk.AnteHandler { + return func(ctx sdk.Context, tx sdk.Tx) (sdk.Context, sdk.Result, bool) { + for _, msg := range tx.GetMsgs() { + ok := k.Getter().GetBoolWithDefault(ctx, ActivatedParamKey(msg.Type()), false) + if !ok { + return ctx, sdk.ErrUnauthorized("deactivated msg type").Result(), true + } + } + return ctx, sdk.Result{}, false + } +} diff --git a/x/slashing/app_test.go b/x/slashing/app_test.go index e7b660d15..523a2e220 100644 --- a/x/slashing/app_test.go +++ b/x/slashing/app_test.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/bank" "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/stake" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" @@ -16,7 +17,7 @@ import ( var ( priv1 = ed25519.GenPrivKey() addr1 = sdk.AccAddress(priv1.PubKey().Address()) - coins = sdk.Coins{sdk.NewCoin("foocoin", 10)} + coins = sdk.Coins{sdk.NewInt64Coin("foocoin", 10)} ) // initialize the mock application for this module @@ -26,15 +27,18 @@ func getMockApp(t *testing.T) (*mock.App, stake.Keeper, Keeper) { RegisterWire(mapp.Cdc) keyStake := sdk.NewKVStoreKey("stake") keySlashing := sdk.NewKVStoreKey("slashing") + keyParams := sdk.NewKVStoreKey("params") coinKeeper := bank.NewKeeper(mapp.AccountMapper) + paramsKeeper := params.NewKeeper(mapp.Cdc, keyParams) stakeKeeper := stake.NewKeeper(mapp.Cdc, keyStake, coinKeeper, mapp.RegisterCodespace(stake.DefaultCodespace)) - keeper := NewKeeper(mapp.Cdc, keySlashing, stakeKeeper, mapp.RegisterCodespace(DefaultCodespace)) + + keeper := NewKeeper(mapp.Cdc, keySlashing, stakeKeeper, paramsKeeper.Getter(), mapp.RegisterCodespace(DefaultCodespace)) mapp.Router().AddRoute("stake", stake.NewHandler(stakeKeeper)) mapp.Router().AddRoute("slashing", NewHandler(keeper)) mapp.SetEndBlocker(getEndBlocker(stakeKeeper)) mapp.SetInitChainer(getInitChainer(mapp, stakeKeeper)) - require.NoError(t, mapp.CompleteSetup([]*sdk.KVStoreKey{keyStake, keySlashing})) + require.NoError(t, mapp.CompleteSetup([]*sdk.KVStoreKey{keyStake, keySlashing, keyParams})) return mapp, stakeKeeper, keeper } @@ -55,11 +59,14 @@ func getInitChainer(mapp *mock.App, keeper stake.Keeper) sdk.InitChainer { mapp.InitChainer(ctx, req) stakeGenesis := stake.DefaultGenesisState() stakeGenesis.Pool.LooseTokens = sdk.NewRat(100000) - err := stake.InitGenesis(ctx, keeper, stakeGenesis) + validators, err := stake.InitGenesis(ctx, keeper, stakeGenesis) if err != nil { panic(err) } - return abci.ResponseInitChain{} + + return abci.ResponseInitChain{ + Validators: validators, + } } } @@ -82,8 +89,8 @@ func checkValidatorSigningInfo(t *testing.T, mapp *mock.App, keeper Keeper, func TestSlashingMsgs(t *testing.T) { mapp, stakeKeeper, keeper := getMockApp(t) - genCoin := sdk.NewCoin("steak", 42) - bondCoin := sdk.NewCoin("steak", 10) + genCoin := sdk.NewInt64Coin("steak", 42) + bondCoin := sdk.NewInt64Coin("steak", 10) acc1 := &auth.BaseAccount{ Address: addr1, @@ -109,6 +116,6 @@ func TestSlashingMsgs(t *testing.T) { checkValidatorSigningInfo(t, mapp, keeper, sdk.ValAddress(addr1), false) // unrevoke should fail with unknown validator - res := mock.CheckGenTx(t, mapp.BaseApp, []sdk.Msg{unrevokeMsg}, []int64{0}, []int64{1}, false, priv1) + res := mock.SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{unrevokeMsg}, []int64{0}, []int64{1}, false, priv1) require.Equal(t, sdk.ToABCICode(DefaultCodespace, CodeValidatorNotRevoked), res.Code) } diff --git a/x/slashing/client/cli/query.go b/x/slashing/client/cli/query.go index 0360eb315..0901eef97 100644 --- a/x/slashing/client/cli/query.go +++ b/x/slashing/client/cli/query.go @@ -13,24 +13,26 @@ import ( "github.com/cosmos/cosmos-sdk/x/slashing" ) -// get the command to query signing info +// GetCmdQuerySigningInfo implements the command to query signing info. func GetCmdQuerySigningInfo(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "signing-info [validator-pubkey]", Short: "Query a validator's signing information", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - pk, err := sdk.GetValPubKeyBech32(args[0]) if err != nil { return err } + key := slashing.GetValidatorSigningInfoKey(sdk.ValAddress(pk.Address())) - ctx := context.NewCoreContextFromViper() - res, err := ctx.QueryStore(key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + res, err := cliCtx.QueryStore(key, storeName) if err != nil { return err } + signingInfo := new(slashing.ValidatorSigningInfo) cdc.MustUnmarshalBinary(res, signingInfo) diff --git a/x/slashing/client/cli/tx.go b/x/slashing/client/cli/tx.go index 15458ad1a..5085f5aac 100644 --- a/x/slashing/client/cli/tx.go +++ b/x/slashing/client/cli/tx.go @@ -1,38 +1,42 @@ package cli import ( - "github.com/spf13/cobra" + "os" "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/utils" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/slashing" + + "github.com/spf13/cobra" ) -// create unrevoke command +// GetCmdUnrevoke implements the create unrevoke validator command. func GetCmdUnrevoke(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "unrevoke", - Args: cobra.ExactArgs(1), + Args: cobra.ExactArgs(0), Short: "unrevoke validator previously revoked for downtime", RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - validatorAddr, err := sdk.AccAddressFromBech32(args[0]) + validatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } msg := slashing.NewMsgUnrevoke(validatorAddr) - // build and sign the transaction, then broadcast to Tendermint - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } + return cmd } diff --git a/x/slashing/client/rest/query.go b/x/slashing/client/rest/query.go index 123e235ce..5509ed1a8 100644 --- a/x/slashing/client/rest/query.go +++ b/x/slashing/client/rest/query.go @@ -4,38 +4,35 @@ import ( "fmt" "net/http" - "github.com/gorilla/mux" - "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/slashing" + "github.com/gorilla/mux" ) -func registerQueryRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec) { +func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec) { r.HandleFunc( "/slashing/signing_info/{validator}", - signingInfoHandlerFn(ctx, "slashing", cdc), + signingInfoHandlerFn(cliCtx, "slashing", cdc), ).Methods("GET") } // http request handler to query signing info -func signingInfoHandlerFn(ctx context.CoreContext, storeName string, cdc *wire.Codec) http.HandlerFunc { +func signingInfoHandlerFn(cliCtx context.CLIContext, storeName string, cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - - // read parameters vars := mux.Vars(r) - bech32validator := vars["validator"] - validatorAddr, err := sdk.ValAddressFromBech32(bech32validator) + pk, err := sdk.GetValPubKeyBech32(vars["validator"]) if err != nil { w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) return } - key := slashing.GetValidatorSigningInfoKey(validatorAddr) - res, err := ctx.QueryStore(key, storeName) + key := slashing.GetValidatorSigningInfoKey(sdk.ValAddress(pk.Address())) + + res, err := cliCtx.QueryStore(key, storeName) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("couldn't query signing info. Error: %s", err.Error()))) @@ -43,6 +40,7 @@ func signingInfoHandlerFn(ctx context.CoreContext, storeName string, cdc *wire.C } var signingInfo slashing.ValidatorSigningInfo + err = cdc.UnmarshalBinary(res, &signingInfo) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/x/slashing/client/rest/rest.go b/x/slashing/client/rest/rest.go index 156d40033..7c2fdf905 100644 --- a/x/slashing/client/rest/rest.go +++ b/x/slashing/client/rest/rest.go @@ -1,15 +1,15 @@ package rest import ( - "github.com/gorilla/mux" - "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/crypto/keys" "github.com/cosmos/cosmos-sdk/wire" + + "github.com/gorilla/mux" ) // RegisterRoutes registers staking-related REST handlers to a router -func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { - registerQueryRoutes(ctx, r, cdc) - registerTxRoutes(ctx, r, cdc, kb) +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { + registerQueryRoutes(cliCtx, r, cdc) + registerTxRoutes(cliCtx, r, cdc, kb) } diff --git a/x/slashing/client/rest/tx.go b/x/slashing/client/rest/tx.go index f35807544..2ecec51ea 100644 --- a/x/slashing/client/rest/tx.go +++ b/x/slashing/client/rest/tx.go @@ -7,19 +7,20 @@ import ( "io/ioutil" "net/http" - "github.com/gorilla/mux" - "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/crypto/keys" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/slashing" + + "github.com/gorilla/mux" ) -func registerTxRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { +func registerTxRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { r.HandleFunc( "/slashing/unrevoke", - unrevokeRequestHandlerFn(cdc, kb, ctx), + unrevokeRequestHandlerFn(cdc, kb, cliCtx), ).Methods("POST") } @@ -34,7 +35,7 @@ type UnrevokeBody struct { ValidatorAddr string `json:"validator_addr"` } -func unrevokeRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) http.HandlerFunc { +func unrevokeRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var m UnrevokeBody body, err := ioutil.ReadAll(r.Body) @@ -70,21 +71,24 @@ func unrevokeRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.Core return } - ctx = ctx.WithGas(m.Gas) - ctx = ctx.WithChainID(m.ChainID) - ctx = ctx.WithAccountNumber(m.AccountNumber) - ctx = ctx.WithSequence(m.Sequence) + txCtx := authctx.TxContext{ + Codec: cdc, + ChainID: m.ChainID, + AccountNumber: m.AccountNumber, + Sequence: m.Sequence, + Gas: m.Gas, + } msg := slashing.NewMsgUnrevoke(validatorAddr) - txBytes, err := ctx.SignAndBuild(m.LocalAccountName, m.Password, []sdk.Msg{msg}, cdc) + txBytes, err := txCtx.BuildAndSign(m.LocalAccountName, m.Password, []sdk.Msg{msg}) if err != nil { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte(err.Error())) return } - res, err := ctx.BroadcastTx(txBytes) + res, err := cliCtx.BroadcastTx(txBytes) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) diff --git a/x/slashing/genesis.go b/x/slashing/genesis.go new file mode 100644 index 000000000..6e2809bfc --- /dev/null +++ b/x/slashing/genesis.go @@ -0,0 +1,14 @@ +package slashing + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/stake/types" +) + +// InitGenesis initializes the keeper's address to pubkey map. +func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) { + for _, validator := range data.Validators { + keeper.addPubkey(ctx, validator.GetPubKey()) + } + return +} diff --git a/x/slashing/handler.go b/x/slashing/handler.go index 3991bc222..0cb64ab40 100644 --- a/x/slashing/handler.go +++ b/x/slashing/handler.go @@ -39,14 +39,10 @@ func handleMsgUnrevoke(ctx sdk.Context, msg MsgUnrevoke, k Keeper) sdk.Result { } // Cannot be unrevoked until out of jail - if ctx.BlockHeader().Time < info.JailedUntil { + if ctx.BlockHeader().Time.Before(info.JailedUntil) { return ErrValidatorJailed(k.codespace).Result() } - if ctx.IsCheckTx() { - return sdk.Result{} - } - // Update the starting height (so the validator can't be immediately revoked again) info.StartHeight = ctx.BlockHeight() k.setValidatorSigningInfo(ctx, addr, info) diff --git a/x/slashing/handler_test.go b/x/slashing/handler_test.go index d5a6b15db..89c1e11a6 100644 --- a/x/slashing/handler_test.go +++ b/x/slashing/handler_test.go @@ -11,7 +11,7 @@ import ( func TestCannotUnrevokeUnlessRevoked(t *testing.T) { // initial setup - ctx, ck, sk, keeper := createTestInput(t) + ctx, ck, sk, _, keeper := createTestInput(t) slh := NewHandler(keeper) amtInt := int64(100) addr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt) diff --git a/x/slashing/keeper.go b/x/slashing/keeper.go index 648f9eaf9..2f163e57a 100644 --- a/x/slashing/keeper.go +++ b/x/slashing/keeper.go @@ -2,9 +2,14 @@ package slashing import ( "fmt" + "time" + + tmtypes "github.com/tendermint/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" + "github.com/cosmos/cosmos-sdk/x/params" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" ) @@ -13,40 +18,42 @@ type Keeper struct { storeKey sdk.StoreKey cdc *wire.Codec validatorSet sdk.ValidatorSet - + params params.Getter // codespace codespace sdk.CodespaceType } // NewKeeper creates a slashing keeper -func NewKeeper(cdc *wire.Codec, key sdk.StoreKey, vs sdk.ValidatorSet, codespace sdk.CodespaceType) Keeper { +func NewKeeper(cdc *wire.Codec, key sdk.StoreKey, vs sdk.ValidatorSet, params params.Getter, codespace sdk.CodespaceType) Keeper { keeper := Keeper{ storeKey: key, cdc: cdc, validatorSet: vs, + params: params, codespace: codespace, } return keeper } // handle a validator signing two blocks at the same height -func (k Keeper) handleDoubleSign(ctx sdk.Context, pubkey crypto.PubKey, infractionHeight int64, timestamp int64, power int64) { +func (k Keeper) handleDoubleSign(ctx sdk.Context, pubkey crypto.PubKey, infractionHeight int64, timestamp time.Time, power int64) { logger := ctx.Logger().With("module", "x/slashing") time := ctx.BlockHeader().Time - age := time - timestamp + age := time.Sub(timestamp) address := sdk.ValAddress(pubkey.Address()) // Double sign too old - if age > MaxEvidenceAge { - logger.Info(fmt.Sprintf("Ignored double sign from %s at height %d, age of %d past max age of %d", pubkey.Address(), infractionHeight, age, MaxEvidenceAge)) + maxEvidenceAge := k.MaxEvidenceAge(ctx) + if age > maxEvidenceAge { + logger.Info(fmt.Sprintf("Ignored double sign from %s at height %d, age of %d past max age of %d", pubkey.Address(), infractionHeight, age, maxEvidenceAge)) return } // Double sign confirmed - logger.Info(fmt.Sprintf("Confirmed double sign from %s at height %d, age of %d less than max age of %d", pubkey.Address(), infractionHeight, age, MaxEvidenceAge)) + logger.Info(fmt.Sprintf("Confirmed double sign from %s at height %d, age of %d less than max age of %d", pubkey.Address(), infractionHeight, age, maxEvidenceAge)) // Slash validator - k.validatorSet.Slash(ctx, pubkey, infractionHeight, power, SlashFractionDoubleSign) + k.validatorSet.Slash(ctx, pubkey, infractionHeight, power, k.SlashFractionDoubleSign(ctx)) // Revoke validator k.validatorSet.Revoke(ctx, pubkey) @@ -56,25 +63,28 @@ func (k Keeper) handleDoubleSign(ctx sdk.Context, pubkey crypto.PubKey, infracti if !found { panic(fmt.Sprintf("Expected signing info for validator %s but not found", address)) } - signInfo.JailedUntil = time + DoubleSignUnbondDuration + signInfo.JailedUntil = time.Add(k.DoubleSignUnbondDuration(ctx)) k.setValidatorSigningInfo(ctx, address, signInfo) } // handle a validator signature, must be called once per validator per block // nolint gocyclo -func (k Keeper) handleValidatorSignature(ctx sdk.Context, pubkey crypto.PubKey, power int64, signed bool) { +func (k Keeper) handleValidatorSignature(ctx sdk.Context, addr crypto.Address, power int64, signed bool) { logger := ctx.Logger().With("module", "x/slashing") height := ctx.BlockHeight() - address := sdk.ValAddress(pubkey.Address()) - + address := sdk.ValAddress(addr) + pubkey, err := k.getPubkey(ctx, addr) + if err != nil { + panic(fmt.Sprintf("Validator address %v not found", addr)) + } // Local index, so counts blocks validator *should* have signed // Will use the 0-value default signing info if not present, except for start height signInfo, found := k.getValidatorSigningInfo(ctx, address) if !found { // If this validator has never been seen before, construct a new SigningInfo with the correct start height - signInfo = NewValidatorSigningInfo(height, 0, 0, 0) + signInfo = NewValidatorSigningInfo(height, 0, time.Unix(0, 0), 0) } - index := signInfo.IndexOffset % SignedBlocksWindow + index := signInfo.IndexOffset % k.SignedBlocksWindow(ctx) signInfo.IndexOffset++ // Update signed block bit array & counter @@ -94,18 +104,18 @@ func (k Keeper) handleValidatorSignature(ctx sdk.Context, pubkey crypto.PubKey, } if !signed { - logger.Info(fmt.Sprintf("Absent validator %s at height %d, %d signed, threshold %d", pubkey.Address(), height, signInfo.SignedBlocksCounter, MinSignedPerWindow)) + logger.Info(fmt.Sprintf("Absent validator %s at height %d, %d signed, threshold %d", addr, height, signInfo.SignedBlocksCounter, k.MinSignedPerWindow(ctx))) } - minHeight := signInfo.StartHeight + SignedBlocksWindow - if height > minHeight && signInfo.SignedBlocksCounter < MinSignedPerWindow { + minHeight := signInfo.StartHeight + k.SignedBlocksWindow(ctx) + if height > minHeight && signInfo.SignedBlocksCounter < k.MinSignedPerWindow(ctx) { validator := k.validatorSet.ValidatorByPubKey(ctx, pubkey) if validator != nil && !validator.GetRevoked() { // Downtime confirmed, slash, revoke, and jail the validator logger.Info(fmt.Sprintf("Validator %s past min height of %d and below signed blocks threshold of %d", - pubkey.Address(), minHeight, MinSignedPerWindow)) - k.validatorSet.Slash(ctx, pubkey, height, power, SlashFractionDowntime) + pubkey.Address(), minHeight, k.MinSignedPerWindow(ctx))) + k.validatorSet.Slash(ctx, pubkey, height, power, k.SlashFractionDowntime(ctx)) k.validatorSet.Revoke(ctx, pubkey) - signInfo.JailedUntil = ctx.BlockHeader().Time + DowntimeUnbondDuration + signInfo.JailedUntil = ctx.BlockHeader().Time.Add(k.DowntimeUnbondDuration(ctx)) } else { // Validator was (a) not found or (b) already revoked, don't slash logger.Info(fmt.Sprintf("Validator %s would have been slashed for downtime, but was either not found in store or already revoked", @@ -116,3 +126,46 @@ func (k Keeper) handleValidatorSignature(ctx sdk.Context, pubkey crypto.PubKey, // Set the updated signing info k.setValidatorSigningInfo(ctx, address, signInfo) } + +// AddValidators adds the validators to the keepers validator addr to pubkey mapping. +func (k Keeper) AddValidators(ctx sdk.Context, vals []abci.Validator) { + for i := 0; i < len(vals); i++ { + val := vals[i] + pubkey, err := tmtypes.PB2TM.PubKey(val.PubKey) + if err != nil { + panic(err) + } + k.addPubkey(ctx, pubkey) + } +} + +// TODO: Make a method to remove the pubkey from the map when a validator is unbonded. +func (k Keeper) addPubkey(ctx sdk.Context, pubkey crypto.PubKey) { + addr := pubkey.Address() + k.setAddrPubkeyRelation(ctx, addr, pubkey) +} + +func (k Keeper) getPubkey(ctx sdk.Context, address crypto.Address) (crypto.PubKey, error) { + store := ctx.KVStore(k.storeKey) + var pubkey crypto.PubKey + err := k.cdc.UnmarshalBinary(store.Get(getAddrPubkeyRelationKey(address)), &pubkey) + if err != nil { + return nil, fmt.Errorf("address %v not found", address) + } + return pubkey, nil +} + +func (k Keeper) setAddrPubkeyRelation(ctx sdk.Context, addr crypto.Address, pubkey crypto.PubKey) { + store := ctx.KVStore(k.storeKey) + bz := k.cdc.MustMarshalBinary(pubkey) + store.Set(getAddrPubkeyRelationKey(addr), bz) +} + +func (k Keeper) deleteAddrPubkeyRelation(ctx sdk.Context, addr crypto.Address) { + store := ctx.KVStore(k.storeKey) + store.Delete(getAddrPubkeyRelationKey(addr)) +} + +func getAddrPubkeyRelationKey(address []byte) []byte { + return append([]byte{0x03}, address...) +} diff --git a/x/slashing/keeper_test.go b/x/slashing/keeper_test.go index d85db77c0..d3d6b06ed 100644 --- a/x/slashing/keeper_test.go +++ b/x/slashing/keeper_test.go @@ -2,22 +2,20 @@ package slashing import ( "testing" - - "github.com/stretchr/testify/require" - - abci "github.com/tendermint/tendermint/abci/types" + "time" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/stake" + "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" ) // Have to change these parameters for tests // lest the tests take forever func init() { - SignedBlocksWindow = 1000 - MinSignedPerWindow = SignedBlocksWindow / 2 - DowntimeUnbondDuration = 60 * 60 - DoubleSignUnbondDuration = 60 * 60 + defaultSignedBlocksWindow = 1000 + defaultDowntimeUnbondDuration = 60 * 60 + defaultDoubleSignUnbondDuration = 60 * 60 } // Test that a validator is slashed correctly @@ -25,20 +23,21 @@ func init() { func TestHandleDoubleSign(t *testing.T) { // initial setup - ctx, ck, sk, keeper := createTestInput(t) + ctx, ck, sk, _, keeper := createTestInput(t) amtInt := int64(100) addr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt) got := stake.NewHandler(sk)(ctx, newTestMsgCreateValidator(addr, val, amt)) require.True(t, got.IsOK()) - stake.EndBlocker(ctx, sk) + validatorUpdates := stake.EndBlocker(ctx, sk) + keeper.AddValidators(ctx, validatorUpdates) require.Equal(t, ck.GetCoins(ctx, addr), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.Sub(amt)}}) require.True(t, sdk.NewRatFromInt(amt).Equal(sk.Validator(ctx, addr).GetPower())) // handle a signature to set signing info - keeper.handleValidatorSignature(ctx, val, amtInt, true) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, true) // double sign less than max age - keeper.handleDoubleSign(ctx, val, 0, 0, amtInt) + keeper.handleDoubleSign(ctx, val, 0, time.Unix(0, 0), amtInt) // should be revoked require.True(t, sk.Validator(ctx, addr).GetRevoked()) @@ -46,10 +45,10 @@ func TestHandleDoubleSign(t *testing.T) { sk.Unrevoke(ctx, val) // power should be reduced require.Equal(t, sdk.NewRatFromInt(amt).Mul(sdk.NewRat(19).Quo(sdk.NewRat(20))), sk.Validator(ctx, addr).GetPower()) - ctx = ctx.WithBlockHeader(abci.Header{Time: 1 + MaxEvidenceAge}) + ctx = ctx.WithBlockHeader(abci.Header{Time: time.Unix(1, 0).Add(keeper.MaxEvidenceAge(ctx))}) // double sign past max age - keeper.handleDoubleSign(ctx, val, 0, 0, amtInt) + keeper.handleDoubleSign(ctx, val, 0, time.Unix(0, 0), amtInt) require.Equal(t, sdk.NewRatFromInt(amt).Mul(sdk.NewRat(19).Quo(sdk.NewRat(20))), sk.Validator(ctx, addr).GetPower()) } @@ -58,14 +57,15 @@ func TestHandleDoubleSign(t *testing.T) { func TestHandleAbsentValidator(t *testing.T) { // initial setup - ctx, ck, sk, keeper := createTestInput(t) + ctx, ck, sk, _, keeper := createTestInput(t) amtInt := int64(100) addr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt) sh := stake.NewHandler(sk) slh := NewHandler(keeper) got := sh(ctx, newTestMsgCreateValidator(addr, val, amt)) require.True(t, got.IsOK()) - stake.EndBlocker(ctx, sk) + validatorUpdates := stake.EndBlocker(ctx, sk) + keeper.AddValidators(ctx, validatorUpdates) require.Equal(t, ck.GetCoins(ctx, addr), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.Sub(amt)}}) require.True(t, sdk.NewRatFromInt(amt).Equal(sk.Validator(ctx, addr).GetPower())) info, found := keeper.getValidatorSigningInfo(ctx, sdk.ValAddress(val.Address())) @@ -73,28 +73,30 @@ func TestHandleAbsentValidator(t *testing.T) { require.Equal(t, int64(0), info.StartHeight) require.Equal(t, int64(0), info.IndexOffset) require.Equal(t, int64(0), info.SignedBlocksCounter) - require.Equal(t, int64(0), info.JailedUntil) + // default time.Time value + var blankTime time.Time + require.Equal(t, blankTime, info.JailedUntil) height := int64(0) // 1000 first blocks OK - for ; height < SignedBlocksWindow; height++ { + for ; height < keeper.SignedBlocksWindow(ctx); height++ { ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, true) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, true) } info, found = keeper.getValidatorSigningInfo(ctx, sdk.ValAddress(val.Address())) require.True(t, found) require.Equal(t, int64(0), info.StartHeight) - require.Equal(t, SignedBlocksWindow, info.SignedBlocksCounter) + require.Equal(t, keeper.SignedBlocksWindow(ctx), info.SignedBlocksCounter) // 500 blocks missed - for ; height < SignedBlocksWindow+(SignedBlocksWindow-MinSignedPerWindow); height++ { + for ; height < keeper.SignedBlocksWindow(ctx)+(keeper.SignedBlocksWindow(ctx)-keeper.MinSignedPerWindow(ctx)); height++ { ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, false) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, false) } info, found = keeper.getValidatorSigningInfo(ctx, sdk.ValAddress(val.Address())) require.True(t, found) require.Equal(t, int64(0), info.StartHeight) - require.Equal(t, SignedBlocksWindow-MinSignedPerWindow, info.SignedBlocksCounter) + require.Equal(t, keeper.SignedBlocksWindow(ctx)-keeper.MinSignedPerWindow(ctx), info.SignedBlocksCounter) // validator should be bonded still validator, _ := sk.GetValidatorByPubKey(ctx, val) @@ -104,11 +106,11 @@ func TestHandleAbsentValidator(t *testing.T) { // 501st block missed ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, false) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, false) info, found = keeper.getValidatorSigningInfo(ctx, sdk.ValAddress(val.Address())) require.True(t, found) require.Equal(t, int64(0), info.StartHeight) - require.Equal(t, SignedBlocksWindow-MinSignedPerWindow-1, info.SignedBlocksCounter) + require.Equal(t, keeper.SignedBlocksWindow(ctx)-keeper.MinSignedPerWindow(ctx)-1, info.SignedBlocksCounter) // validator should have been revoked validator, _ = sk.GetValidatorByPubKey(ctx, val) @@ -119,7 +121,7 @@ func TestHandleAbsentValidator(t *testing.T) { require.False(t, got.IsOK()) // unrevocation should succeed after jail expiration - ctx = ctx.WithBlockHeader(abci.Header{Time: DowntimeUnbondDuration + 1}) + ctx = ctx.WithBlockHeader(abci.Header{Time: time.Unix(1, 0).Add(keeper.DowntimeUnbondDuration(ctx))}) got = slh(ctx, NewMsgUnrevoke(addr)) require.True(t, got.IsOK()) @@ -129,34 +131,34 @@ func TestHandleAbsentValidator(t *testing.T) { // validator should have been slashed pool = sk.GetPool(ctx) - slashAmt := sdk.NewRat(amtInt).Mul(SlashFractionDowntime).RoundInt64() + slashAmt := sdk.NewRat(amtInt).Mul(keeper.SlashFractionDowntime(ctx)).RoundInt64() require.Equal(t, int64(amtInt)-slashAmt, pool.BondedTokens.RoundInt64()) // validator start height should have been changed info, found = keeper.getValidatorSigningInfo(ctx, sdk.ValAddress(val.Address())) require.True(t, found) require.Equal(t, height, info.StartHeight) - require.Equal(t, SignedBlocksWindow-MinSignedPerWindow-1, info.SignedBlocksCounter) + require.Equal(t, keeper.SignedBlocksWindow(ctx)-keeper.MinSignedPerWindow(ctx)-1, info.SignedBlocksCounter) // validator should not be immediately revoked again height++ ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, false) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, false) validator, _ = sk.GetValidatorByPubKey(ctx, val) require.Equal(t, sdk.Bonded, validator.GetStatus()) // 500 signed blocks - nextHeight := height + MinSignedPerWindow + 1 + nextHeight := height + keeper.MinSignedPerWindow(ctx) + 1 for ; height < nextHeight; height++ { ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, false) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, false) } // validator should be revoked again after 500 unsigned blocks - nextHeight = height + MinSignedPerWindow + 1 + nextHeight = height + keeper.MinSignedPerWindow(ctx) + 1 for ; height <= nextHeight; height++ { ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, false) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, false) } validator, _ = sk.GetValidatorByPubKey(ctx, val) require.Equal(t, sdk.Unbonded, validator.GetStatus()) @@ -167,29 +169,30 @@ func TestHandleAbsentValidator(t *testing.T) { // and that they are not immediately revoked func TestHandleNewValidator(t *testing.T) { // initial setup - ctx, ck, sk, keeper := createTestInput(t) + ctx, ck, sk, _, keeper := createTestInput(t) addr, val, amt := addrs[0], pks[0], int64(100) sh := stake.NewHandler(sk) got := sh(ctx, newTestMsgCreateValidator(addr, val, sdk.NewInt(amt))) require.True(t, got.IsOK()) - stake.EndBlocker(ctx, sk) + validatorUpdates := stake.EndBlocker(ctx, sk) + keeper.AddValidators(ctx, validatorUpdates) require.Equal(t, ck.GetCoins(ctx, addr), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.SubRaw(amt)}}) require.Equal(t, sdk.NewRat(amt), sk.Validator(ctx, addr).GetPower()) // 1000 first blocks not a validator - ctx = ctx.WithBlockHeight(SignedBlocksWindow + 1) + ctx = ctx.WithBlockHeight(keeper.SignedBlocksWindow(ctx) + 1) // Now a validator, for two blocks - keeper.handleValidatorSignature(ctx, val, 100, true) - ctx = ctx.WithBlockHeight(SignedBlocksWindow + 2) - keeper.handleValidatorSignature(ctx, val, 100, false) + keeper.handleValidatorSignature(ctx, val.Address(), 100, true) + ctx = ctx.WithBlockHeight(keeper.SignedBlocksWindow(ctx) + 2) + keeper.handleValidatorSignature(ctx, val.Address(), 100, false) info, found := keeper.getValidatorSigningInfo(ctx, sdk.ValAddress(val.Address())) require.True(t, found) - require.Equal(t, int64(SignedBlocksWindow+1), info.StartHeight) + require.Equal(t, int64(keeper.SignedBlocksWindow(ctx)+1), info.StartHeight) require.Equal(t, int64(2), info.IndexOffset) require.Equal(t, int64(1), info.SignedBlocksCounter) - require.Equal(t, int64(0), info.JailedUntil) + require.Equal(t, time.Unix(0, 0).UTC(), info.JailedUntil) // validator should be bonded still, should not have been revoked or slashed validator, _ := sk.GetValidatorByPubKey(ctx, val) @@ -203,25 +206,26 @@ func TestHandleNewValidator(t *testing.T) { func TestHandleAlreadyRevoked(t *testing.T) { // initial setup - ctx, _, sk, keeper := createTestInput(t) + ctx, _, sk, _, keeper := createTestInput(t) amtInt := int64(100) addr, val, amt := addrs[0], pks[0], sdk.NewInt(amtInt) sh := stake.NewHandler(sk) got := sh(ctx, newTestMsgCreateValidator(addr, val, amt)) require.True(t, got.IsOK()) - stake.EndBlocker(ctx, sk) + validatorUpdates := stake.EndBlocker(ctx, sk) + keeper.AddValidators(ctx, validatorUpdates) // 1000 first blocks OK height := int64(0) - for ; height < SignedBlocksWindow; height++ { + for ; height < keeper.SignedBlocksWindow(ctx); height++ { ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, true) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, true) } // 501 blocks missed - for ; height < SignedBlocksWindow+(SignedBlocksWindow-MinSignedPerWindow)+1; height++ { + for ; height < keeper.SignedBlocksWindow(ctx)+(keeper.SignedBlocksWindow(ctx)-keeper.MinSignedPerWindow(ctx))+1; height++ { ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, false) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, false) } // validator should have been revoked and slashed @@ -229,15 +233,14 @@ func TestHandleAlreadyRevoked(t *testing.T) { require.Equal(t, sdk.Unbonded, validator.GetStatus()) // validator should have been slashed - slashAmt := sdk.NewRat(amtInt).Mul(SlashFractionDowntime).RoundInt64() - require.Equal(t, int64(amtInt)-slashAmt, validator.Tokens.RoundInt64()) // TODO replace w/ .GetTokens() + require.Equal(t, int64(amtInt-1), validator.GetTokens().RoundInt64()) // another block missed ctx = ctx.WithBlockHeight(height) - keeper.handleValidatorSignature(ctx, val, amtInt, false) + keeper.handleValidatorSignature(ctx, val.Address(), amtInt, false) // validator should not have been slashed twice validator, _ = sk.GetValidatorByPubKey(ctx, val) - require.Equal(t, int64(amtInt)-slashAmt, validator.Tokens.RoundInt64()) // TODO replace w/ .GetTokens() + require.Equal(t, int64(amtInt-1), validator.GetTokens().RoundInt64()) } diff --git a/x/slashing/params.go b/x/slashing/params.go index 7a11737f9..2d8102bd6 100644 --- a/x/slashing/params.go +++ b/x/slashing/params.go @@ -1,42 +1,80 @@ package slashing import ( + "time" + sdk "github.com/cosmos/cosmos-sdk/types" ) +// nolint +const ( + MaxEvidenceAgeKey = "slashing/MaxEvidenceAge" + SignedBlocksWindowKey = "slashing/SignedBlocksWindow" + MinSignedPerWindowKey = "slashing/MinSignedPerWindow" + DoubleSignUnbondDurationKey = "slashing/DoubleSignUnbondDuration" + DowntimeUnbondDurationKey = "slashing/DowntimeUnbondDuration" + SlashFractionDoubleSignKey = "slashing/SlashFractionDoubleSign" + SlashFractionDowntimeKey = "slashing/SlashFractionDowntime" +) + +// MaxEvidenceAge - Max age for evidence - 21 days (3 weeks) +// MaxEvidenceAge = 60 * 60 * 24 * 7 * 3 +func (k Keeper) MaxEvidenceAge(ctx sdk.Context) time.Duration { + return time.Duration(k.params.GetInt64WithDefault(ctx, MaxEvidenceAgeKey, defaultMaxEvidenceAge)) * time.Second +} + +// SignedBlocksWindow - sliding window for downtime slashing +func (k Keeper) SignedBlocksWindow(ctx sdk.Context) int64 { + return k.params.GetInt64WithDefault(ctx, SignedBlocksWindowKey, defaultSignedBlocksWindow) +} + +// Downtime slashing thershold - default 50% +func (k Keeper) MinSignedPerWindow(ctx sdk.Context) int64 { + minSignedPerWindow := k.params.GetRatWithDefault(ctx, MinSignedPerWindowKey, defaultMinSignedPerWindow) + signedBlocksWindow := k.SignedBlocksWindow(ctx) + return sdk.NewRat(signedBlocksWindow).Mul(minSignedPerWindow).RoundInt64() +} + +// Double-sign unbond duration +func (k Keeper) DoubleSignUnbondDuration(ctx sdk.Context) time.Duration { + return time.Duration(k.params.GetInt64WithDefault(ctx, DoubleSignUnbondDurationKey, defaultDoubleSignUnbondDuration)) * time.Second +} + +// Downtime unbond duration +func (k Keeper) DowntimeUnbondDuration(ctx sdk.Context) time.Duration { + return time.Duration(k.params.GetInt64WithDefault(ctx, DowntimeUnbondDurationKey, defaultDowntimeUnbondDuration)) * time.Second +} + +// SlashFractionDoubleSign - currently default 5% +func (k Keeper) SlashFractionDoubleSign(ctx sdk.Context) sdk.Rat { + return k.params.GetRatWithDefault(ctx, SlashFractionDoubleSignKey, defaultSlashFractionDoubleSign) +} + +// SlashFractionDowntime - currently default 1% +func (k Keeper) SlashFractionDowntime(ctx sdk.Context) sdk.Rat { + return k.params.GetRatWithDefault(ctx, SlashFractionDowntimeKey, defaultSlashFractionDowntime) +} + +// declared as var because of keeper_test.go +// TODO: make it const or parameter of NewKeeper + var ( - // MaxEvidenceAge - Max age for evidence - 21 days (3 weeks) - // TODO Should this be a governance parameter or just modifiable with SoftwareUpgradeProposals? - // MaxEvidenceAge = 60 * 60 * 24 * 7 * 3 + // defaultMaxEvidenceAge = 60 * 60 * 24 * 7 * 3 // TODO Temporarily set to 2 minutes for testnets. - MaxEvidenceAge int64 = 60 * 2 + defaultMaxEvidenceAge int64 = 60 * 2 - // SignedBlocksWindow - sliding window for downtime slashing - // TODO Governance parameter? - // TODO Temporarily set to 40000 blocks for testnets - SignedBlocksWindow int64 = 10000 - - // Downtime slashing threshold - 50% - // TODO Governance parameter? - MinSignedPerWindow = SignedBlocksWindow / 2 - - // Downtime unbond duration - // TODO Governance parameter? // TODO Temporarily set to five minutes for testnets - DowntimeUnbondDuration int64 = 60 * 5 + defaultDoubleSignUnbondDuration int64 = 60 * 5 - // Double-sign unbond duration - // TODO Governance parameter? - // TODO Temporarily set to five minutes for testnets - DoubleSignUnbondDuration int64 = 60 * 5 -) - -var ( - // SlashFractionDoubleSign - currently 5% - // TODO Governance parameter? - SlashFractionDoubleSign = sdk.NewRat(1).Quo(sdk.NewRat(20)) - - // SlashFractionDowntime - currently 1% - // TODO Governance parameter? - SlashFractionDowntime = sdk.NewRat(10).Quo(sdk.NewRat(100)) + // TODO Temporarily set to 10000 blocks for testnets + defaultSignedBlocksWindow int64 = 10000 + + // TODO Temporarily set to 10 minutes for testnets + defaultDowntimeUnbondDuration int64 = 60 * 10 + + defaultMinSignedPerWindow = sdk.NewRat(1, 2) + + defaultSlashFractionDoubleSign = sdk.NewRat(1).Quo(sdk.NewRat(20)) + + defaultSlashFractionDowntime = sdk.NewRat(1).Quo(sdk.NewRat(100)) ) diff --git a/x/slashing/signing_info.go b/x/slashing/signing_info.go index 3118793aa..a21917e79 100644 --- a/x/slashing/signing_info.go +++ b/x/slashing/signing_info.go @@ -3,6 +3,7 @@ package slashing import ( "encoding/binary" "fmt" + "time" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -48,7 +49,7 @@ func (k Keeper) setValidatorSigningBitArray(ctx sdk.Context, address sdk.ValAddr } // Construct a new `ValidatorSigningInfo` struct -func NewValidatorSigningInfo(startHeight int64, indexOffset int64, jailedUntil int64, signedBlocksCounter int64) ValidatorSigningInfo { +func NewValidatorSigningInfo(startHeight int64, indexOffset int64, jailedUntil time.Time, signedBlocksCounter int64) ValidatorSigningInfo { return ValidatorSigningInfo{ StartHeight: startHeight, IndexOffset: indexOffset, @@ -59,15 +60,15 @@ func NewValidatorSigningInfo(startHeight int64, indexOffset int64, jailedUntil i // Signing info for a validator type ValidatorSigningInfo struct { - StartHeight int64 `json:"start_height"` // height at which validator was first a candidate OR was unrevoked - IndexOffset int64 `json:"index_offset"` // index offset into signed block bit array - JailedUntil int64 `json:"jailed_until"` // timestamp validator cannot be unrevoked until - SignedBlocksCounter int64 `json:"signed_blocks_counter"` // signed blocks counter (to avoid scanning the array every time) + StartHeight int64 `json:"start_height"` // height at which validator was first a candidate OR was unrevoked + IndexOffset int64 `json:"index_offset"` // index offset into signed block bit array + JailedUntil time.Time `json:"jailed_until"` // timestamp validator cannot be unrevoked until + SignedBlocksCounter int64 `json:"signed_blocks_counter"` // signed blocks counter (to avoid scanning the array every time) } // Return human readable signing info func (i ValidatorSigningInfo) HumanReadableString() string { - return fmt.Sprintf("Start height: %d, index offset: %d, jailed until: %d, signed blocks counter: %d", + return fmt.Sprintf("Start height: %d, index offset: %d, jailed until: %v, signed blocks counter: %d", i.StartHeight, i.IndexOffset, i.JailedUntil, i.SignedBlocksCounter) } diff --git a/x/slashing/signing_info_test.go b/x/slashing/signing_info_test.go index 742769013..f92c43581 100644 --- a/x/slashing/signing_info_test.go +++ b/x/slashing/signing_info_test.go @@ -2,6 +2,7 @@ package slashing import ( "testing" + "time" "github.com/stretchr/testify/require" @@ -9,13 +10,13 @@ import ( ) func TestGetSetValidatorSigningInfo(t *testing.T) { - ctx, _, _, keeper := createTestInput(t) + ctx, _, _, _, keeper := createTestInput(t) info, found := keeper.getValidatorSigningInfo(ctx, sdk.ValAddress(addrs[0])) require.False(t, found) newInfo := ValidatorSigningInfo{ StartHeight: int64(4), IndexOffset: int64(3), - JailedUntil: int64(2), + JailedUntil: time.Unix(2, 0), SignedBlocksCounter: int64(10), } keeper.setValidatorSigningInfo(ctx, sdk.ValAddress(addrs[0]), newInfo) @@ -23,12 +24,12 @@ func TestGetSetValidatorSigningInfo(t *testing.T) { require.True(t, found) require.Equal(t, info.StartHeight, int64(4)) require.Equal(t, info.IndexOffset, int64(3)) - require.Equal(t, info.JailedUntil, int64(2)) + require.Equal(t, info.JailedUntil, time.Unix(2, 0).UTC()) require.Equal(t, info.SignedBlocksCounter, int64(10)) } func TestGetSetValidatorSigningBitArray(t *testing.T) { - ctx, _, _, keeper := createTestInput(t) + ctx, _, _, _, keeper := createTestInput(t) signed := keeper.getValidatorSigningBitArray(ctx, sdk.ValAddress(addrs[0]), 0) require.False(t, signed) // treat empty key as unsigned keeper.setValidatorSigningBitArray(ctx, sdk.ValAddress(addrs[0]), 0, true) diff --git a/x/slashing/simulation/invariants.go b/x/slashing/simulation/invariants.go new file mode 100644 index 000000000..7352aa503 --- /dev/null +++ b/x/slashing/simulation/invariants.go @@ -0,0 +1,18 @@ +package simulation + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" +) + +// AllInvariants tests all slashing invariants +func AllInvariants() simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + // TODO Any invariants to check here? + require.Nil(t, nil) + } +} diff --git a/x/slashing/simulation/msgs.go b/x/slashing/simulation/msgs.go new file mode 100644 index 000000000..b6a093674 --- /dev/null +++ b/x/slashing/simulation/msgs.go @@ -0,0 +1,34 @@ +package simulation + +import ( + "fmt" + "math/rand" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/tendermint/tendermint/crypto" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + "github.com/cosmos/cosmos-sdk/x/slashing" +) + +// SimulateMsgUnrevoke +func SimulateMsgUnrevoke(k slashing.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + key := simulation.RandomKey(r, keys) + address := sdk.AccAddress(key.PubKey().Address()) + msg := slashing.NewMsgUnrevoke(address) + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := slashing.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("slashing/MsgUnrevoke/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgUnrevoke: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} diff --git a/x/slashing/test_common.go b/x/slashing/test_common.go index 89dabbd43..7b3ab0436 100644 --- a/x/slashing/test_common.go +++ b/x/slashing/test_common.go @@ -18,6 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/wire" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/stake" ) @@ -34,7 +35,7 @@ var ( sdk.AccAddress(pks[1].Address()), sdk.AccAddress(pks[2].Address()), } - initCoins sdk.Int = sdk.NewInt(200) + initCoins = sdk.NewInt(200) ) func createTestCodec() *wire.Codec { @@ -47,27 +48,30 @@ func createTestCodec() *wire.Codec { return cdc } -func createTestInput(t *testing.T) (sdk.Context, bank.Keeper, stake.Keeper, Keeper) { +func createTestInput(t *testing.T) (sdk.Context, bank.Keeper, stake.Keeper, params.Setter, Keeper) { keyAcc := sdk.NewKVStoreKey("acc") keyStake := sdk.NewKVStoreKey("stake") keySlashing := sdk.NewKVStoreKey("slashing") + keyParams := sdk.NewKVStoreKey("params") db := dbm.NewMemDB() ms := store.NewCommitMultiStore(db) ms.MountStoreWithDB(keyAcc, sdk.StoreTypeIAVL, db) ms.MountStoreWithDB(keyStake, sdk.StoreTypeIAVL, db) ms.MountStoreWithDB(keySlashing, sdk.StoreTypeIAVL, db) + ms.MountStoreWithDB(keyParams, sdk.StoreTypeIAVL, db) err := ms.LoadLatestVersion() require.Nil(t, err) ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewTMLogger(os.Stdout)) cdc := createTestCodec() accountMapper := auth.NewAccountMapper(cdc, keyAcc, auth.ProtoBaseAccount) ck := bank.NewKeeper(accountMapper) + params := params.NewKeeper(cdc, keyParams) sk := stake.NewKeeper(cdc, keyStake, ck, stake.DefaultCodespace) genesis := stake.DefaultGenesisState() genesis.Pool.LooseTokens = sdk.NewRat(initCoins.MulRaw(int64(len(addrs))).Int64()) - err = stake.InitGenesis(ctx, sk, genesis) + _, err = stake.InitGenesis(ctx, sk, genesis) require.Nil(t, err) for _, addr := range addrs { @@ -76,8 +80,8 @@ func createTestInput(t *testing.T) (sdk.Context, bank.Keeper, stake.Keeper, Keep }) } require.Nil(t, err) - keeper := NewKeeper(cdc, keySlashing, sk, DefaultCodespace) - return ctx, ck, sk, keeper + keeper := NewKeeper(cdc, keySlashing, sk, params.Getter(), DefaultCodespace) + return ctx, ck, sk, params.Setter(), keeper } func newPubKey(pk string) (res crypto.PubKey) { diff --git a/x/slashing/tick.go b/x/slashing/tick.go index 01984f870..7478b511c 100644 --- a/x/slashing/tick.go +++ b/x/slashing/tick.go @@ -11,6 +11,7 @@ import ( // slashing begin block functionality func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, sk Keeper) (tags sdk.Tags) { + // Tag the height heightBytes := make([]byte, 8) binary.LittleEndian.PutUint64(heightBytes, uint64(req.Header.Height)) @@ -19,13 +20,9 @@ func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, sk Keeper) (tags // Iterate over all the validators which *should* have signed this block // Store whether or not they have actually signed it and slash/unbond any // which have missed too many blocks in a row (downtime slashing) - for _, signingValidator := range req.Validators { + for _, signingValidator := range req.LastCommitInfo.GetValidators() { present := signingValidator.SignedLastBlock - pubkey, err := tmtypes.PB2TM.PubKey(signingValidator.Validator.PubKey) - if err != nil { - panic(err) - } - sk.handleValidatorSignature(ctx, pubkey, signingValidator.Validator.Power, present) + sk.handleValidatorSignature(ctx, signingValidator.Validator.Address, signingValidator.Validator.Power, present) } // Iterate through any newly discovered evidence of infraction diff --git a/x/slashing/tick_test.go b/x/slashing/tick_test.go index 247fe0972..8e0d66ed6 100644 --- a/x/slashing/tick_test.go +++ b/x/slashing/tick_test.go @@ -2,38 +2,41 @@ package slashing import ( "testing" + "time" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - tmtypes "github.com/tendermint/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/stake" ) func TestBeginBlocker(t *testing.T) { - ctx, ck, sk, keeper := createTestInput(t) + ctx, ck, sk, _, keeper := createTestInput(t) addr, pk, amt := addrs[2], pks[2], sdk.NewInt(100) // bond the validator got := stake.NewHandler(sk)(ctx, newTestMsgCreateValidator(addr, pk, amt)) require.True(t, got.IsOK()) - stake.EndBlocker(ctx, sk) + validatorUpdates := stake.EndBlocker(ctx, sk) + keeper.AddValidators(ctx, validatorUpdates) require.Equal(t, ck.GetCoins(ctx, addr), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins.Sub(amt)}}) require.True(t, sdk.NewRatFromInt(amt).Equal(sk.Validator(ctx, addr).GetPower())) val := abci.Validator{ - PubKey: tmtypes.TM2PB.PubKey(pk), - Power: amt.Int64(), + Address: pk.Address(), + Power: amt.Int64(), } // mark the validator as having signed req := abci.RequestBeginBlock{ - Validators: []abci.SigningValidator{{ - Validator: val, - SignedLastBlock: true, - }}, + LastCommitInfo: abci.LastCommitInfo{ + Validators: []abci.SigningValidator{{ + Validator: val, + SignedLastBlock: true, + }}, + }, } BeginBlocker(ctx, req, keeper) @@ -41,31 +44,35 @@ func TestBeginBlocker(t *testing.T) { require.True(t, found) require.Equal(t, ctx.BlockHeight(), info.StartHeight) require.Equal(t, int64(1), info.IndexOffset) - require.Equal(t, int64(0), info.JailedUntil) + require.Equal(t, time.Unix(0, 0).UTC(), info.JailedUntil) require.Equal(t, int64(1), info.SignedBlocksCounter) height := int64(0) // for 1000 blocks, mark the validator as having signed - for ; height < SignedBlocksWindow; height++ { + for ; height < keeper.SignedBlocksWindow(ctx); height++ { ctx = ctx.WithBlockHeight(height) req = abci.RequestBeginBlock{ - Validators: []abci.SigningValidator{{ - Validator: val, - SignedLastBlock: true, - }}, + LastCommitInfo: abci.LastCommitInfo{ + Validators: []abci.SigningValidator{{ + Validator: val, + SignedLastBlock: true, + }}, + }, } BeginBlocker(ctx, req, keeper) } // for 500 blocks, mark the validator as having not signed - for ; height < ((SignedBlocksWindow * 2) - MinSignedPerWindow + 1); height++ { + for ; height < ((keeper.SignedBlocksWindow(ctx) * 2) - keeper.MinSignedPerWindow(ctx) + 1); height++ { ctx = ctx.WithBlockHeight(height) req = abci.RequestBeginBlock{ - Validators: []abci.SigningValidator{{ - Validator: val, - SignedLastBlock: false, - }}, + LastCommitInfo: abci.LastCommitInfo{ + Validators: []abci.SigningValidator{{ + Validator: val, + SignedLastBlock: false, + }}, + }, } BeginBlocker(ctx, req, keeper) } diff --git a/x/stake/app_test.go b/x/stake/app_test.go index d1183e6c9..4e1b2c2ac 100644 --- a/x/stake/app_test.go +++ b/x/stake/app_test.go @@ -65,12 +65,14 @@ func getInitChainer(mapp *mock.App, keeper Keeper) sdk.InitChainer { stakeGenesis := DefaultGenesisState() stakeGenesis.Pool.LooseTokens = sdk.NewRat(100000) - err := InitGenesis(ctx, keeper, stakeGenesis) + validators, err := InitGenesis(ctx, keeper, stakeGenesis) if err != nil { panic(err) } - return abci.ResponseInitChain{} + return abci.ResponseInitChain{ + Validators: validators, + } } } @@ -106,8 +108,8 @@ func checkDelegation( func TestStakeMsgs(t *testing.T) { mApp, keeper := getMockApp(t) - genCoin := sdk.NewCoin("steak", 42) - bondCoin := sdk.NewCoin("steak", 10) + genCoin := sdk.NewInt64Coin("steak", 42) + bondCoin := sdk.NewInt64Coin("steak", 10) acc1 := &auth.BaseAccount{ Address: addr1, diff --git a/x/stake/client/cli/flags.go b/x/stake/client/cli/flags.go index bb8923b58..3d5e90b35 100644 --- a/x/stake/client/cli/flags.go +++ b/x/stake/client/cli/flags.go @@ -2,6 +2,8 @@ package cli import ( flag "github.com/spf13/pflag" + + "github.com/cosmos/cosmos-sdk/x/stake/types" ) // nolint @@ -16,31 +18,36 @@ const ( FlagSharesPercent = "shares-percent" FlagMoniker = "moniker" - FlagIdentity = "keybase-sig" + FlagIdentity = "identity" FlagWebsite = "website" FlagDetails = "details" ) // common flagsets to add to various functions var ( - fsPk = flag.NewFlagSet("", flag.ContinueOnError) - fsAmount = flag.NewFlagSet("", flag.ContinueOnError) - fsShares = flag.NewFlagSet("", flag.ContinueOnError) - fsDescription = flag.NewFlagSet("", flag.ContinueOnError) - fsValidator = flag.NewFlagSet("", flag.ContinueOnError) - fsDelegator = flag.NewFlagSet("", flag.ContinueOnError) - fsRedelegation = flag.NewFlagSet("", flag.ContinueOnError) + fsPk = flag.NewFlagSet("", flag.ContinueOnError) + fsAmount = flag.NewFlagSet("", flag.ContinueOnError) + fsShares = flag.NewFlagSet("", flag.ContinueOnError) + fsDescriptionCreate = flag.NewFlagSet("", flag.ContinueOnError) + fsDescriptionEdit = flag.NewFlagSet("", flag.ContinueOnError) + fsValidator = flag.NewFlagSet("", flag.ContinueOnError) + fsDelegator = flag.NewFlagSet("", flag.ContinueOnError) + fsRedelegation = flag.NewFlagSet("", flag.ContinueOnError) ) func init() { fsPk.String(FlagPubKey, "", "Go-Amino encoded hex PubKey of the validator. For Ed25519 the go-amino prepend hex is 1624de6220") - fsAmount.String(FlagAmount, "1steak", "Amount of coins to bond") + fsAmount.String(FlagAmount, "", "Amount of coins to bond") fsShares.String(FlagSharesAmount, "", "Amount of source-shares to either unbond or redelegate as a positive integer or decimal") fsShares.String(FlagSharesPercent, "", "Percent of source-shares to either unbond or redelegate as a positive integer or decimal >0 and <=1") - fsDescription.String(FlagMoniker, "[do-not-modify]", "validator name") - fsDescription.String(FlagIdentity, "[do-not-modify]", "optional keybase signature") - fsDescription.String(FlagWebsite, "[do-not-modify]", "optional website") - fsDescription.String(FlagDetails, "[do-not-modify]", "optional details") + fsDescriptionCreate.String(FlagMoniker, "", "validator name") + fsDescriptionCreate.String(FlagIdentity, "", "optional identity signature (ex. UPort or Keybase)") + fsDescriptionCreate.String(FlagWebsite, "", "optional website") + fsDescriptionCreate.String(FlagDetails, "", "optional details") + fsDescriptionEdit.String(FlagMoniker, types.DoNotModifyDesc, "validator name") + fsDescriptionEdit.String(FlagIdentity, types.DoNotModifyDesc, "optional identity signature (ex. UPort or Keybase)") + fsDescriptionEdit.String(FlagWebsite, types.DoNotModifyDesc, "optional website") + fsDescriptionEdit.String(FlagDetails, types.DoNotModifyDesc, "optional details") fsValidator.String(FlagAddressValidator, "", "hex address of the validator") fsDelegator.String(FlagAddressDelegator, "", "hex address of the delegator") fsRedelegation.String(FlagAddressValidatorSrc, "", "hex address of the source validator") diff --git a/x/stake/client/cli/query.go b/x/stake/client/cli/query.go index c2d85d4b1..015d6ffcf 100644 --- a/x/stake/client/cli/query.go +++ b/x/stake/client/cli/query.go @@ -14,26 +14,28 @@ import ( "github.com/cosmos/cosmos-sdk/x/stake/types" ) -// get the command to query a validator +// GetCmdQueryValidator implements the validator query command. func GetCmdQueryValidator(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "validator [owner-addr]", Short: "Query a validator", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - addr, err := sdk.AccAddressFromBech32(args[0]) if err != nil { return err } + key := stake.GetValidatorKey(addr) - ctx := context.NewCoreContextFromViper() - res, err := ctx.QueryStore(key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + res, err := cliCtx.QueryStore(key, storeName) if err != nil { return err } else if len(res) == 0 { return fmt.Errorf("No validator found with address %s", args[0]) } + validator := types.MustUnmarshalValidator(cdc, addr, res) switch viper.Get(cli.OutputFlag) { @@ -50,9 +52,11 @@ func GetCmdQueryValidator(storeName string, cdc *wire.Codec) *cobra.Command { if err != nil { return err } + fmt.Println(string(output)) } - // TODO output with proofs / machine parseable etc. + + // TODO: output with proofs / machine parseable etc. return nil }, } @@ -60,16 +64,16 @@ func GetCmdQueryValidator(storeName string, cdc *wire.Codec) *cobra.Command { return cmd } -// get the command to query a validator +// GetCmdQueryValidators implements the query all validators command. func GetCmdQueryValidators(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "validators", Short: "Query for all validators", RunE: func(cmd *cobra.Command, args []string) error { - key := stake.ValidatorsKey - ctx := context.NewCoreContextFromViper() - resKVs, err := ctx.QuerySubspace(cdc, key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + resKVs, err := cliCtx.QuerySubspace(key, storeName) if err != nil { return err } @@ -89,6 +93,7 @@ func GetCmdQueryValidators(storeName string, cdc *wire.Codec) *cobra.Command { if err != nil { return err } + fmt.Println(resp) } case "json": @@ -96,24 +101,25 @@ func GetCmdQueryValidators(storeName string, cdc *wire.Codec) *cobra.Command { if err != nil { return err } + fmt.Println(string(output)) return nil } - return nil - // TODO output with proofs / machine parseable etc. + // TODO: output with proofs / machine parseable etc. + return nil }, } + return cmd } -// get the command to query a single delegation +// GetCmdQueryDelegation the query delegation command. func GetCmdQueryDelegation(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "delegation", Short: "Query a delegation based on address and validator address", RunE: func(cmd *cobra.Command, args []string) error { - valAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidator)) if err != nil { return err @@ -125,8 +131,9 @@ func GetCmdQueryDelegation(storeName string, cdc *wire.Codec) *cobra.Command { } key := stake.GetDelegationKey(delAddr, valAddr) - ctx := context.NewCoreContextFromViper() - res, err := ctx.QueryStore(key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + res, err := cliCtx.QueryStore(key, storeName) if err != nil { return err } @@ -140,39 +147,45 @@ func GetCmdQueryDelegation(storeName string, cdc *wire.Codec) *cobra.Command { if err != nil { return err } + fmt.Println(resp) case "json": output, err := wire.MarshalJSONIndent(cdc, delegation) if err != nil { return err } + fmt.Println(string(output)) return nil } + return nil }, } cmd.Flags().AddFlagSet(fsValidator) cmd.Flags().AddFlagSet(fsDelegator) + return cmd } -// get the command to query all the delegations made from one delegator +// GetCmdQueryDelegations implements the command to query all the delegations +// made from one delegator. func GetCmdQueryDelegations(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "delegations [delegator-addr]", Short: "Query all delegations made from one delegator", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - delegatorAddr, err := sdk.AccAddressFromBech32(args[0]) if err != nil { return err } + key := stake.GetDelegationsKey(delegatorAddr) - ctx := context.NewCoreContextFromViper() - resKVs, err := ctx.QuerySubspace(cdc, key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + resKVs, err := cliCtx.QuerySubspace(key, storeName) if err != nil { return err } @@ -188,22 +201,24 @@ func GetCmdQueryDelegations(storeName string, cdc *wire.Codec) *cobra.Command { if err != nil { return err } - fmt.Println(string(output)) - return nil - // TODO output with proofs / machine parseable etc. + fmt.Println(string(output)) + + // TODO: output with proofs / machine parseable etc. + return nil }, } + return cmd } -// get the command to query a single unbonding-delegation record +// GetCmdQueryUnbondingDelegation implements the command to query a single +// unbonding-delegation record. func GetCmdQueryUnbondingDelegation(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "unbonding-delegation", Short: "Query an unbonding-delegation record based on delegator and validator address", RunE: func(cmd *cobra.Command, args []string) error { - valAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidator)) if err != nil { return err @@ -215,8 +230,9 @@ func GetCmdQueryUnbondingDelegation(storeName string, cdc *wire.Codec) *cobra.Co } key := stake.GetUBDKey(delAddr, valAddr) - ctx := context.NewCoreContextFromViper() - res, err := ctx.QueryStore(key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + res, err := cliCtx.QueryStore(key, storeName) if err != nil { return err } @@ -230,39 +246,45 @@ func GetCmdQueryUnbondingDelegation(storeName string, cdc *wire.Codec) *cobra.Co if err != nil { return err } + fmt.Println(resp) case "json": output, err := wire.MarshalJSONIndent(cdc, ubd) if err != nil { return err } + fmt.Println(string(output)) return nil } + return nil }, } cmd.Flags().AddFlagSet(fsValidator) cmd.Flags().AddFlagSet(fsDelegator) + return cmd } -// get the command to query all the unbonding-delegation records for a delegator +// GetCmdQueryUnbondingDelegations implements the command to query all the +// unbonding-delegation records for a delegator. func GetCmdQueryUnbondingDelegations(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "unbonding-delegations [delegator-addr]", Short: "Query all unbonding-delegations records for one delegator", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - delegatorAddr, err := sdk.AccAddressFromBech32(args[0]) if err != nil { return err } + key := stake.GetUBDsKey(delegatorAddr) - ctx := context.NewCoreContextFromViper() - resKVs, err := ctx.QuerySubspace(cdc, key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + resKVs, err := cliCtx.QuerySubspace(key, storeName) if err != nil { return err } @@ -278,38 +300,43 @@ func GetCmdQueryUnbondingDelegations(storeName string, cdc *wire.Codec) *cobra.C if err != nil { return err } - fmt.Println(string(output)) - return nil - // TODO output with proofs / machine parseable etc. + fmt.Println(string(output)) + + // TODO: output with proofs / machine parseable etc. + return nil }, } + return cmd } -// get the command to query a single unbonding-delegation record +// GetCmdQueryRedelegation implements the command to query a single +// redelegation record. func GetCmdQueryRedelegation(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ - Use: "unbonding-delegation", - Short: "Query an unbonding-delegation record based on delegator and validator address", + Use: "redelegation", + Short: "Query a redelegation record based on delegator and a source and destination validator address", RunE: func(cmd *cobra.Command, args []string) error { - valSrcAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidatorSrc)) if err != nil { return err } + valDstAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidatorDst)) if err != nil { return err } + delAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressDelegator)) if err != nil { return err } key := stake.GetREDKey(delAddr, valSrcAddr, valDstAddr) - ctx := context.NewCoreContextFromViper() - res, err := ctx.QueryStore(key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + res, err := cliCtx.QueryStore(key, storeName) if err != nil { return err } @@ -323,39 +350,45 @@ func GetCmdQueryRedelegation(storeName string, cdc *wire.Codec) *cobra.Command { if err != nil { return err } + fmt.Println(resp) case "json": output, err := wire.MarshalJSONIndent(cdc, red) if err != nil { return err } + fmt.Println(string(output)) return nil } + return nil }, } cmd.Flags().AddFlagSet(fsRedelegation) cmd.Flags().AddFlagSet(fsDelegator) + return cmd } -// get the command to query all the unbonding-delegation records for a delegator +// GetCmdQueryRedelegations implements the command to query all the +// redelegation records for a delegator. func GetCmdQueryRedelegations(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ - Use: "unbonding-delegations [delegator-addr]", - Short: "Query all unbonding-delegations records for one delegator", + Use: "redelegations [delegator-addr]", + Short: "Query all redelegations records for one delegator", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - delegatorAddr, err := sdk.AccAddressFromBech32(args[0]) if err != nil { return err } + key := stake.GetREDsKey(delegatorAddr) - ctx := context.NewCoreContextFromViper() - resKVs, err := ctx.QuerySubspace(cdc, key, storeName) + cliCtx := context.NewCLIContext().WithCodec(cdc) + + resKVs, err := cliCtx.QuerySubspace(key, storeName) if err != nil { return err } @@ -371,11 +404,13 @@ func GetCmdQueryRedelegations(storeName string, cdc *wire.Codec) *cobra.Command if err != nil { return err } - fmt.Println(string(output)) - return nil - // TODO output with proofs / machine parseable etc. + fmt.Println(string(output)) + + // TODO: output with proofs / machine parseable etc. + return nil }, } + return cmd } diff --git a/x/stake/client/cli/tx.go b/x/stake/client/cli/tx.go index 72317c82c..4c86777f3 100644 --- a/x/stake/client/cli/tx.go +++ b/x/stake/client/cli/tx.go @@ -2,33 +2,45 @@ package cli import ( "fmt" + "os" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/utils" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" + authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + authctx "github.com/cosmos/cosmos-sdk/x/auth/client/context" + "github.com/cosmos/cosmos-sdk/x/stake" + "github.com/cosmos/cosmos-sdk/x/stake/types" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/context" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/wire" - authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" - "github.com/cosmos/cosmos-sdk/x/stake" - "github.com/cosmos/cosmos-sdk/x/stake/types" ) -// create create validator command +// GetCmdCreateValidator implements the create validator command handler. func GetCmdCreateValidator(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "create-validator", Short: "create new validator initialized with a self-delegation to it", RunE: func(cmd *cobra.Command, args []string) error { - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - amount, err := sdk.ParseCoin(viper.GetString(FlagAmount)) + amounstStr := viper.GetString(FlagAmount) + if amounstStr == "" { + return fmt.Errorf("Must specify amount to stake using --amount") + } + amount, err := sdk.ParseCoin(amounstStr) if err != nil { return err } - validatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidator)) + + validatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } @@ -37,13 +49,16 @@ func GetCmdCreateValidator(cdc *wire.Codec) *cobra.Command { if len(pkStr) == 0 { return fmt.Errorf("must use --pubkey flag") } + pk, err := sdk.GetValPubKeyBech32(pkStr) if err != nil { return err } + if viper.GetString(FlagMoniker) == "" { return fmt.Errorf("please enter a moniker for the validator using --moniker") } + description := stake.Description{ Moniker: viper.GetString(FlagMoniker), Identity: viper.GetString(FlagIdentity), @@ -57,39 +72,42 @@ func GetCmdCreateValidator(cdc *wire.Codec) *cobra.Command { if err != nil { return err } + msg = stake.NewMsgCreateValidatorOnBehalfOf(delegatorAddr, validatorAddr, pk, amount, description) } else { msg = stake.NewMsgCreateValidator(validatorAddr, pk, amount, description) } // build and sign the transaction, then broadcast to Tendermint - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } cmd.Flags().AddFlagSet(fsPk) cmd.Flags().AddFlagSet(fsAmount) - cmd.Flags().AddFlagSet(fsDescription) - cmd.Flags().AddFlagSet(fsValidator) + cmd.Flags().AddFlagSet(fsDescriptionCreate) cmd.Flags().AddFlagSet(fsDelegator) + return cmd } -// create edit validator command +// GetCmdEditValidator implements the create edit validator command. func GetCmdEditValidator(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "edit-validator", Short: "edit and existing validator account", RunE: func(cmd *cobra.Command, args []string) error { + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - validatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidator)) + validatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } + description := stake.Description{ Moniker: viper.GetString(FlagMoniker), Identity: viper.GetString(FlagIdentity), @@ -99,37 +117,37 @@ func GetCmdEditValidator(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgEditValidator(validatorAddr, description) // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } - cmd.Flags().AddFlagSet(fsDescription) - cmd.Flags().AddFlagSet(fsValidator) + cmd.Flags().AddFlagSet(fsDescriptionEdit) + return cmd } -// delegate command +// GetCmdDelegate implements the delegate command. func GetCmdDelegate(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "delegate", Short: "delegate liquid tokens to an validator", RunE: func(cmd *cobra.Command, args []string) error { + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) + amount, err := sdk.ParseCoin(viper.GetString(FlagAmount)) if err != nil { return err } - delegatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressDelegator)) + delegatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } + validatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidator)) if err != nil { return err @@ -138,53 +156,55 @@ func GetCmdDelegate(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgDelegate(delegatorAddr, validatorAddr, amount) // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } cmd.Flags().AddFlagSet(fsAmount) - cmd.Flags().AddFlagSet(fsDelegator) cmd.Flags().AddFlagSet(fsValidator) + return cmd } -// create edit validator command +// GetCmdRedelegate implements the redelegate validator command. func GetCmdRedelegate(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "redelegate", Short: "redelegate illiquid tokens from one validator to another", } + cmd.AddCommand( client.PostCommands( GetCmdBeginRedelegate(storeName, cdc), GetCmdCompleteRedelegate(cdc), )...) + return cmd } -// redelegate command +// GetCmdBeginRedelegate the begin redelegation command. func GetCmdBeginRedelegate(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "begin", Short: "begin redelegation", RunE: func(cmd *cobra.Command, args []string) error { + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) var err error - delegatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressDelegator)) + delegatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } + validatorSrcAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidatorSrc)) if err != nil { return err } + validatorDstAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidatorDst)) if err != nil { return err @@ -193,8 +213,10 @@ func GetCmdBeginRedelegate(storeName string, cdc *wire.Codec) *cobra.Command { // get the shares amount sharesAmountStr := viper.GetString(FlagSharesAmount) sharesPercentStr := viper.GetString(FlagSharesPercent) - sharesAmount, err := getShares(storeName, cdc, sharesAmountStr, sharesPercentStr, - delegatorAddr, validatorSrcAddr) + sharesAmount, err := getShares( + storeName, cdc, sharesAmountStr, sharesPercentStr, + delegatorAddr, validatorSrcAddr, + ) if err != nil { return err } @@ -202,28 +224,22 @@ func GetCmdBeginRedelegate(storeName string, cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgBeginRedelegate(delegatorAddr, validatorSrcAddr, validatorDstAddr, sharesAmount) // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } cmd.Flags().AddFlagSet(fsShares) - cmd.Flags().AddFlagSet(fsDelegator) cmd.Flags().AddFlagSet(fsRedelegation) + return cmd } // nolint: gocyclo // TODO: Make this pass gocyclo linting -func getShares(storeName string, cdc *wire.Codec, sharesAmountStr, sharesPercentStr string, - delegatorAddr, validatorAddr sdk.AccAddress) (sharesAmount sdk.Rat, err error) { - +func getShares( + storeName string, cdc *wire.Codec, sharesAmountStr, + sharesPercentStr string, delegatorAddr, validatorAddr sdk.AccAddress, +) (sharesAmount sdk.Rat, err error) { switch { case sharesAmountStr != "" && sharesPercentStr != "": return sharesAmount, errors.Errorf("can either specify the amount OR the percent of the shares, not both") @@ -249,32 +265,44 @@ func getShares(storeName string, cdc *wire.Codec, sharesAmountStr, sharesPercent // make a query to get the existing delegation shares key := stake.GetDelegationKey(delegatorAddr, validatorAddr) - ctx := context.NewCoreContextFromViper() - resQuery, err := ctx.QueryStore(key, storeName) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) + + resQuery, err := cliCtx.QueryStore(key, storeName) if err != nil { return sharesAmount, errors.Errorf("cannot find delegation to determine percent Error: %v", err) } + delegation := types.MustUnmarshalDelegation(cdc, key, resQuery) sharesAmount = sharesPercent.Mul(delegation.Shares) } + return } -// redelegate command +// GetCmdCompleteRedelegate implements the complete redelegation command. func GetCmdCompleteRedelegate(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "complete", Short: "complete redelegation", RunE: func(cmd *cobra.Command, args []string) error { + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - delegatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressDelegator)) + delegatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } + validatorSrcAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidatorSrc)) if err != nil { return err } + validatorDstAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidatorDst)) if err != nil { return err @@ -283,46 +311,48 @@ func GetCmdCompleteRedelegate(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgCompleteRedelegate(delegatorAddr, validatorSrcAddr, validatorDstAddr) // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } - cmd.Flags().AddFlagSet(fsDelegator) + cmd.Flags().AddFlagSet(fsRedelegation) + return cmd } -// create edit validator command +// GetCmdUnbond implements the unbond validator command. func GetCmdUnbond(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "unbond", Short: "begin or complete unbonding shares from a validator", } + cmd.AddCommand( client.PostCommands( GetCmdBeginUnbonding(storeName, cdc), GetCmdCompleteUnbonding(cdc), )...) + return cmd } -// create edit validator command +// GetCmdBeginUnbonding implements the begin unbonding validator command. func GetCmdBeginUnbonding(storeName string, cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "begin", Short: "begin unbonding", RunE: func(cmd *cobra.Command, args []string) error { + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - delegatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressDelegator)) + delegatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } + validatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidator)) if err != nil { return err @@ -331,8 +361,10 @@ func GetCmdBeginUnbonding(storeName string, cdc *wire.Codec) *cobra.Command { // get the shares amount sharesAmountStr := viper.GetString(FlagSharesAmount) sharesPercentStr := viper.GetString(FlagSharesPercent) - sharesAmount, err := getShares(storeName, cdc, sharesAmountStr, sharesPercentStr, - delegatorAddr, validatorAddr) + sharesAmount, err := getShares( + storeName, cdc, sharesAmountStr, sharesPercentStr, + delegatorAddr, validatorAddr, + ) if err != nil { return err } @@ -340,34 +372,33 @@ func GetCmdBeginUnbonding(storeName string, cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgBeginUnbonding(delegatorAddr, validatorAddr, sharesAmount) // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } cmd.Flags().AddFlagSet(fsShares) - cmd.Flags().AddFlagSet(fsDelegator) cmd.Flags().AddFlagSet(fsValidator) + return cmd } -// create edit validator command +// GetCmdCompleteUnbonding implements the complete unbonding validator command. func GetCmdCompleteUnbonding(cdc *wire.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "complete", Short: "complete unbonding", RunE: func(cmd *cobra.Command, args []string) error { + txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) + cliCtx := context.NewCLIContext(). + WithCodec(cdc). + WithLogger(os.Stdout). + WithAccountDecoder(authcmd.GetAccountDecoder(cdc)) - delegatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressDelegator)) + delegatorAddr, err := cliCtx.GetFromAddress() if err != nil { return err } + validatorAddr, err := sdk.AccAddressFromBech32(viper.GetString(FlagAddressValidator)) if err != nil { return err @@ -376,17 +407,11 @@ func GetCmdCompleteUnbonding(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgCompleteUnbonding(delegatorAddr, validatorAddr) // build and sign the transaction, then broadcast to Tendermint - ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc)) - - err = ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, []sdk.Msg{msg}, cdc) - if err != nil { - return err - } - - return nil + return utils.SendTx(txCtx, cliCtx, []sdk.Msg{msg}) }, } - cmd.Flags().AddFlagSet(fsDelegator) + cmd.Flags().AddFlagSet(fsValidator) + return cmd } diff --git a/x/stake/client/rest/query.go b/x/stake/client/rest/query.go index 9a4c3755d..ac660f98f 100644 --- a/x/stake/client/rest/query.go +++ b/x/stake/client/rest/query.go @@ -3,50 +3,236 @@ package rest import ( "fmt" "net/http" - - "github.com/gorilla/mux" + "strings" "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" - "github.com/cosmos/cosmos-sdk/x/stake" + "github.com/cosmos/cosmos-sdk/x/stake/tags" "github.com/cosmos/cosmos-sdk/x/stake/types" + + "github.com/gorilla/mux" ) const storeName = "stake" -func registerQueryRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec) { +func registerQueryRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec) { + // GET /stake/delegators/{delegatorAddr} // Get all delegations (delegation, undelegation and redelegation) from a delegator r.HandleFunc( - "/stake/{delegator}/delegation/{validator}", - delegationHandlerFn(ctx, cdc), + "/stake/delegators/{delegatorAddr}", + delegatorHandlerFn(cliCtx, cdc), ).Methods("GET") + // GET /stake/delegators/{delegatorAddr}/txs?type=<bond/unbond/redelegate> // Get all staking txs (i.e msgs) from a delegator r.HandleFunc( - "/stake/{delegator}/ubd/{validator}", - ubdHandlerFn(ctx, cdc), + "/stake/delegators/{delegatorAddr}/txs", + delegatorTxsHandlerFn(cliCtx, cdc), ).Methods("GET") + // GET /stake/delegators/{delegatorAddr}/delegations/{validatorAddr} // Query a delegation between a delegator and a validator r.HandleFunc( - "/stake/{delegator}/red/{validator_src}/{validator_dst}", - redHandlerFn(ctx, cdc), + "/stake/delegators/{delegatorAddr}/delegations/{validatorAddr}", + delegationHandlerFn(cliCtx, cdc), ).Methods("GET") + // GET /stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr} // Query all unbonding_delegations between a delegator and a validator + r.HandleFunc( + "/stake/delegators/{delegatorAddr}/unbonding_delegations/{validatorAddr}", + unbondingDelegationsHandlerFn(cliCtx, cdc), + ).Methods("GET") + + // GET /stake/validators/ r.HandleFunc( "/stake/validators", - validatorsHandlerFn(ctx, cdc), + validatorsHandlerFn(cliCtx, cdc), + ).Methods("GET") + + // GET /stake/validators/{addr} + r.HandleFunc( + "/stake/validators/{addr}", + validatorHandlerFn(cliCtx, cdc), ).Methods("GET") } -// http request handler to query a delegation -func delegationHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerFunc { +// already resolve the rational shares to not handle this in the client + +// defines a delegation without type Rat for shares +type DelegationWithoutRat struct { + DelegatorAddr sdk.AccAddress `json:"delegator_addr"` + ValidatorAddr sdk.AccAddress `json:"validator_addr"` + Shares string `json:"shares"` + Height int64 `json:"height"` +} + +// aggregation of all delegations, unbondings and redelegations +type DelegationSummary struct { + Delegations []DelegationWithoutRat `json:"delegations"` + UnbondingDelegations []stake.UnbondingDelegation `json:"unbonding_delegations"` + Redelegations []stake.Redelegation `json:"redelegations"` +} + +// HTTP request handler to query a delegator delegations +func delegatorHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { + var validatorAddr sdk.AccAddress + var delegationSummary = DelegationSummary{} + // read parameters vars := mux.Vars(r) - bech32delegator := vars["delegator"] - bech32validator := vars["validator"] + bech32delegator := vars["delegatorAddr"] + + delegatorAddr, err := sdk.AccAddressFromBech32(bech32delegator) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + + // Get all validators using key + validators, statusCode, errMsg, err := getBech32Validators(storeName, cliCtx, cdc) + if err != nil { + w.WriteHeader(statusCode) + w.Write([]byte(fmt.Sprintf("%s%s", errMsg, err.Error()))) + return + } + + for _, validator := range validators { + validatorAddr = validator.Owner + + // Delegations + delegations, statusCode, errMsg, err := getDelegatorDelegations(cliCtx, cdc, delegatorAddr, validatorAddr) + if err != nil { + w.WriteHeader(statusCode) + w.Write([]byte(fmt.Sprintf("%s%s", errMsg, err.Error()))) + return + } + if statusCode != http.StatusNoContent { + delegationSummary.Delegations = append(delegationSummary.Delegations, delegations) + } + + // Undelegations + unbondingDelegation, statusCode, errMsg, err := getDelegatorUndelegations(cliCtx, cdc, delegatorAddr, validatorAddr) + if err != nil { + w.WriteHeader(statusCode) + w.Write([]byte(fmt.Sprintf("%s%s", errMsg, err.Error()))) + return + } + if statusCode != http.StatusNoContent { + delegationSummary.UnbondingDelegations = append(delegationSummary.UnbondingDelegations, unbondingDelegation) + } + + // Redelegations + // only querying redelegations to a validator as this should give us already all relegations + // if we also would put in redelegations from, we would have every redelegation double + redelegations, statusCode, errMsg, err := getDelegatorRedelegations(cliCtx, cdc, delegatorAddr, validatorAddr) + if err != nil { + w.WriteHeader(statusCode) + w.Write([]byte(fmt.Sprintf("%s%s", errMsg, err.Error()))) + return + } + if statusCode != http.StatusNoContent { + delegationSummary.Redelegations = append(delegationSummary.Redelegations, redelegations) + } + } + + output, err := cdc.MarshalJSON(delegationSummary) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(err.Error())) + return + } + + w.Write(output) + } +} + +// nolint gocyclo +// HTTP request handler to query all staking txs (msgs) from a delegator +func delegatorTxsHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var output []byte + var typesQuerySlice []string + vars := mux.Vars(r) + delegatorAddr := vars["delegatorAddr"] + + _, err := sdk.AccAddressFromBech32(delegatorAddr) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + + node, err := cliCtx.GetNode() + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("Couldn't get current Node information. Error: %s", err.Error()))) + return + } + + // Get values from query + + typesQuery := r.URL.Query().Get("type") + trimmedQuery := strings.TrimSpace(typesQuery) + if len(trimmedQuery) != 0 { + typesQuerySlice = strings.Split(trimmedQuery, " ") + } + + noQuery := len(typesQuerySlice) == 0 + isBondTx := contains(typesQuerySlice, "bond") + isUnbondTx := contains(typesQuerySlice, "unbond") + isRedTx := contains(typesQuerySlice, "redelegate") + var txs = []tx.Info{} + var actions []string + + switch { + case isBondTx: + actions = append(actions, string(tags.ActionDelegate)) + case isUnbondTx: + actions = append(actions, string(tags.ActionBeginUnbonding)) + actions = append(actions, string(tags.ActionCompleteUnbonding)) + case isRedTx: + actions = append(actions, string(tags.ActionBeginRedelegation)) + actions = append(actions, string(tags.ActionCompleteRedelegation)) + case noQuery: + actions = append(actions, string(tags.ActionDelegate)) + actions = append(actions, string(tags.ActionBeginUnbonding)) + actions = append(actions, string(tags.ActionCompleteUnbonding)) + actions = append(actions, string(tags.ActionBeginRedelegation)) + actions = append(actions, string(tags.ActionCompleteRedelegation)) + default: + w.WriteHeader(http.StatusNoContent) + return + } + + for _, action := range actions { + foundTxs, errQuery := queryTxs(node, cdc, action, delegatorAddr) + if errQuery != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("error querying transactions. Error: %s", errQuery.Error()))) + } + txs = append(txs, foundTxs...) + } + + output, err = cdc.MarshalJSON(txs) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(err.Error())) + return + } + w.Write(output) + } +} + +// HTTP request handler to query an unbonding-delegation +func unbondingDelegationsHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + bech32delegator := vars["delegatorAddr"] + bech32validator := vars["validatorAddr"] delegatorAddr, err := sdk.AccAddressFromBech32(bech32delegator) if err != nil { @@ -61,10 +247,70 @@ func delegationHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerF w.Write([]byte(err.Error())) return } + validatorAddrAcc := sdk.AccAddress(validatorAddr) - key := stake.GetDelegationKey(delegatorAddr, validatorAddr) + key := stake.GetUBDKey(delegatorAddr, validatorAddrAcc) - res, err := ctx.QueryStore(key, storeName) + res, err := cliCtx.QueryStore(key, storeName) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("couldn't query unbonding-delegation. Error: %s", err.Error()))) + return + } + + // the query will return empty if there is no data for this record + if len(res) == 0 { + w.WriteHeader(http.StatusNoContent) + return + } + + ubd, err := types.UnmarshalUBD(cdc, key, res) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("couldn't unmarshall unbonding-delegation. Error: %s", err.Error()))) + return + } + + // unbondings will be a list in the future but is not yet, but we want to keep the API consistent + ubdArray := []stake.UnbondingDelegation{ubd} + + output, err := cdc.MarshalJSON(ubdArray) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("couldn't marshall unbonding-delegation. Error: %s", err.Error()))) + return + } + + w.Write(output) + } +} + +// HTTP request handler to query a bonded validator +func delegationHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + // read parameters + vars := mux.Vars(r) + bech32delegator := vars["delegatorAddr"] + bech32validator := vars["validatorAddr"] + + delegatorAddr, err := sdk.AccAddressFromBech32(bech32delegator) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + + validatorAddr, err := sdk.AccAddressFromBech32(bech32validator) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + validatorAddrAcc := sdk.AccAddress(validatorAddr) + + key := stake.GetDelegationKey(delegatorAddr, validatorAddrAcc) + + res, err := cliCtx.QueryStore(key, storeName) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("couldn't query delegation. Error: %s", err.Error()))) @@ -84,7 +330,14 @@ func delegationHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerF return } - output, err := cdc.MarshalJSON(delegation) + outputDelegation := DelegationWithoutRat{ + DelegatorAddr: delegation.DelegatorAddr, + ValidatorAddr: delegation.ValidatorAddr, + Height: delegation.Height, + Shares: delegation.Shares.FloatString(), + } + + output, err := cdc.MarshalJSON(outputDelegation) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) @@ -95,14 +348,16 @@ func delegationHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerF } } -// http request handler to query an unbonding-delegation -func ubdHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerFunc { +// HTTP request handler to query all delegator bonded validators +func delegatorValidatorsHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { + var validatorAccAddr sdk.AccAddress + var bondedValidators []types.BechValidator + // read parameters vars := mux.Vars(r) - bech32delegator := vars["delegator"] - bech32validator := vars["validator"] + bech32delegator := vars["delegatorAddr"] delegatorAddr, err := sdk.AccAddressFromBech32(bech32delegator) if err != nil { @@ -111,115 +366,93 @@ func ubdHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerFunc { return } - validatorAddr, err := sdk.AccAddressFromBech32(bech32validator) - if err != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - - key := stake.GetUBDKey(delegatorAddr, validatorAddr) - - res, err := ctx.QueryStore(key, storeName) + // Get all validators using key + kvs, err := cliCtx.QuerySubspace(stake.ValidatorsKey, storeName) if err != nil { w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(fmt.Sprintf("couldn't query unbonding-delegation. Error: %s", err.Error()))) + w.Write([]byte(fmt.Sprintf("couldn't query validators. Error: %s", err.Error()))) return - } - - // the query will return empty if there is no data for this record - if len(res) == 0 { + } else if len(kvs) == 0 { + // the query will return empty if there are no validators w.WriteHeader(http.StatusNoContent) return } - ubd, err := types.UnmarshalUBD(cdc, key, res) + validators, err := getValidators(kvs, cdc) if err != nil { w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(fmt.Sprintf("couldn't query unbonding-delegation. Error: %s", err.Error()))) + w.Write([]byte(fmt.Sprintf("Error: %s", err.Error()))) return } - output, err := cdc.MarshalJSON(ubd) + for _, validator := range validators { + // get all transactions from the delegator to val and append + validatorAccAddr = validator.Owner + + validator, statusCode, errMsg, errRes := getDelegatorValidator(cliCtx, cdc, delegatorAddr, validatorAccAddr) + if errRes != nil { + w.WriteHeader(statusCode) + w.Write([]byte(fmt.Sprintf("%s%s", errMsg, errRes.Error()))) + return + } else if statusCode == http.StatusNoContent { + continue + } + + bondedValidators = append(bondedValidators, validator) + } + output, err := cdc.MarshalJSON(bondedValidators) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) return } - w.Write(output) } } -// http request handler to query an redelegation -func redHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerFunc { +// HTTP request handler to get information from a currently bonded validator +func delegatorValidatorHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - // read parameters + var output []byte vars := mux.Vars(r) - bech32delegator := vars["delegator"] - bech32validatorSrc := vars["validator_src"] - bech32validatorDst := vars["validator_dst"] + bech32delegator := vars["delegatorAddr"] + bech32validator := vars["validatorAddr"] delegatorAddr, err := sdk.AccAddressFromBech32(bech32delegator) + validatorAccAddr, err := sdk.AccAddressFromBech32(bech32validator) if err != nil { w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) + w.Write([]byte(fmt.Sprintf("Error: %s", err.Error()))) return } - validatorSrcAddr, err := sdk.AccAddressFromBech32(bech32validatorSrc) + // Check if there if the delegator is bonded or redelegated to the validator + + validator, statusCode, errMsg, err := getDelegatorValidator(cliCtx, cdc, delegatorAddr, validatorAccAddr) if err != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) + w.WriteHeader(statusCode) + w.Write([]byte(fmt.Sprintf("%s%s", errMsg, err.Error()))) + return + } else if statusCode == http.StatusNoContent { + w.WriteHeader(statusCode) return } - - validatorDstAddr, err := sdk.AccAddressFromBech32(bech32validatorDst) - if err != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - - key := stake.GetREDKey(delegatorAddr, validatorSrcAddr, validatorDstAddr) - - res, err := ctx.QueryStore(key, storeName) - if err != nil { - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(fmt.Sprintf("couldn't query redelegation. Error: %s", err.Error()))) - return - } - - // the query will return empty if there is no data for this record - if len(res) == 0 { - w.WriteHeader(http.StatusNoContent) - return - } - - red, err := types.UnmarshalRED(cdc, key, res) - if err != nil { - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(fmt.Sprintf("couldn't query unbonding-delegation. Error: %s", err.Error()))) - return - } - - output, err := cdc.MarshalJSON(red) + output, err = cdc.MarshalJSON(validator) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) return } - w.Write(output) } } // TODO bech32 // http request handler to query list of validators -func validatorsHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerFunc { +func validatorsHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - kvs, err := ctx.QuerySubspace(cdc, stake.ValidatorsKey, storeName) + kvs, err := cliCtx.QuerySubspace(stake.ValidatorsKey, storeName) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("couldn't query validators. Error: %s", err.Error()))) @@ -232,25 +465,11 @@ func validatorsHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerF return } - // parse out the validators - validators := make([]types.BechValidator, len(kvs)) - for i, kv := range kvs { - - addr := kv.Key[1:] - validator, err := types.UnmarshalValidator(cdc, addr, kv.Value) - if err != nil { - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(fmt.Sprintf("couldn't query unbonding-delegation. Error: %s", err.Error()))) - return - } - - bech32Validator, err := validator.Bech32Validator() - if err != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - validators[i] = bech32Validator + validators, err := getValidators(kvs, cdc) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("Error: %s", err.Error()))) + return } output, err := cdc.MarshalJSON(validators) @@ -263,3 +482,47 @@ func validatorsHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerF w.Write(output) } } + +// HTTP request handler to query the validator information from a given validator address +func validatorHandlerFn(cliCtx context.CLIContext, cdc *wire.Codec) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + + var output []byte + // read parameters + vars := mux.Vars(r) + bech32validatorAddr := vars["addr"] + valAddress, err := sdk.AccAddressFromBech32(bech32validatorAddr) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(fmt.Sprintf("Error: %s", err.Error()))) + return + } + + kvs, err := cliCtx.QuerySubspace(stake.ValidatorsKey, storeName) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("Error: %s", err.Error()))) + return + } + + validator, err := getValidator(valAddress, kvs, cdc) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("couldn't query validator. Error: %s", err.Error()))) + return + } + + output, err = cdc.MarshalJSON(validator) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(fmt.Sprintf("Error: %s", err.Error()))) + return + } + + if output == nil { + w.WriteHeader(http.StatusNoContent) + return + } + w.Write(output) + } +} diff --git a/x/stake/client/rest/rest.go b/x/stake/client/rest/rest.go index 3528d45e4..7c2fdf905 100644 --- a/x/stake/client/rest/rest.go +++ b/x/stake/client/rest/rest.go @@ -1,15 +1,15 @@ package rest import ( - "github.com/cosmos/cosmos-sdk/crypto/keys" - "github.com/gorilla/mux" - "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/crypto/keys" "github.com/cosmos/cosmos-sdk/wire" + + "github.com/gorilla/mux" ) // RegisterRoutes registers staking-related REST handlers to a router -func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { - registerQueryRoutes(ctx, r, cdc) - registerTxRoutes(ctx, r, cdc, kb) +func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { + registerQueryRoutes(cliCtx, r, cdc) + registerTxRoutes(cliCtx, r, cdc, kb) } diff --git a/x/stake/client/rest/tx.go b/x/stake/client/rest/tx.go index a0f041654..fbefc7f21 100644 --- a/x/stake/client/rest/tx.go +++ b/x/stake/client/rest/tx.go @@ -6,21 +6,23 @@ import ( "io/ioutil" "net/http" - "github.com/cosmos/cosmos-sdk/crypto/keys" - "github.com/gorilla/mux" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/crypto/keys" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" + authcliCtx "github.com/cosmos/cosmos-sdk/x/auth/client/context" "github.com/cosmos/cosmos-sdk/x/stake" "github.com/cosmos/cosmos-sdk/x/stake/types" + + "github.com/gorilla/mux" + + ctypes "github.com/tendermint/tendermint/rpc/core/types" ) -func registerTxRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { +func registerTxRoutes(cliCtx context.CLIContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { r.HandleFunc( - "/stake/delegations", - editDelegationsRequestHandlerFn(cdc, kb, ctx), + "/stake/delegators/{delegatorAddr}/delegations", + delegationsRequestHandlerFn(cdc, kb, cliCtx), ).Methods("POST") } @@ -50,7 +52,7 @@ type msgCompleteUnbondingInput struct { ValidatorAddr string `json:"validator_addr"` // in bech32 } -// request body for edit delegations +// the request body for edit delegations type EditDelegationsBody struct { LocalAccountName string `json:"name"` Password string `json:"password"` @@ -67,15 +69,18 @@ type EditDelegationsBody struct { // nolint: gocyclo // TODO: Split this up into several smaller functions, and remove the above nolint -func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) http.HandlerFunc { +// TODO: use sdk.ValAddress instead of sdk.AccAddress for validators in messages +func delegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx context.CLIContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var m EditDelegationsBody + body, err := ioutil.ReadAll(r.Body) if err != nil { w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) return } + err = cdc.UnmarshalJSON(body, &m) if err != nil { w.WriteHeader(http.StatusBadRequest) @@ -105,22 +110,26 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte w.Write([]byte(fmt.Sprintf("Couldn't decode delegator. Error: %s", err.Error()))) return } + validatorAddr, err := sdk.AccAddressFromBech32(msg.ValidatorAddr) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("Couldn't decode validator. Error: %s", err.Error()))) return } + if !bytes.Equal(info.GetPubKey().Address(), delegatorAddr) { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte("Must use own delegator address")) return } + messages[i] = stake.MsgDelegate{ DelegatorAddr: delegatorAddr, ValidatorAddr: validatorAddr, Delegation: msg.Delegation, } + i++ } @@ -131,11 +140,13 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte w.Write([]byte(fmt.Sprintf("Couldn't decode delegator. Error: %s", err.Error()))) return } + if !bytes.Equal(info.GetPubKey().Address(), delegatorAddr) { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte("Must use own delegator address")) return } + validatorSrcAddr, err := sdk.AccAddressFromBech32(msg.ValidatorSrcAddr) if err != nil { w.WriteHeader(http.StatusInternalServerError) @@ -148,18 +159,21 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte w.Write([]byte(fmt.Sprintf("Couldn't decode validator. Error: %s", err.Error()))) return } + shares, err := sdk.NewRatFromDecimal(msg.SharesAmount, types.MaxBondDenominatorPrecision) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("Couldn't decode shares amount. Error: %s", err.Error()))) return } + messages[i] = stake.MsgBeginRedelegate{ DelegatorAddr: delegatorAddr, ValidatorSrcAddr: validatorSrcAddr, ValidatorDstAddr: validatorDstAddr, SharesAmount: shares, } + i++ } @@ -170,6 +184,7 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte w.Write([]byte(fmt.Sprintf("Couldn't decode delegator. Error: %s", err.Error()))) return } + validatorSrcAddr, err := sdk.AccAddressFromBech32(msg.ValidatorSrcAddr) if err != nil { w.WriteHeader(http.StatusInternalServerError) @@ -182,16 +197,19 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte w.Write([]byte(fmt.Sprintf("Couldn't decode validator. Error: %s", err.Error()))) return } + if !bytes.Equal(info.GetPubKey().Address(), delegatorAddr) { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte("Must use own delegator address")) return } + messages[i] = stake.MsgCompleteRedelegate{ DelegatorAddr: delegatorAddr, ValidatorSrcAddr: validatorSrcAddr, ValidatorDstAddr: validatorDstAddr, } + i++ } @@ -202,28 +220,33 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte w.Write([]byte(fmt.Sprintf("Couldn't decode delegator. Error: %s", err.Error()))) return } + if !bytes.Equal(info.GetPubKey().Address(), delegatorAddr) { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte("Must use own delegator address")) return } + validatorAddr, err := sdk.AccAddressFromBech32(msg.ValidatorAddr) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("Couldn't decode validator. Error: %s", err.Error()))) return } + shares, err := sdk.NewRatFromDecimal(msg.SharesAmount, types.MaxBondDenominatorPrecision) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("Couldn't decode shares amount. Error: %s", err.Error()))) return } + messages[i] = stake.MsgBeginUnbonding{ DelegatorAddr: delegatorAddr, ValidatorAddr: validatorAddr, SharesAmount: shares, } + i++ } @@ -234,36 +257,44 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte w.Write([]byte(fmt.Sprintf("Couldn't decode delegator. Error: %s", err.Error()))) return } + validatorAddr, err := sdk.AccAddressFromBech32(msg.ValidatorAddr) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(fmt.Sprintf("Couldn't decode validator. Error: %s", err.Error()))) return } + if !bytes.Equal(info.GetPubKey().Address(), delegatorAddr) { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte("Must use own delegator address")) return } + messages[i] = stake.MsgCompleteUnbonding{ DelegatorAddr: delegatorAddr, ValidatorAddr: validatorAddr, } + i++ } - // add gas to context - ctx = ctx.WithGas(m.Gas) + txCtx := authcliCtx.TxContext{ + Codec: cdc, + ChainID: m.ChainID, + Gas: m.Gas, + } // sign messages signedTxs := make([][]byte, len(messages[:])) for i, msg := range messages { // increment sequence for each message - ctx = ctx.WithAccountNumber(m.AccountNumber) - ctx = ctx.WithSequence(m.Sequence) + txCtx = txCtx.WithAccountNumber(m.AccountNumber) + txCtx = txCtx.WithSequence(m.Sequence) + m.Sequence++ - txBytes, err := ctx.SignAndBuild(m.LocalAccountName, m.Password, []sdk.Msg{msg}, cdc) + txBytes, err := txCtx.BuildAndSign(m.LocalAccountName, m.Password, []sdk.Msg{msg}) if err != nil { w.WriteHeader(http.StatusUnauthorized) w.Write([]byte(err.Error())) @@ -278,12 +309,13 @@ func editDelegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx conte // should we have a sdk.MultiMsg type to make sending atomic? results := make([]*ctypes.ResultBroadcastTxCommit, len(signedTxs[:])) for i, txBytes := range signedTxs { - res, err := ctx.BroadcastTx(txBytes) + res, err := cliCtx.BroadcastTx(txBytes) if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) return } + results[i] = res } diff --git a/x/stake/client/rest/utils.go b/x/stake/client/rest/utils.go new file mode 100644 index 000000000..86e714662 --- /dev/null +++ b/x/stake/client/rest/utils.go @@ -0,0 +1,228 @@ +package rest + +import ( + "bytes" + "fmt" + "net/http" + + "github.com/cosmos/cosmos-sdk/client/context" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/wire" + "github.com/cosmos/cosmos-sdk/x/stake" + "github.com/cosmos/cosmos-sdk/x/stake/tags" + "github.com/cosmos/cosmos-sdk/x/stake/types" + "github.com/pkg/errors" + rpcclient "github.com/tendermint/tendermint/rpc/client" +) + +// contains checks if the a given query contains one of the tx types +func contains(stringSlice []string, txType string) bool { + for _, word := range stringSlice { + if word == txType { + return true + } + } + return false +} + +func getDelegatorValidator(cliCtx context.CLIContext, cdc *wire.Codec, delegatorAddr sdk.AccAddress, validatorAccAddr sdk.AccAddress) ( + validator types.BechValidator, httpStatusCode int, errMsg string, err error) { + + // check if the delegator is bonded or redelegated to the validator + keyDel := stake.GetDelegationKey(delegatorAddr, validatorAccAddr) + + res, err := cliCtx.QueryStore(keyDel, storeName) + if err != nil { + return types.BechValidator{}, http.StatusInternalServerError, "couldn't query delegation. Error: ", err + } + + if len(res) == 0 { + return types.BechValidator{}, http.StatusNoContent, "", nil + } + + kvs, err := cliCtx.QuerySubspace(stake.ValidatorsKey, storeName) + if err != nil { + return types.BechValidator{}, http.StatusInternalServerError, "Error: ", err + } + if len(kvs) == 0 { + // the query will return empty if there are no delegations + return types.BechValidator{}, http.StatusNoContent, "", nil + } + + validator, errVal := getValidatorFromAccAdrr(validatorAccAddr, kvs, cdc) + if errVal != nil { + return types.BechValidator{}, http.StatusInternalServerError, "Couldn't get info from validator. Error: ", errVal + } + return validator, http.StatusOK, "", nil +} + +func getDelegatorDelegations(cliCtx context.CLIContext, cdc *wire.Codec, delegatorAddr sdk.AccAddress, validatorAddr sdk.AccAddress) ( + outputDelegation DelegationWithoutRat, httpStatusCode int, errMsg string, err error) { + delegationKey := stake.GetDelegationKey(delegatorAddr, validatorAddr) + marshalledDelegation, err := cliCtx.QueryStore(delegationKey, storeName) + if err != nil { + return DelegationWithoutRat{}, http.StatusInternalServerError, "couldn't query delegation. Error: ", err + } + + // the query will return empty if there is no data for this record + if len(marshalledDelegation) == 0 { + return DelegationWithoutRat{}, http.StatusNoContent, "", nil + } + + delegation, err := types.UnmarshalDelegation(cdc, delegationKey, marshalledDelegation) + if err != nil { + return DelegationWithoutRat{}, http.StatusInternalServerError, "couldn't unmarshall delegation. Error: ", err + } + + outputDelegation = DelegationWithoutRat{ + DelegatorAddr: delegation.DelegatorAddr, + ValidatorAddr: delegation.ValidatorAddr, + Height: delegation.Height, + Shares: delegation.Shares.FloatString(), + } + + return outputDelegation, http.StatusOK, "", nil +} + +func getDelegatorUndelegations(cliCtx context.CLIContext, cdc *wire.Codec, delegatorAddr sdk.AccAddress, validatorAddr sdk.AccAddress) ( + unbonds types.UnbondingDelegation, httpStatusCode int, errMsg string, err error) { + undelegationKey := stake.GetUBDKey(delegatorAddr, validatorAddr) + marshalledUnbondingDelegation, err := cliCtx.QueryStore(undelegationKey, storeName) + if err != nil { + return types.UnbondingDelegation{}, http.StatusInternalServerError, "couldn't query unbonding-delegation. Error: ", err + } + + // the query will return empty if there is no data for this record + if len(marshalledUnbondingDelegation) == 0 { + return types.UnbondingDelegation{}, http.StatusNoContent, "", nil + } + + unbondingDelegation, err := types.UnmarshalUBD(cdc, undelegationKey, marshalledUnbondingDelegation) + if err != nil { + return types.UnbondingDelegation{}, http.StatusInternalServerError, "couldn't unmarshall unbonding-delegation. Error: ", err + } + return unbondingDelegation, http.StatusOK, "", nil +} + +func getDelegatorRedelegations(cliCtx context.CLIContext, cdc *wire.Codec, delegatorAddr sdk.AccAddress, validatorAddr sdk.AccAddress) ( + regelegations types.Redelegation, httpStatusCode int, errMsg string, err error) { + + keyRedelegateTo := stake.GetREDsByDelToValDstIndexKey(delegatorAddr, validatorAddr) + marshalledRedelegations, err := cliCtx.QueryStore(keyRedelegateTo, storeName) + if err != nil { + return types.Redelegation{}, http.StatusInternalServerError, "couldn't query redelegation. Error: ", err + } + + if len(marshalledRedelegations) == 0 { + return types.Redelegation{}, http.StatusNoContent, "", nil + } + + redelegations, err := types.UnmarshalRED(cdc, keyRedelegateTo, marshalledRedelegations) + if err != nil { + return types.Redelegation{}, http.StatusInternalServerError, "couldn't unmarshall redelegations. Error: ", err + } + + return redelegations, http.StatusOK, "", nil +} + +// queries staking txs +func queryTxs(node rpcclient.Client, cdc *wire.Codec, tag string, delegatorAddr string) ([]tx.Info, error) { + page := 0 + perPage := 100 + prove := false + query := fmt.Sprintf("%s='%s' AND %s='%s'", tags.Action, tag, tags.Delegator, delegatorAddr) + res, err := node.TxSearch(query, prove, page, perPage) + if err != nil { + return nil, err + } + + return tx.FormatTxResults(cdc, res.Txs) +} + +// gets all validators +func getValidators(validatorKVs []sdk.KVPair, cdc *wire.Codec) ([]types.BechValidator, error) { + validators := make([]types.BechValidator, len(validatorKVs)) + for i, kv := range validatorKVs { + + addr := kv.Key[1:] + validator, err := types.UnmarshalValidator(cdc, addr, kv.Value) + if err != nil { + return nil, err + } + + bech32Validator, err := validator.Bech32Validator() + if err != nil { + return nil, err + } + validators[i] = bech32Validator + } + return validators, nil +} + +// gets a validator given a ValAddress +func getValidator(address sdk.AccAddress, validatorKVs []sdk.KVPair, cdc *wire.Codec) (stake.BechValidator, error) { + // parse out the validators + for _, kv := range validatorKVs { + addr := kv.Key[1:] + validator, err := types.UnmarshalValidator(cdc, addr, kv.Value) + if err != nil { + return stake.BechValidator{}, err + } + + ownerAddress := validator.PubKey.Address() + if bytes.Equal(ownerAddress.Bytes(), address.Bytes()) { + bech32Validator, err := validator.Bech32Validator() + if err != nil { + return stake.BechValidator{}, err + } + + return bech32Validator, nil + } + } + return stake.BechValidator{}, errors.Errorf("Couldn't find validator") +} + +// gets a validator given an AccAddress +func getValidatorFromAccAdrr(address sdk.AccAddress, validatorKVs []sdk.KVPair, cdc *wire.Codec) (stake.BechValidator, error) { + // parse out the validators + for _, kv := range validatorKVs { + addr := kv.Key[1:] + validator, err := types.UnmarshalValidator(cdc, addr, kv.Value) + if err != nil { + return stake.BechValidator{}, err + } + + ownerAddress := validator.PubKey.Address() + if bytes.Equal(ownerAddress.Bytes(), address.Bytes()) { + bech32Validator, err := validator.Bech32Validator() + if err != nil { + return stake.BechValidator{}, err + } + + return bech32Validator, nil + } + } + return stake.BechValidator{}, errors.Errorf("Couldn't find validator") +} + +// gets all Bech32 validators from a key +func getBech32Validators(storeName string, cliCtx context.CLIContext, cdc *wire.Codec) ( + validators []types.BechValidator, httpStatusCode int, errMsg string, err error) { + // Get all validators using key + kvs, err := cliCtx.QuerySubspace(stake.ValidatorsKey, storeName) + if err != nil { + return nil, http.StatusInternalServerError, "couldn't query validators. Error: ", err + } + + // the query will return empty if there are no validators + if len(kvs) == 0 { + return nil, http.StatusNoContent, "", nil + } + + validators, err = getValidators(kvs, cdc) + if err != nil { + return nil, http.StatusInternalServerError, "Error: ", err + } + return validators, http.StatusOK, "", nil +} diff --git a/x/stake/genesis.go b/x/stake/genesis.go index b4ed80e51..7a004bccd 100644 --- a/x/stake/genesis.go +++ b/x/stake/genesis.go @@ -1,10 +1,12 @@ package stake import ( + abci "github.com/tendermint/tendermint/abci/types" + tmtypes "github.com/tendermint/tendermint/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/stake/types" "github.com/pkg/errors" - tmtypes "github.com/tendermint/tendermint/types" ) // InitGenesis sets the pool and parameters for the provided keeper and @@ -12,25 +14,25 @@ import ( // validator in the keeper along with manually setting the indexes. In // addition, it also sets any delegations found in data. Finally, it updates // the bonded validators. -func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) error { +// Returns final validator set after applying all declaration and delegations +func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) (res []abci.Validator, err error) { keeper.SetPool(ctx, data.Pool) keeper.SetNewParams(ctx, data.Params) keeper.InitIntraTxCounter(ctx) for i, validator := range data.Validators { + validator.BondIntraTxCounter = int16(i) // set the intra-tx counter to the order the validators are presented keeper.SetValidator(ctx, validator) if validator.Tokens.IsZero() { - return errors.Errorf("genesis validator cannot have zero pool shares, validator: %v", validator) + return res, errors.Errorf("genesis validator cannot have zero pool shares, validator: %v", validator) } if validator.DelegatorShares.IsZero() { - return errors.Errorf("genesis validator cannot have zero delegator shares, validator: %v", validator) + return res, errors.Errorf("genesis validator cannot have zero delegator shares, validator: %v", validator) } // Manually set indexes for the first time keeper.SetValidatorByPubKeyIndex(ctx, validator) - - validator.BondIntraTxCounter = int16(i) // set the intra-tx counter to the order the validators are presented keeper.SetValidatorByPowerIndex(ctx, validator, data.Pool) if validator.Status == sdk.Bonded { @@ -43,7 +45,13 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) error } keeper.UpdateBondedValidatorsFull(ctx) - return nil + + vals := keeper.GetValidatorsBonded(ctx) + res = make([]abci.Validator, len(vals)) + for i, val := range vals { + res[i] = sdk.ABCIValidator(val) + } + return } // WriteGenesis returns a GenesisState for a given context and keeper. The diff --git a/x/stake/genesis_test.go b/x/stake/genesis_test.go index e27c7fed2..2febd2c6a 100644 --- a/x/stake/genesis_test.go +++ b/x/stake/genesis_test.go @@ -1,10 +1,13 @@ package stake import ( + "fmt" "testing" "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" + sdk "github.com/cosmos/cosmos-sdk/types" keep "github.com/cosmos/cosmos-sdk/x/stake/keeper" "github.com/cosmos/cosmos-sdk/x/stake/types" @@ -14,7 +17,7 @@ func TestInitGenesis(t *testing.T) { ctx, _, keeper := keep.CreateTestInput(t, false, 1000) pool := keeper.GetPool(ctx) - pool.LooseTokens = sdk.NewRat(2) + pool.BondedTokens = sdk.NewRat(2) params := keeper.GetParams(ctx) var delegations []Delegation @@ -24,25 +27,75 @@ func TestInitGenesis(t *testing.T) { NewValidator(keep.Addrs[1], keep.PKs[1], Description{Moniker: "bloop"}), } genesisState := types.NewGenesisState(pool, params, validators, delegations) - err := InitGenesis(ctx, keeper, genesisState) + _, err := InitGenesis(ctx, keeper, genesisState) require.Error(t, err) // initialize the validators + validators[0].Status = sdk.Bonded validators[0].Tokens = sdk.OneRat() validators[0].DelegatorShares = sdk.OneRat() + validators[1].Status = sdk.Bonded validators[1].Tokens = sdk.OneRat() validators[1].DelegatorShares = sdk.OneRat() genesisState = types.NewGenesisState(pool, params, validators, delegations) - err = InitGenesis(ctx, keeper, genesisState) + vals, err := InitGenesis(ctx, keeper, genesisState) require.NoError(t, err) - // now make sure the validators are bonded + // now make sure the validators are bonded and intra-tx counters are correct resVal, found := keeper.GetValidator(ctx, keep.Addrs[0]) require.True(t, found) require.Equal(t, sdk.Bonded, resVal.Status) + require.Equal(t, int16(0), resVal.BondIntraTxCounter) resVal, found = keeper.GetValidator(ctx, keep.Addrs[1]) require.True(t, found) require.Equal(t, sdk.Bonded, resVal.Status) + require.Equal(t, int16(1), resVal.BondIntraTxCounter) + + abcivals := make([]abci.Validator, len(vals)) + for i, val := range validators { + abcivals[i] = sdk.ABCIValidator(val) + } + + require.Equal(t, abcivals, vals) +} + +func TestInitGenesisLargeValidatorSet(t *testing.T) { + size := 200 + require.True(t, size > 100) + + ctx, _, keeper := keep.CreateTestInput(t, false, 1000) + + // Assigning 2 to the first 100 vals, 1 to the rest + pool := keeper.GetPool(ctx) + pool.BondedTokens = sdk.NewRat(int64(200 + (size - 100))) + + params := keeper.GetParams(ctx) + delegations := []Delegation{} + validators := make([]Validator, size) + + for i := range validators { + validators[i] = NewValidator(keep.Addrs[i], keep.PKs[i], Description{Moniker: fmt.Sprintf("#%d", i)}) + + validators[i].Status = sdk.Bonded + if i < 100 { + validators[i].Tokens = sdk.NewRat(2) + validators[i].DelegatorShares = sdk.NewRat(2) + } else { + validators[i].Tokens = sdk.OneRat() + validators[i].DelegatorShares = sdk.OneRat() + } + } + + genesisState := types.NewGenesisState(pool, params, validators, delegations) + vals, err := InitGenesis(ctx, keeper, genesisState) + require.NoError(t, err) + + abcivals := make([]abci.Validator, 100) + for i, val := range validators[:100] { + abcivals[i] = sdk.ABCIValidator(val) + } + + require.Equal(t, abcivals, vals) } diff --git a/x/stake/handler.go b/x/stake/handler.go index 14fb4f7bf..8f7475de9 100644 --- a/x/stake/handler.go +++ b/x/stake/handler.go @@ -1,6 +1,8 @@ package stake import ( + "time" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/stake/keeper" "github.com/cosmos/cosmos-sdk/x/stake/tags" @@ -35,18 +37,16 @@ func NewHandler(k keeper.Keeper) sdk.Handler { // Called every block, process inflation, update validator set func EndBlocker(ctx sdk.Context, k keeper.Keeper) (ValidatorUpdates []abci.Validator) { pool := k.GetPool(ctx) - params := k.GetParams(ctx) - // Process types.Validator Provisions + // Process provision inflation blockTime := ctx.BlockHeader().Time - if blockTime-pool.InflationLastTime >= 3600 { + if blockTime.Sub(pool.InflationLastTime) >= time.Hour { + params := k.GetParams(ctx) pool.InflationLastTime = blockTime pool = pool.ProcessProvisions(params) + k.SetPool(ctx, pool) } - // save the params - k.SetPool(ctx, pool) - // reset the intra-transaction counter k.SetIntraTxCounter(ctx, 0) @@ -113,7 +113,9 @@ func handleMsgEditValidator(ctx sdk.Context, msg types.MsgEditValidator, k keepe } validator.Description = description - k.UpdateValidator(ctx, validator) + // We don't need to run through all the power update logic within k.UpdateValidator + // We just need to override the entry in state, since only the description has changed. + k.SetValidator(ctx, validator) tags := sdk.NewTags( tags.Action, tags.ActionEditValidator, tags.DstValidator, []byte(msg.ValidatorAddr.String()), diff --git a/x/stake/handler_test.go b/x/stake/handler_test.go index f183b279a..edad64f44 100644 --- a/x/stake/handler_test.go +++ b/x/stake/handler_test.go @@ -2,6 +2,7 @@ package stake import ( "testing" + "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -500,7 +501,7 @@ func TestUnbondingPeriod(t *testing.T) { // set the unbonding time params := keeper.GetParams(ctx) - params.UnbondingTime = 7 + params.UnbondingTime = 7 * time.Second keeper.SetParams(ctx, params) // create the validator @@ -516,19 +517,19 @@ func TestUnbondingPeriod(t *testing.T) { // cannot complete unbonding at same time msgCompleteUnbonding := NewMsgCompleteUnbonding(validatorAddr, validatorAddr) got = handleMsgCompleteUnbonding(ctx, msgCompleteUnbonding, keeper) - require.True(t, !got.IsOK(), "expected no error") + require.True(t, !got.IsOK(), "expected an error") // cannot complete unbonding at time 6 seconds later origHeader := ctx.BlockHeader() headerTime6 := origHeader - headerTime6.Time += 6 + headerTime6.Time = headerTime6.Time.Add(time.Second * 6) ctx = ctx.WithBlockHeader(headerTime6) got = handleMsgCompleteUnbonding(ctx, msgCompleteUnbonding, keeper) - require.True(t, !got.IsOK(), "expected no error") + require.True(t, !got.IsOK(), "expected an error") // can complete unbonding at time 7 seconds later headerTime7 := origHeader - headerTime7.Time += 7 + headerTime7.Time = headerTime7.Time.Add(time.Second * 7) ctx = ctx.WithBlockHeader(headerTime7) got = handleMsgCompleteUnbonding(ctx, msgCompleteUnbonding, keeper) require.True(t, got.IsOK(), "expected no error") @@ -541,7 +542,7 @@ func TestRedelegationPeriod(t *testing.T) { // set the unbonding time params := keeper.GetParams(ctx) - params.UnbondingTime = 7 + params.UnbondingTime = 7 * time.Second keeper.SetParams(ctx, params) // create the validators @@ -580,14 +581,14 @@ func TestRedelegationPeriod(t *testing.T) { // cannot complete redelegation at time 6 seconds later origHeader := ctx.BlockHeader() headerTime6 := origHeader - headerTime6.Time += 6 + headerTime6.Time = headerTime6.Time.Add(time.Second * 6) ctx = ctx.WithBlockHeader(headerTime6) got = handleMsgCompleteRedelegate(ctx, msgCompleteRedelegate, keeper) require.True(t, !got.IsOK(), "expected an error") // can complete redelegation at time 7 seconds later headerTime7 := origHeader - headerTime7.Time += 7 + headerTime7.Time = headerTime7.Time.Add(time.Second * 7) ctx = ctx.WithBlockHeader(headerTime7) got = handleMsgCompleteRedelegate(ctx, msgCompleteRedelegate, keeper) require.True(t, got.IsOK(), "expected no error") diff --git a/x/stake/keeper/delegation.go b/x/stake/keeper/delegation.go index e7168109a..484e85ad5 100644 --- a/x/stake/keeper/delegation.go +++ b/x/stake/keeper/delegation.go @@ -110,6 +110,22 @@ func (k Keeper) GetUnbondingDelegationsFromValidator(ctx sdk.Context, valAddr sd return ubds } +// iterate through all of the unbonding delegations +func (k Keeper) IterateUnbondingDelegations(ctx sdk.Context, fn func(index int64, ubd types.UnbondingDelegation) (stop bool)) { + store := ctx.KVStore(k.storeKey) + iterator := sdk.KVStorePrefixIterator(store, UnbondingDelegationKey) + i := int64(0) + for ; iterator.Valid(); iterator.Next() { + ubd := types.MustUnmarshalUBD(k.cdc, iterator.Key(), iterator.Value()) + stop := fn(i, ubd) + if stop { + break + } + i++ + } + iterator.Close() +} + // set the unbonding delegation and associated index func (k Keeper) SetUnbondingDelegation(ctx sdk.Context, ubd types.UnbondingDelegation) { store := ctx.KVStore(k.storeKey) @@ -298,6 +314,12 @@ func (k Keeper) unbond(ctx sdk.Context, delegatorAddr, validatorAddr sdk.AccAddr // complete unbonding an unbonding record func (k Keeper) BeginUnbonding(ctx sdk.Context, delegatorAddr, validatorAddr sdk.AccAddress, sharesAmount sdk.Rat) sdk.Error { + // TODO quick fix, instead we should use an index, see https://github.com/cosmos/cosmos-sdk/issues/1402 + _, found := k.GetUnbondingDelegation(ctx, delegatorAddr, validatorAddr) + if found { + return types.ErrExistingUnbondingDelegation(k.Codespace()) + } + returnAmount, err := k.unbond(ctx, delegatorAddr, validatorAddr, sharesAmount) if err != nil { return err @@ -305,7 +327,7 @@ func (k Keeper) BeginUnbonding(ctx sdk.Context, delegatorAddr, validatorAddr sdk // create the unbonding delegation params := k.GetParams(ctx) - minTime := ctx.BlockHeader().Time + params.UnbondingTime + minTime := ctx.BlockHeader().Time.Add(params.UnbondingTime) balance := sdk.Coin{params.BondDenom, returnAmount.RoundInt()} ubd := types.UnbondingDelegation{ @@ -329,7 +351,7 @@ func (k Keeper) CompleteUnbonding(ctx sdk.Context, delegatorAddr, validatorAddr // ensure that enough time has passed ctxTime := ctx.BlockHeader().Time - if ubd.MinTime > ctxTime { + if ubd.MinTime.After(ctxTime) { return types.ErrNotMature(k.Codespace(), "unbonding", "unit-time", ubd.MinTime, ctxTime) } @@ -367,7 +389,7 @@ func (k Keeper) BeginRedelegation(ctx sdk.Context, delegatorAddr, validatorSrcAd } // create the unbonding delegation - minTime := ctx.BlockHeader().Time + params.UnbondingTime + minTime := ctx.BlockHeader().Time.Add(params.UnbondingTime) red := types.Redelegation{ DelegatorAddr: delegatorAddr, @@ -393,7 +415,7 @@ func (k Keeper) CompleteRedelegation(ctx sdk.Context, delegatorAddr, validatorSr // ensure that enough time has passed ctxTime := ctx.BlockHeader().Time - if red.MinTime > ctxTime { + if red.MinTime.After(ctxTime) { return types.ErrNotMature(k.Codespace(), "redelegation", "unit-time", red.MinTime, ctxTime) } diff --git a/x/stake/keeper/delegation_test.go b/x/stake/keeper/delegation_test.go index 01c764d82..5d512f0cf 100644 --- a/x/stake/keeper/delegation_test.go +++ b/x/stake/keeper/delegation_test.go @@ -2,6 +2,7 @@ package keeper import ( "testing" + "time" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/stake/types" @@ -115,8 +116,8 @@ func TestUnbondingDelegation(t *testing.T) { DelegatorAddr: addrDels[0], ValidatorAddr: addrVals[0], CreationHeight: 0, - MinTime: 0, - Balance: sdk.NewCoin("steak", 5), + MinTime: time.Unix(0, 0), + Balance: sdk.NewInt64Coin("steak", 5), } // set and retrieve a record @@ -126,7 +127,7 @@ func TestUnbondingDelegation(t *testing.T) { require.True(t, ubd.Equal(resBond)) // modify a records, save, and retrieve - ubd.Balance = sdk.NewCoin("steak", 21) + ubd.Balance = sdk.NewInt64Coin("steak", 21) keeper.SetUnbondingDelegation(ctx, ubd) resBond, found = keeper.GetUnbondingDelegation(ctx, addrDels[0], addrVals[0]) require.True(t, found) @@ -188,7 +189,7 @@ func TestGetRedelegationsFromValidator(t *testing.T) { ValidatorSrcAddr: addrVals[0], ValidatorDstAddr: addrVals[1], CreationHeight: 0, - MinTime: 0, + MinTime: time.Unix(0, 0), SharesSrc: sdk.NewRat(5), SharesDst: sdk.NewRat(5), } @@ -218,7 +219,7 @@ func TestRedelegation(t *testing.T) { ValidatorSrcAddr: addrVals[0], ValidatorDstAddr: addrVals[1], CreationHeight: 0, - MinTime: 0, + MinTime: time.Unix(0, 0), SharesSrc: sdk.NewRat(5), SharesDst: sdk.NewRat(5), } diff --git a/x/stake/keeper/key.go b/x/stake/keeper/key.go index e373ede18..502ec2654 100644 --- a/x/stake/keeper/key.go +++ b/x/stake/keeper/key.go @@ -34,19 +34,19 @@ var ( const maxDigitsForAccount = 12 // ~220,000,000 atoms created at launch -// get the key for the validator with address. +// gets the key for the validator with address // VALUE: stake/types.Validator func GetValidatorKey(ownerAddr sdk.AccAddress) []byte { return append(ValidatorsKey, ownerAddr.Bytes()...) } -// get the key for the validator with pubkey. +// gets the key for the validator with pubkey // VALUE: validator owner address ([]byte) func GetValidatorByPubKeyIndexKey(pubkey crypto.PubKey) []byte { return append(ValidatorsByPubKeyIndexKey, pubkey.Bytes()...) } -// get the key for the current validator group +// gets the key for the current validator group // VALUE: none (key rearrangement with GetValKeyFromValBondedIndexKey) func GetValidatorsBondedIndexKey(ownerAddr sdk.AccAddress) []byte { return append(ValidatorsBondedIndexKey, ownerAddr.Bytes()...) @@ -57,8 +57,9 @@ func GetAddressFromValBondedIndexKey(IndexKey []byte) []byte { return IndexKey[1:] // remove prefix bytes } -// get the validator by power index. power index is the key used in the power-store, -// and represents the relative power ranking of the validator. +// get the validator by power index. +// Power index is the key used in the power-store, and represents the relative +// power ranking of the validator. // VALUE: validator owner address ([]byte) func GetValidatorsByPowerIndexKey(validator types.Validator, pool types.Pool) []byte { // NOTE the address doesn't need to be stored because counter bytes must always be different @@ -93,29 +94,29 @@ func getValidatorPowerRank(validator types.Validator, pool types.Pool) []byte { counterBytes...) } -// get the key for the accumulated update validators. +// get the key for the accumulated update validators // VALUE: abci.Validator // note records using these keys should never persist between blocks func GetTendermintUpdatesKey(ownerAddr sdk.AccAddress) []byte { return append(TendermintUpdatesKey, ownerAddr.Bytes()...) } -//________________________________________________________________________________ +//______________________________________________________________________________ -// get the key for delegator bond with validator. +// gets the key for delegator bond with validator // VALUE: stake/types.Delegation func GetDelegationKey(delegatorAddr, validatorAddr sdk.AccAddress) []byte { return append(GetDelegationsKey(delegatorAddr), validatorAddr.Bytes()...) } -// get the prefix for a delegator for all validators +// gets the prefix for a delegator for all validators func GetDelegationsKey(delegatorAddr sdk.AccAddress) []byte { return append(DelegationKey, delegatorAddr.Bytes()...) } -//________________________________________________________________________________ +//______________________________________________________________________________ -// get the key for an unbonding delegation by delegator and validator addr. +// gets the key for an unbonding delegation by delegator and validator addr // VALUE: stake/types.UnbondingDelegation func GetUBDKey(delegatorAddr, validatorAddr sdk.AccAddress) []byte { return append( @@ -123,13 +124,13 @@ func GetUBDKey(delegatorAddr, validatorAddr sdk.AccAddress) []byte { validatorAddr.Bytes()...) } -// get the index-key for an unbonding delegation, stored by validator-index +// gets the index-key for an unbonding delegation, stored by validator-index // VALUE: none (key rearrangement used) func GetUBDByValIndexKey(delegatorAddr, validatorAddr sdk.AccAddress) []byte { return append(GetUBDsByValIndexKey(validatorAddr), delegatorAddr.Bytes()...) } -// rearrange the ValIndexKey to get the UBDKey +// rearranges the ValIndexKey to get the UBDKey func GetUBDKeyFromValIndexKey(IndexKey []byte) []byte { addrs := IndexKey[1:] // remove prefix bytes if len(addrs) != 2*sdk.AddrLen { @@ -142,19 +143,19 @@ func GetUBDKeyFromValIndexKey(IndexKey []byte) []byte { //______________ -// get the prefix for all unbonding delegations from a delegator +// gets the prefix for all unbonding delegations from a delegator func GetUBDsKey(delegatorAddr sdk.AccAddress) []byte { return append(UnbondingDelegationKey, delegatorAddr.Bytes()...) } -// get the prefix keyspace for the indexes of unbonding delegations for a validator +// gets the prefix keyspace for the indexes of unbonding delegations for a validator func GetUBDsByValIndexKey(validatorAddr sdk.AccAddress) []byte { return append(UnbondingDelegationByValIndexKey, validatorAddr.Bytes()...) } //________________________________________________________________________________ -// get the key for a redelegation +// gets the key for a redelegation // VALUE: stake/types.RedelegationKey func GetREDKey(delegatorAddr, validatorSrcAddr, validatorDstAddr sdk.AccAddress) []byte { return append(append( @@ -163,7 +164,7 @@ func GetREDKey(delegatorAddr, validatorSrcAddr, validatorDstAddr sdk.AccAddress) validatorDstAddr.Bytes()...) } -// get the index-key for a redelegation, stored by source-validator-index +// gets the index-key for a redelegation, stored by source-validator-index // VALUE: none (key rearrangement used) func GetREDByValSrcIndexKey(delegatorAddr, validatorSrcAddr, validatorDstAddr sdk.AccAddress) []byte { return append(append( @@ -172,7 +173,7 @@ func GetREDByValSrcIndexKey(delegatorAddr, validatorSrcAddr, validatorDstAddr sd validatorDstAddr.Bytes()...) } -// get the index-key for a redelegation, stored by destination-validator-index +// gets the index-key for a redelegation, stored by destination-validator-index // VALUE: none (key rearrangement used) func GetREDByValDstIndexKey(delegatorAddr, validatorSrcAddr, validatorDstAddr sdk.AccAddress) []byte { return append(append( @@ -181,7 +182,7 @@ func GetREDByValDstIndexKey(delegatorAddr, validatorSrcAddr, validatorDstAddr sd validatorSrcAddr.Bytes()...) } -// rearrange the ValSrcIndexKey to get the REDKey +// rearranges the ValSrcIndexKey to get the REDKey func GetREDKeyFromValSrcIndexKey(IndexKey []byte) []byte { addrs := IndexKey[1:] // remove prefix bytes if len(addrs) != 3*sdk.AddrLen { @@ -194,7 +195,7 @@ func GetREDKeyFromValSrcIndexKey(IndexKey []byte) []byte { return GetREDKey(delAddr, valSrcAddr, valDstAddr) } -// rearrange the ValDstIndexKey to get the REDKey +// rearranges the ValDstIndexKey to get the REDKey func GetREDKeyFromValDstIndexKey(IndexKey []byte) []byte { addrs := IndexKey[1:] // remove prefix bytes if len(addrs) != 3*sdk.AddrLen { @@ -208,22 +209,22 @@ func GetREDKeyFromValDstIndexKey(IndexKey []byte) []byte { //______________ -// get the prefix keyspace for redelegations from a delegator +// gets the prefix keyspace for redelegations from a delegator func GetREDsKey(delegatorAddr sdk.AccAddress) []byte { return append(RedelegationKey, delegatorAddr.Bytes()...) } -// get the prefix keyspace for all redelegations redelegating away from a source validator +// gets the prefix keyspace for all redelegations redelegating away from a source validator func GetREDsFromValSrcIndexKey(validatorSrcAddr sdk.AccAddress) []byte { return append(RedelegationByValSrcIndexKey, validatorSrcAddr.Bytes()...) } -// get the prefix keyspace for all redelegations redelegating towards a destination validator +// gets the prefix keyspace for all redelegations redelegating towards a destination validator func GetREDsToValDstIndexKey(validatorDstAddr sdk.AccAddress) []byte { return append(RedelegationByValDstIndexKey, validatorDstAddr.Bytes()...) } -// get the prefix keyspace for all redelegations redelegating towards a destination validator +// gets the prefix keyspace for all redelegations redelegating towards a destination validator // from a particular delegator func GetREDsByDelToValDstIndexKey(delegatorAddr, validatorDstAddr sdk.AccAddress) []byte { return append( diff --git a/x/stake/keeper/slash.go b/x/stake/keeper/slash.go index fb9297e9c..a741b5a85 100644 --- a/x/stake/keeper/slash.go +++ b/x/stake/keeper/slash.go @@ -159,7 +159,7 @@ func (k Keeper) slashUnbondingDelegation(ctx sdk.Context, unbondingDelegation ty return sdk.ZeroRat() } - if unbondingDelegation.MinTime < now { + if unbondingDelegation.MinTime.Before(now) { // Unbonding delegation no longer eligible for slashing, skip it // TODO Settle and delete it automatically? return sdk.ZeroRat() @@ -203,7 +203,7 @@ func (k Keeper) slashRedelegation(ctx sdk.Context, validator types.Validator, re return sdk.ZeroRat() } - if redelegation.MinTime < now { + if redelegation.MinTime.Before(now) { // Redelegation no longer eligible for slashing, skip it // TODO Delete it automatically? return sdk.ZeroRat() diff --git a/x/stake/keeper/slash_test.go b/x/stake/keeper/slash_test.go index a9f5e888c..878c44d1e 100644 --- a/x/stake/keeper/slash_test.go +++ b/x/stake/keeper/slash_test.go @@ -2,6 +2,7 @@ package keeper import ( "testing" + "time" "github.com/stretchr/testify/require" @@ -70,9 +71,9 @@ func TestSlashUnbondingDelegation(t *testing.T) { ValidatorAddr: addrVals[0], CreationHeight: 0, // expiration timestamp (beyond which the unbonding delegation shouldn't be slashed) - MinTime: 0, - InitialBalance: sdk.NewCoin(params.BondDenom, 10), - Balance: sdk.NewCoin(params.BondDenom, 10), + MinTime: time.Unix(0, 0), + InitialBalance: sdk.NewInt64Coin(params.BondDenom, 10), + Balance: sdk.NewInt64Coin(params.BondDenom, 10), } keeper.SetUnbondingDelegation(ctx, ubd) @@ -81,23 +82,23 @@ func TestSlashUnbondingDelegation(t *testing.T) { require.Equal(t, int64(0), slashAmount.RoundInt64()) // after the expiration time, no longer eligible for slashing - ctx = ctx.WithBlockHeader(abci.Header{Time: int64(10)}) + ctx = ctx.WithBlockHeader(abci.Header{Time: time.Unix(10, 0)}) keeper.SetUnbondingDelegation(ctx, ubd) slashAmount = keeper.slashUnbondingDelegation(ctx, ubd, 0, fraction) require.Equal(t, int64(0), slashAmount.RoundInt64()) // test valid slash, before expiration timestamp and to which stake contributed oldPool := keeper.GetPool(ctx) - ctx = ctx.WithBlockHeader(abci.Header{Time: int64(0)}) + ctx = ctx.WithBlockHeader(abci.Header{Time: time.Unix(0, 0)}) keeper.SetUnbondingDelegation(ctx, ubd) slashAmount = keeper.slashUnbondingDelegation(ctx, ubd, 0, fraction) require.Equal(t, int64(5), slashAmount.RoundInt64()) ubd, found := keeper.GetUnbondingDelegation(ctx, addrDels[0], addrVals[0]) require.True(t, found) // initialbalance unchanged - require.Equal(t, sdk.NewCoin(params.BondDenom, 10), ubd.InitialBalance) + require.Equal(t, sdk.NewInt64Coin(params.BondDenom, 10), ubd.InitialBalance) // balance decreased - require.Equal(t, sdk.NewCoin(params.BondDenom, 5), ubd.Balance) + require.Equal(t, sdk.NewInt64Coin(params.BondDenom, 5), ubd.Balance) newPool := keeper.GetPool(ctx) require.Equal(t, int64(5), oldPool.LooseTokens.Sub(newPool.LooseTokens).RoundInt64()) } @@ -114,11 +115,11 @@ func TestSlashRedelegation(t *testing.T) { ValidatorDstAddr: addrVals[1], CreationHeight: 0, // expiration timestamp (beyond which the redelegation shouldn't be slashed) - MinTime: 0, + MinTime: time.Unix(0, 0), SharesSrc: sdk.NewRat(10), SharesDst: sdk.NewRat(10), - InitialBalance: sdk.NewCoin(params.BondDenom, 10), - Balance: sdk.NewCoin(params.BondDenom, 10), + InitialBalance: sdk.NewInt64Coin(params.BondDenom, 10), + Balance: sdk.NewInt64Coin(params.BondDenom, 10), } keeper.SetRedelegation(ctx, rd) @@ -137,7 +138,7 @@ func TestSlashRedelegation(t *testing.T) { require.Equal(t, int64(0), slashAmount.RoundInt64()) // after the expiration time, no longer eligible for slashing - ctx = ctx.WithBlockHeader(abci.Header{Time: int64(10)}) + ctx = ctx.WithBlockHeader(abci.Header{Time: time.Unix(10, 0)}) keeper.SetRedelegation(ctx, rd) validator, found = keeper.GetValidator(ctx, addrVals[1]) require.True(t, found) @@ -146,7 +147,7 @@ func TestSlashRedelegation(t *testing.T) { // test valid slash, before expiration timestamp and to which stake contributed oldPool := keeper.GetPool(ctx) - ctx = ctx.WithBlockHeader(abci.Header{Time: int64(0)}) + ctx = ctx.WithBlockHeader(abci.Header{Time: time.Unix(0, 0)}) keeper.SetRedelegation(ctx, rd) validator, found = keeper.GetValidator(ctx, addrVals[1]) require.True(t, found) @@ -155,9 +156,9 @@ func TestSlashRedelegation(t *testing.T) { rd, found = keeper.GetRedelegation(ctx, addrDels[0], addrVals[0], addrVals[1]) require.True(t, found) // initialbalance unchanged - require.Equal(t, sdk.NewCoin(params.BondDenom, 10), rd.InitialBalance) + require.Equal(t, sdk.NewInt64Coin(params.BondDenom, 10), rd.InitialBalance) // balance decreased - require.Equal(t, sdk.NewCoin(params.BondDenom, 5), rd.Balance) + require.Equal(t, sdk.NewInt64Coin(params.BondDenom, 5), rd.Balance) // shares decreased del, found = keeper.GetDelegation(ctx, addrDels[0], addrVals[1]) require.True(t, found) @@ -209,9 +210,9 @@ func TestSlashWithUnbondingDelegation(t *testing.T) { ValidatorAddr: addrVals[0], CreationHeight: 11, // expiration timestamp (beyond which the unbonding delegation shouldn't be slashed) - MinTime: 0, - InitialBalance: sdk.NewCoin(params.BondDenom, 4), - Balance: sdk.NewCoin(params.BondDenom, 4), + MinTime: time.Unix(0, 0), + InitialBalance: sdk.NewInt64Coin(params.BondDenom, 4), + Balance: sdk.NewInt64Coin(params.BondDenom, 4), } keeper.SetUnbondingDelegation(ctx, ubd) @@ -310,11 +311,11 @@ func TestSlashWithRedelegation(t *testing.T) { ValidatorSrcAddr: addrVals[0], ValidatorDstAddr: addrVals[1], CreationHeight: 11, - MinTime: 0, + MinTime: time.Unix(0, 0), SharesSrc: sdk.NewRat(6), SharesDst: sdk.NewRat(6), - InitialBalance: sdk.NewCoin(params.BondDenom, 6), - Balance: sdk.NewCoin(params.BondDenom, 6), + InitialBalance: sdk.NewInt64Coin(params.BondDenom, 6), + Balance: sdk.NewInt64Coin(params.BondDenom, 6), } keeper.SetRedelegation(ctx, rd) @@ -432,11 +433,11 @@ func TestSlashBoth(t *testing.T) { ValidatorDstAddr: addrVals[1], CreationHeight: 11, // expiration timestamp (beyond which the redelegation shouldn't be slashed) - MinTime: 0, + MinTime: time.Unix(0, 0), SharesSrc: sdk.NewRat(6), SharesDst: sdk.NewRat(6), - InitialBalance: sdk.NewCoin(params.BondDenom, 6), - Balance: sdk.NewCoin(params.BondDenom, 6), + InitialBalance: sdk.NewInt64Coin(params.BondDenom, 6), + Balance: sdk.NewInt64Coin(params.BondDenom, 6), } keeper.SetRedelegation(ctx, rdA) @@ -454,9 +455,9 @@ func TestSlashBoth(t *testing.T) { ValidatorAddr: addrVals[0], CreationHeight: 11, // expiration timestamp (beyond which the unbonding delegation shouldn't be slashed) - MinTime: 0, - InitialBalance: sdk.NewCoin(params.BondDenom, 4), - Balance: sdk.NewCoin(params.BondDenom, 4), + MinTime: time.Unix(0, 0), + InitialBalance: sdk.NewInt64Coin(params.BondDenom, 4), + Balance: sdk.NewInt64Coin(params.BondDenom, 4), } keeper.SetUnbondingDelegation(ctx, ubdA) diff --git a/x/stake/keeper/test_common.go b/x/stake/keeper/test_common.go index 250a453b3..010963034 100644 --- a/x/stake/keeper/test_common.go +++ b/x/stake/keeper/test_common.go @@ -24,8 +24,8 @@ import ( // dummy addresses used for testing var ( - Addrs = createTestAddrs(100) - PKs = createTestPubKeys(100) + Addrs = createTestAddrs(500) + PKs = createTestPubKeys(500) emptyAddr sdk.AccAddress emptyPubkey crypto.PubKey diff --git a/x/stake/keeper/validator.go b/x/stake/keeper/validator.go index c7ae43cbe..8105e3747 100644 --- a/x/stake/keeper/validator.go +++ b/x/stake/keeper/validator.go @@ -134,6 +134,8 @@ func (k Keeper) GetValidatorsBonded(ctx sdk.Context) (validators []types.Validat } // get the group of bonded validators sorted by power-rank +// +// TODO: Rename to GetBondedValidatorsByPower or GetValidatorsByPower(ctx, status) func (k Keeper) GetValidatorsByPower(ctx sdk.Context) []types.Validator { store := ctx.KVStore(k.storeKey) maxValidators := k.GetParams(ctx).MaxValidators @@ -191,13 +193,13 @@ func (k Keeper) ClearTendermintUpdates(ctx sdk.Context) { //___________________________________________________________________________ -// Perfom all the nessisary steps for when a validator changes its power. This +// Perform all the necessary steps for when a validator changes its power. This // function updates all validator stores as well as tendermint update store. -// It may kick out validators if new validator is entering the bonded validator +// It may kick out validators if a new validator is entering the bonded validator // group. // // nolint: gocyclo -// TODO: Remove above nolint, function needs to be simplified +// TODO: Remove above nolint, function needs to be simplified! func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) types.Validator { store := ctx.KVStore(k.storeKey) pool := k.GetPool(ctx) @@ -210,19 +212,29 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type cliffPower := k.GetCliffValidatorPower(ctx) switch { - // if already bonded and power increasing only need to update tendermint + // if the validator is already bonded and the power is increasing, we need + // perform the following: + // a) update Tendermint + // b) check if the cliff validator needs to be updated case powerIncreasing && !validator.Revoked && (oldFound && oldValidator.Status == sdk.Bonded): bz := k.cdc.MustMarshalBinary(validator.ABCIValidator()) store.Set(GetTendermintUpdatesKey(validator.Owner), bz) + if cliffPower != nil { + cliffAddr := sdk.AccAddress(k.GetCliffValidator(ctx)) + if bytes.Equal(cliffAddr, validator.Owner) { + k.updateCliffValidator(ctx, validator) + } + } + // if is a new validator and the new power is less than the cliff validator case cliffPower != nil && !oldFound && bytes.Compare(valPower, cliffPower) == -1: //(valPower < cliffPower // skip to completion - // if was unbonded and the new power is less than the cliff validator + // if was unbonded and the new power is less than the cliff validator case cliffPower != nil && (oldFound && oldValidator.Status == sdk.Unbonded) && bytes.Compare(valPower, cliffPower) == -1: //(valPower < cliffPower @@ -232,11 +244,10 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type // a) not-bonded and now has power-rank greater than cliff validator // b) bonded and now has decreased in power default: - // update the validator set for this validator - // if updated, the validator has changed bonding status updatedVal, updated := k.UpdateBondedValidators(ctx, validator) - if updated { // updates to validator occurred to be updated + if updated { + // the validator has changed bonding status validator = updatedVal break } @@ -246,13 +257,68 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type bz := k.cdc.MustMarshalBinary(validator.ABCIValidator()) store.Set(GetTendermintUpdatesKey(validator.Owner), bz) } - } k.SetValidator(ctx, validator) return validator } +// updateCliffValidator determines if the current cliff validator needs to be +// updated or swapped. If the provided affected validator is the current cliff +// validator before it's power was increased, either the cliff power key will +// be updated or if it's power is greater than the next bonded validator by +// power, it'll be swapped. +func (k Keeper) updateCliffValidator(ctx sdk.Context, affectedVal types.Validator) { + var newCliffVal types.Validator + + store := ctx.KVStore(k.storeKey) + pool := k.GetPool(ctx) + cliffAddr := sdk.AccAddress(k.GetCliffValidator(ctx)) + + oldCliffVal, found := k.GetValidator(ctx, cliffAddr) + if !found { + panic(fmt.Sprintf("cliff validator record not found for address: %v\n", cliffAddr)) + } + + // Create a validator iterator ranging from smallest to largest by power + // starting the current cliff validator's power. + start := GetValidatorsByPowerIndexKey(oldCliffVal, pool) + end := sdk.PrefixEndBytes(ValidatorsByPowerIndexKey) + iterator := store.Iterator(start, end) + + if iterator.Valid() { + ownerAddr := iterator.Value() + currVal, found := k.GetValidator(ctx, ownerAddr) + if !found { + panic(fmt.Sprintf("validator record not found for address: %v\n", ownerAddr)) + } + + if currVal.Status != sdk.Bonded || currVal.Revoked { + panic(fmt.Sprintf("unexpected revoked or unbonded validator for address: %s\n", ownerAddr)) + } + + newCliffVal = currVal + iterator.Close() + } else { + panic("failed to create valid validator power iterator") + } + + affectedValRank := GetValidatorsByPowerIndexKey(affectedVal, pool) + newCliffValRank := GetValidatorsByPowerIndexKey(newCliffVal, pool) + + if bytes.Equal(affectedVal.Owner, newCliffVal.Owner) { + // The affected validator remains the cliff validator, however, since + // the store does not contain the new power, update the new power rank. + store.Set(ValidatorPowerCliffKey, affectedValRank) + } else if bytes.Compare(affectedValRank, newCliffValRank) > 0 { + // The affected validator no longer remains the cliff validator as it's + // power is greater than the new cliff validator. + k.setCliffValidator(ctx, newCliffVal, pool) + } else { + panic("invariant broken: the cliff validator should change or it should remain the same") + } +} + func (k Keeper) updateForRevoking(ctx sdk.Context, oldFound bool, oldValidator, newValidator types.Validator) types.Validator { if newValidator.Revoked && oldFound && oldValidator.Status == sdk.Bonded { newValidator = k.unbondValidator(ctx, newValidator) @@ -317,8 +383,9 @@ func (k Keeper) updateValidatorPower(ctx sdk.Context, oldFound bool, oldValidato // // nolint: gocyclo // TODO: Remove the above golint -func (k Keeper) UpdateBondedValidators(ctx sdk.Context, - affectedValidator types.Validator) (updatedVal types.Validator, updated bool) { +func (k Keeper) UpdateBondedValidators( + ctx sdk.Context, affectedValidator types.Validator) ( + updatedVal types.Validator, updated bool) { store := ctx.KVStore(k.storeKey) @@ -328,7 +395,8 @@ func (k Keeper) UpdateBondedValidators(ctx sdk.Context, var validator, validatorToBond types.Validator newValidatorBonded := false - iterator := sdk.KVStoreReversePrefixIterator(store, ValidatorsByPowerIndexKey) // largest to smallest + // create a validator iterator ranging from largest to smallest by power + iterator := sdk.KVStoreReversePrefixIterator(store, ValidatorsByPowerIndexKey) for { if !iterator.Valid() || bondedValidatorsCount > int(maxValidators-1) { break @@ -352,8 +420,12 @@ func (k Keeper) UpdateBondedValidators(ctx sdk.Context, if !validator.Revoked { if validator.Status != sdk.Bonded { validatorToBond = validator + if newValidatorBonded { + panic("already decided to bond a validator, can't bond another!") + } newValidatorBonded = true } + bondedValidatorsCount++ // sanity check @@ -363,8 +435,13 @@ func (k Keeper) UpdateBondedValidators(ctx sdk.Context, iterator.Next() } + iterator.Close() + if newValidatorBonded && bytes.Equal(oldCliffValidatorAddr, validator.Owner) { + panic("cliff validator has not been changed, yet we bonded a new validator") + } + // clear or set the cliff validator if bondedValidatorsCount == int(maxValidators) { k.setCliffValidator(ctx, validator, k.GetPool(ctx)) @@ -372,25 +449,34 @@ func (k Keeper) UpdateBondedValidators(ctx sdk.Context, k.clearCliffValidator(ctx) } - // swap the cliff validator for a new validator if the affected validator was bonded + // swap the cliff validator for a new validator if the affected validator + // was bonded if newValidatorBonded { - - // unbond the cliff validator if oldCliffValidatorAddr != nil { - cliffVal, found := k.GetValidator(ctx, oldCliffValidatorAddr) + oldCliffVal, found := k.GetValidator(ctx, oldCliffValidatorAddr) if !found { panic(fmt.Sprintf("validator record not found for address: %v\n", oldCliffValidatorAddr)) } - k.unbondValidator(ctx, cliffVal) + if bytes.Equal(validatorToBond.Owner, affectedValidator.Owner) { + // unbond the old cliff validator iff the affected validator was + // newly bonded and has greater power + k.unbondValidator(ctx, oldCliffVal) + } else { + // otherwise unbond the affected validator, which must have been + // kicked out + affectedValidator = k.unbondValidator(ctx, affectedValidator) + } } - // bond the new validator validator = k.bondValidator(ctx, validatorToBond) if bytes.Equal(validator.Owner, affectedValidator.Owner) { return validator, true } + + return affectedValidator, true } + return types.Validator{}, false } @@ -484,7 +570,7 @@ func (k Keeper) unbondValidator(ctx sdk.Context, validator types.Validator) type // sanity check if validator.Status == sdk.Unbonded { - panic(fmt.Sprintf("should not already be unbonded, validator: %v\n", validator)) + panic(fmt.Sprintf("should not already be unbonded, validator: %v\n", validator)) } // set the status diff --git a/x/stake/keeper/validator_test.go b/x/stake/keeper/validator_test.go index 06273d6af..62f9823a9 100644 --- a/x/stake/keeper/validator_test.go +++ b/x/stake/keeper/validator_test.go @@ -1,6 +1,7 @@ package keeper import ( + "fmt" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -47,7 +48,6 @@ func TestSetValidator(t *testing.T) { updates := keeper.GetTendermintUpdates(ctx) require.Equal(t, 1, len(updates)) require.Equal(t, validator.ABCIValidator(), updates[0]) - } func TestUpdateValidatorByPowerIndex(t *testing.T) { @@ -88,6 +88,138 @@ func TestUpdateValidatorByPowerIndex(t *testing.T) { require.True(t, keeper.validatorByPowerIndexExists(ctx, power)) } +func TestUpdateBondedValidatorsDecreaseCliff(t *testing.T) { + numVals := 10 + maxVals := 5 + + // create context, keeper, and pool for tests + ctx, _, keeper := CreateTestInput(t, false, 0) + pool := keeper.GetPool(ctx) + + // create keeper parameters + params := keeper.GetParams(ctx) + params.MaxValidators = uint16(maxVals) + keeper.SetParams(ctx, params) + + // create a random pool + pool.LooseTokens = sdk.NewRat(10000) + pool.BondedTokens = sdk.NewRat(1234) + keeper.SetPool(ctx, pool) + + validators := make([]types.Validator, numVals) + for i := 0; i < len(validators); i++ { + moniker := fmt.Sprintf("val#%d", int64(i)) + val := types.NewValidator(Addrs[i], PKs[i], types.Description{Moniker: moniker}) + val.BondHeight = int64(i) + val.BondIntraTxCounter = int16(i) + val, pool, _ = val.AddTokensFromDel(pool, int64((i+1)*10)) + + keeper.SetPool(ctx, pool) + val = keeper.UpdateValidator(ctx, val) + validators[i] = val + } + + nextCliffVal := validators[numVals-maxVals+1] + + // remove enough tokens to kick out the validator below the current cliff + // validator and next in line cliff validator + nextCliffVal, pool, _ = nextCliffVal.RemoveDelShares(pool, sdk.NewRat(21)) + keeper.SetPool(ctx, pool) + nextCliffVal = keeper.UpdateValidator(ctx, nextCliffVal) + + // require the cliff validator has changed + cliffVal := validators[numVals-maxVals-1] + require.Equal(t, cliffVal.Owner, sdk.AccAddress(keeper.GetCliffValidator(ctx))) + + // require the cliff validator power has changed + cliffPower := keeper.GetCliffValidatorPower(ctx) + require.Equal(t, GetValidatorsByPowerIndexKey(cliffVal, pool), cliffPower) + + expectedValStatus := map[int]sdk.BondStatus{ + 9: sdk.Bonded, 8: sdk.Bonded, 7: sdk.Bonded, 5: sdk.Bonded, 4: sdk.Bonded, + 0: sdk.Unbonded, 1: sdk.Unbonded, 2: sdk.Unbonded, 3: sdk.Unbonded, 6: sdk.Unbonded, + } + + // require all the validators have their respective statuses + for valIdx, status := range expectedValStatus { + valAddr := validators[valIdx].Owner + val, _ := keeper.GetValidator(ctx, valAddr) + + require.Equal( + t, val.GetStatus(), status, + fmt.Sprintf("expected validator to have status: %s", sdk.BondStatusToString(status))) + } +} + +func TestCliffValidatorChange(t *testing.T) { + numVals := 10 + maxVals := 5 + + // create context, keeper, and pool for tests + ctx, _, keeper := CreateTestInput(t, false, 0) + pool := keeper.GetPool(ctx) + + // create keeper parameters + params := keeper.GetParams(ctx) + params.MaxValidators = uint16(maxVals) + keeper.SetParams(ctx, params) + + // create a random pool + pool.LooseTokens = sdk.NewRat(10000) + pool.BondedTokens = sdk.NewRat(1234) + keeper.SetPool(ctx, pool) + + validators := make([]types.Validator, numVals) + for i := 0; i < len(validators); i++ { + moniker := fmt.Sprintf("val#%d", int64(i)) + val := types.NewValidator(Addrs[i], PKs[i], types.Description{Moniker: moniker}) + val.BondHeight = int64(i) + val.BondIntraTxCounter = int16(i) + val, pool, _ = val.AddTokensFromDel(pool, int64((i+1)*10)) + + keeper.SetPool(ctx, pool) + val = keeper.UpdateValidator(ctx, val) + validators[i] = val + } + + // add a large amount of tokens to current cliff validator + currCliffVal := validators[numVals-maxVals] + currCliffVal, pool, _ = currCliffVal.AddTokensFromDel(pool, 200) + keeper.SetPool(ctx, pool) + currCliffVal = keeper.UpdateValidator(ctx, currCliffVal) + + // assert new cliff validator to be set to the second lowest bonded validator by power + newCliffVal := validators[numVals-maxVals+1] + require.Equal(t, newCliffVal.Owner, sdk.AccAddress(keeper.GetCliffValidator(ctx))) + + // assert cliff validator power should have been updated + cliffPower := keeper.GetCliffValidatorPower(ctx) + require.Equal(t, GetValidatorsByPowerIndexKey(newCliffVal, pool), cliffPower) + + // add small amount of tokens to new current cliff validator + newCliffVal, pool, _ = newCliffVal.AddTokensFromDel(pool, 1) + keeper.SetPool(ctx, pool) + newCliffVal = keeper.UpdateValidator(ctx, newCliffVal) + + // assert cliff validator has not change but increased in power + cliffPower = keeper.GetCliffValidatorPower(ctx) + require.Equal(t, newCliffVal.Owner, sdk.AccAddress(keeper.GetCliffValidator(ctx))) + require.Equal(t, GetValidatorsByPowerIndexKey(newCliffVal, pool), cliffPower) + + // add enough power to cliff validator to be equal in rank to next validator + newCliffVal, pool, _ = newCliffVal.AddTokensFromDel(pool, 9) + keeper.SetPool(ctx, pool) + newCliffVal = keeper.UpdateValidator(ctx, newCliffVal) + + // assert new cliff validator due to power rank construction + newCliffVal = validators[numVals-maxVals+2] + require.Equal(t, newCliffVal.Owner, sdk.AccAddress(keeper.GetCliffValidator(ctx))) + + // assert cliff validator power should have been updated + cliffPower = keeper.GetCliffValidatorPower(ctx) + require.Equal(t, GetValidatorsByPowerIndexKey(newCliffVal, pool), cliffPower) +} + func TestSlashToZeroPowerRemoved(t *testing.T) { // initialize setup ctx, _, keeper := CreateTestInput(t, false, 100) @@ -346,11 +478,13 @@ func TestGetValidatorsEdgeCases(t *testing.T) { var validators [4]types.Validator for i, amt := range amts { pool := keeper.GetPool(ctx) - validators[i] = types.NewValidator(Addrs[i], PKs[i], types.Description{}) + moniker := fmt.Sprintf("val#%d", int64(i)) + validators[i] = types.NewValidator(Addrs[i], PKs[i], types.Description{Moniker: moniker}) validators[i], pool, _ = validators[i].AddTokensFromDel(pool, amt) keeper.SetPool(ctx, pool) validators[i] = keeper.UpdateValidator(ctx, validators[i]) } + for i := range amts { validators[i], found = keeper.GetValidator(ctx, validators[i].Owner) require.True(t, found) diff --git a/x/stake/simulation/invariants.go b/x/stake/simulation/invariants.go new file mode 100644 index 000000000..96e7931c7 --- /dev/null +++ b/x/stake/simulation/invariants.go @@ -0,0 +1,84 @@ +package simulation + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + "github.com/cosmos/cosmos-sdk/x/stake" + abci "github.com/tendermint/tendermint/abci/types" +) + +// AllInvariants runs all invariants of the stake module. +// Currently: total supply, positive power +func AllInvariants(ck bank.Keeper, k stake.Keeper, am auth.AccountMapper) simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + SupplyInvariants(ck, k, am)(t, app, log) + PositivePowerInvariant(k)(t, app, log) + ValidatorSetInvariant(k)(t, app, log) + } +} + +// SupplyInvariants checks that the total supply reflects all held loose tokens, bonded tokens, and unbonding delegations +func SupplyInvariants(ck bank.Keeper, k stake.Keeper, am auth.AccountMapper) simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + ctx := app.NewContext(false, abci.Header{}) + //pool := k.GetPool(ctx) + + loose := sdk.ZeroInt() + bonded := sdk.ZeroRat() + am.IterateAccounts(ctx, func(acc auth.Account) bool { + loose = loose.Add(acc.GetCoins().AmountOf("steak")) + return false + }) + k.IterateUnbondingDelegations(ctx, func(_ int64, ubd stake.UnbondingDelegation) bool { + loose = loose.Add(ubd.Balance.Amount) + return false + }) + k.IterateValidators(ctx, func(_ int64, validator sdk.Validator) bool { + switch validator.GetStatus() { + case sdk.Bonded: + bonded = bonded.Add(validator.GetPower()) + case sdk.Unbonding: + case sdk.Unbonded: + loose = loose.Add(validator.GetTokens().RoundInt()) + } + return false + }) + + // Loose tokens should equal coin supply plus unbonding delegations plus tokens on unbonded validators + // XXX TODO https://github.com/cosmos/cosmos-sdk/issues/2063#issuecomment-413720872 + // require.True(t, pool.LooseTokens.RoundInt64() == loose.Int64(), "expected loose tokens to equal total steak held by accounts - pool.LooseTokens: %v, sum of account tokens: %v\nlog: %s", + // pool.LooseTokens.RoundInt64(), loose.Int64(), log) + + // Bonded tokens should equal sum of tokens with bonded validators + // XXX TODO https://github.com/cosmos/cosmos-sdk/issues/2063#issuecomment-413720872 + // require.True(t, pool.BondedTokens.RoundInt64() == bonded.RoundInt64(), "expected bonded tokens to equal total steak held by bonded validators - pool.BondedTokens: %v, sum of bonded validator tokens: %v\nlog: %s", + // pool.BondedTokens.RoundInt64(), bonded.RoundInt64(), log) + + // TODO Inflation check on total supply + } +} + +// PositivePowerInvariant checks that all stored validators have > 0 power +func PositivePowerInvariant(k stake.Keeper) simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + ctx := app.NewContext(false, abci.Header{}) + k.IterateValidatorsBonded(ctx, func(_ int64, validator sdk.Validator) bool { + require.True(t, validator.GetPower().GT(sdk.ZeroRat()), "validator with non-positive power stored") + return false + }) + } +} + +// ValidatorSetInvariant checks equivalence of Tendermint validator set and SDK validator set +func ValidatorSetInvariant(k stake.Keeper) simulation.Invariant { + return func(t *testing.T, app *baseapp.BaseApp, log string) { + // TODO + } +} diff --git a/x/stake/simulation/msgs.go b/x/stake/simulation/msgs.go new file mode 100644 index 000000000..ec39f87b0 --- /dev/null +++ b/x/stake/simulation/msgs.go @@ -0,0 +1,256 @@ +package simulation + +import ( + "fmt" + "math/rand" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + "github.com/cosmos/cosmos-sdk/x/stake" + abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto" +) + +// SimulateMsgCreateValidator +func SimulateMsgCreateValidator(m auth.AccountMapper, k stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + denom := k.GetParams(ctx).BondDenom + description := stake.Description{ + Moniker: simulation.RandStringOfLength(r, 10), + } + key := simulation.RandomKey(r, keys) + pubkey := key.PubKey() + address := sdk.AccAddress(pubkey.Address()) + amount := m.GetAccount(ctx, address).GetCoins().AmountOf(denom) + if amount.GT(sdk.ZeroInt()) { + amount = simulation.RandomAmount(r, amount) + } + if amount.Equal(sdk.ZeroInt()) { + return "no-operation", nil + } + msg := stake.MsgCreateValidator{ + Description: description, + ValidatorAddr: address, + DelegatorAddr: address, + PubKey: pubkey, + Delegation: sdk.NewCoin(denom, amount), + } + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := stake.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("stake/MsgCreateValidator/%v", result.IsOK())) + // require.True(t, result.IsOK(), "expected OK result but instead got %v", result) + action = fmt.Sprintf("TestMsgCreateValidator: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgEditValidator +func SimulateMsgEditValidator(k stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + description := stake.Description{ + Moniker: simulation.RandStringOfLength(r, 10), + Identity: simulation.RandStringOfLength(r, 10), + Website: simulation.RandStringOfLength(r, 10), + Details: simulation.RandStringOfLength(r, 10), + } + key := simulation.RandomKey(r, keys) + pubkey := key.PubKey() + address := sdk.AccAddress(pubkey.Address()) + msg := stake.MsgEditValidator{ + Description: description, + ValidatorAddr: address, + } + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := stake.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("stake/MsgEditValidator/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgEditValidator: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgDelegate +func SimulateMsgDelegate(m auth.AccountMapper, k stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + denom := k.GetParams(ctx).BondDenom + validatorKey := simulation.RandomKey(r, keys) + validatorAddress := sdk.AccAddress(validatorKey.PubKey().Address()) + delegatorKey := simulation.RandomKey(r, keys) + delegatorAddress := sdk.AccAddress(delegatorKey.PubKey().Address()) + amount := m.GetAccount(ctx, delegatorAddress).GetCoins().AmountOf(denom) + if amount.GT(sdk.ZeroInt()) { + amount = simulation.RandomAmount(r, amount) + } + if amount.Equal(sdk.ZeroInt()) { + return "no-operation", nil + } + msg := stake.MsgDelegate{ + DelegatorAddr: delegatorAddress, + ValidatorAddr: validatorAddress, + Delegation: sdk.NewCoin(denom, amount), + } + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := stake.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("stake/MsgDelegate/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgDelegate: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgBeginUnbonding +func SimulateMsgBeginUnbonding(m auth.AccountMapper, k stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + denom := k.GetParams(ctx).BondDenom + validatorKey := simulation.RandomKey(r, keys) + validatorAddress := sdk.AccAddress(validatorKey.PubKey().Address()) + delegatorKey := simulation.RandomKey(r, keys) + delegatorAddress := sdk.AccAddress(delegatorKey.PubKey().Address()) + amount := m.GetAccount(ctx, delegatorAddress).GetCoins().AmountOf(denom) + if amount.GT(sdk.ZeroInt()) { + amount = simulation.RandomAmount(r, amount) + } + if amount.Equal(sdk.ZeroInt()) { + return "no-operation", nil + } + msg := stake.MsgBeginUnbonding{ + DelegatorAddr: delegatorAddress, + ValidatorAddr: validatorAddress, + SharesAmount: sdk.NewRatFromInt(amount), + } + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := stake.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("stake/MsgBeginUnbonding/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgBeginUnbonding: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgCompleteUnbonding +func SimulateMsgCompleteUnbonding(k stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + validatorKey := simulation.RandomKey(r, keys) + validatorAddress := sdk.AccAddress(validatorKey.PubKey().Address()) + delegatorKey := simulation.RandomKey(r, keys) + delegatorAddress := sdk.AccAddress(delegatorKey.PubKey().Address()) + msg := stake.MsgCompleteUnbonding{ + DelegatorAddr: delegatorAddress, + ValidatorAddr: validatorAddress, + } + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := stake.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("stake/MsgCompleteUnbonding/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgCompleteUnbonding: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgBeginRedelegate +func SimulateMsgBeginRedelegate(m auth.AccountMapper, k stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + denom := k.GetParams(ctx).BondDenom + sourceValidatorKey := simulation.RandomKey(r, keys) + sourceValidatorAddress := sdk.AccAddress(sourceValidatorKey.PubKey().Address()) + destValidatorKey := simulation.RandomKey(r, keys) + destValidatorAddress := sdk.AccAddress(destValidatorKey.PubKey().Address()) + delegatorKey := simulation.RandomKey(r, keys) + delegatorAddress := sdk.AccAddress(delegatorKey.PubKey().Address()) + // TODO + amount := m.GetAccount(ctx, delegatorAddress).GetCoins().AmountOf(denom) + if amount.GT(sdk.ZeroInt()) { + amount = simulation.RandomAmount(r, amount) + } + if amount.Equal(sdk.ZeroInt()) { + return "no-operation", nil + } + msg := stake.MsgBeginRedelegate{ + DelegatorAddr: delegatorAddress, + ValidatorSrcAddr: sourceValidatorAddress, + ValidatorDstAddr: destValidatorAddress, + SharesAmount: sdk.NewRatFromInt(amount), + } + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := stake.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("stake/MsgBeginRedelegate/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgBeginRedelegate: %s", msg.GetSignBytes()) + return action, nil + } +} + +// SimulateMsgCompleteRedelegate +func SimulateMsgCompleteRedelegate(k stake.Keeper) simulation.TestAndRunTx { + return func(t *testing.T, r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, keys []crypto.PrivKey, log string, event func(string)) (action string, err sdk.Error) { + validatorSrcKey := simulation.RandomKey(r, keys) + validatorSrcAddress := sdk.AccAddress(validatorSrcKey.PubKey().Address()) + validatorDstKey := simulation.RandomKey(r, keys) + validatorDstAddress := sdk.AccAddress(validatorDstKey.PubKey().Address()) + delegatorKey := simulation.RandomKey(r, keys) + delegatorAddress := sdk.AccAddress(delegatorKey.PubKey().Address()) + msg := stake.MsgCompleteRedelegate{ + DelegatorAddr: delegatorAddress, + ValidatorSrcAddr: validatorSrcAddress, + ValidatorDstAddr: validatorDstAddress, + } + require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes()) + ctx, write := ctx.CacheContext() + result := stake.NewHandler(k)(ctx, msg) + if result.IsOK() { + write() + } + event(fmt.Sprintf("stake/MsgCompleteRedelegate/%v", result.IsOK())) + action = fmt.Sprintf("TestMsgCompleteRedelegate: ok %v, msg %s", result.IsOK(), msg.GetSignBytes()) + return action, nil + } +} + +// Setup +func Setup(mapp *mock.App, k stake.Keeper) simulation.RandSetup { + return func(r *rand.Rand, privKeys []crypto.PrivKey) { + ctx := mapp.NewContext(false, abci.Header{}) + gen := stake.DefaultGenesisState() + gen.Params.InflationMax = sdk.NewRat(0) + gen.Params.InflationMin = sdk.NewRat(0) + stake.InitGenesis(ctx, k, gen) + params := k.GetParams(ctx) + denom := params.BondDenom + loose := sdk.ZeroInt() + mapp.AccountMapper.IterateAccounts(ctx, func(acc auth.Account) bool { + balance := simulation.RandomAmount(r, sdk.NewInt(1000000)) + acc.SetCoins(acc.GetCoins().Plus(sdk.Coins{sdk.NewCoin(denom, balance)})) + mapp.AccountMapper.SetAccount(ctx, acc) + loose = loose.Add(balance) + return false + }) + pool := k.GetPool(ctx) + pool.LooseTokens = pool.LooseTokens.Add(sdk.NewRat(loose.Int64(), 1)) + k.SetPool(ctx, pool) + } +} diff --git a/x/stake/simulation/sim_test.go b/x/stake/simulation/sim_test.go new file mode 100644 index 000000000..84745cd1d --- /dev/null +++ b/x/stake/simulation/sim_test.go @@ -0,0 +1,62 @@ +package simulation + +import ( + "encoding/json" + "math/rand" + "testing" + + abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/mock" + "github.com/cosmos/cosmos-sdk/x/mock/simulation" + "github.com/cosmos/cosmos-sdk/x/stake" +) + +// TestStakeWithRandomMessages +func TestStakeWithRandomMessages(t *testing.T) { + mapp := mock.NewApp() + + bank.RegisterWire(mapp.Cdc) + mapper := mapp.AccountMapper + coinKeeper := bank.NewKeeper(mapper) + stakeKey := sdk.NewKVStoreKey("stake") + stakeKeeper := stake.NewKeeper(mapp.Cdc, stakeKey, coinKeeper, stake.DefaultCodespace) + mapp.Router().AddRoute("stake", stake.NewHandler(stakeKeeper)) + mapp.SetEndBlocker(func(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { + validatorUpdates := stake.EndBlocker(ctx, stakeKeeper) + return abci.ResponseEndBlock{ + ValidatorUpdates: validatorUpdates, + } + }) + + err := mapp.CompleteSetup([]*sdk.KVStoreKey{stakeKey}) + if err != nil { + panic(err) + } + + appStateFn := func(r *rand.Rand, keys []crypto.PrivKey, accs []sdk.AccAddress) json.RawMessage { + mock.RandomSetGenesis(r, mapp, accs, []string{"stake"}) + return json.RawMessage("{}") + } + + simulation.Simulate( + t, mapp.BaseApp, appStateFn, + []simulation.TestAndRunTx{ + SimulateMsgCreateValidator(mapper, stakeKeeper), + SimulateMsgEditValidator(stakeKeeper), + SimulateMsgDelegate(mapper, stakeKeeper), + SimulateMsgBeginUnbonding(mapper, stakeKeeper), + SimulateMsgCompleteUnbonding(stakeKeeper), + SimulateMsgBeginRedelegate(mapper, stakeKeeper), + SimulateMsgCompleteRedelegate(stakeKeeper), + }, []simulation.RandSetup{ + Setup(mapp, stakeKeeper), + }, []simulation.Invariant{ + AllInvariants(coinKeeper, stakeKeeper, mapp.AccountMapper), + }, 10, 100, + false, + ) +} diff --git a/x/stake/tags/tags.go b/x/stake/tags/tags.go index edb4eda07..8ef60aa84 100644 --- a/x/stake/tags/tags.go +++ b/x/stake/tags/tags.go @@ -2,7 +2,7 @@ package tags import ( - "github.com/cosmos/cosmos-sdk/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) var ( @@ -14,10 +14,10 @@ var ( ActionBeginRedelegation = []byte("begin-redelegation") ActionCompleteRedelegation = []byte("complete-redelegation") - Action = types.TagAction - SrcValidator = types.TagSrcValidator - DstValidator = types.TagDstValidator - Delegator = types.TagDelegator + Action = sdk.TagAction + SrcValidator = sdk.TagSrcValidator + DstValidator = sdk.TagDstValidator + Delegator = sdk.TagDelegator Moniker = "moniker" - Identity = "Identity" + Identity = "identity" ) diff --git a/x/stake/types/delegation.go b/x/stake/types/delegation.go index 2ceedd5f3..77fd327a5 100644 --- a/x/stake/types/delegation.go +++ b/x/stake/types/delegation.go @@ -4,6 +4,7 @@ import ( "bytes" "errors" "fmt" + "time" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" @@ -100,14 +101,14 @@ type UnbondingDelegation struct { DelegatorAddr sdk.AccAddress `json:"delegator_addr"` // delegator ValidatorAddr sdk.AccAddress `json:"validator_addr"` // validator unbonding from owner addr CreationHeight int64 `json:"creation_height"` // height which the unbonding took place - MinTime int64 `json:"min_time"` // unix time for unbonding completion + MinTime time.Time `json:"min_time"` // unix time for unbonding completion InitialBalance sdk.Coin `json:"initial_balance"` // atoms initially scheduled to receive at completion Balance sdk.Coin `json:"balance"` // atoms to receive at completion } type ubdValue struct { CreationHeight int64 - MinTime int64 + MinTime time.Time InitialBalance sdk.Coin Balance sdk.Coin } @@ -186,7 +187,7 @@ type Redelegation struct { ValidatorSrcAddr sdk.AccAddress `json:"validator_src_addr"` // validator redelegation source owner addr ValidatorDstAddr sdk.AccAddress `json:"validator_dst_addr"` // validator redelegation destination owner addr CreationHeight int64 `json:"creation_height"` // height which the redelegation took place - MinTime int64 `json:"min_time"` // unix time for redelegation completion + MinTime time.Time `json:"min_time"` // unix time for redelegation completion InitialBalance sdk.Coin `json:"initial_balance"` // initial balance when redelegation started Balance sdk.Coin `json:"balance"` // current balance SharesSrc sdk.Rat `json:"shares_src"` // amount of source shares redelegating @@ -195,7 +196,7 @@ type Redelegation struct { type redValue struct { CreationHeight int64 - MinTime int64 + MinTime time.Time InitialBalance sdk.Coin Balance sdk.Coin SharesSrc sdk.Rat diff --git a/x/stake/types/delegation_test.go b/x/stake/types/delegation_test.go index 640f5d979..69823db14 100644 --- a/x/stake/types/delegation_test.go +++ b/x/stake/types/delegation_test.go @@ -2,6 +2,7 @@ package types import ( "testing" + "time" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -57,7 +58,7 @@ func TestUnbondingDelegationEqual(t *testing.T) { require.True(t, ok) ud2.ValidatorAddr = addr3 - ud2.MinTime = 20 * 20 * 2 + ud2.MinTime = time.Unix(20*20*2, 0) ok = ud1.Equal(ud2) require.False(t, ok) @@ -93,7 +94,7 @@ func TestRedelegationEqual(t *testing.T) { r2.SharesDst = sdk.NewRat(10) r2.SharesSrc = sdk.NewRat(20) - r2.MinTime = 20 * 20 * 2 + r2.MinTime = time.Unix(20*20*2, 0) ok = r1.Equal(r2) require.False(t, ok) diff --git a/x/stake/types/errors.go b/x/stake/types/errors.go index 237340b89..b3e279c8e 100644 --- a/x/stake/types/errors.go +++ b/x/stake/types/errors.go @@ -3,6 +3,7 @@ package types import ( "fmt" + "time" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -110,7 +111,7 @@ func ErrBadSharesPercent(codespace sdk.CodespaceType) sdk.Error { return sdk.NewError(codespace, CodeInvalidDelegation, "shares percent must be >0 and <=1") } -func ErrNotMature(codespace sdk.CodespaceType, operation, descriptor string, got, min int64) sdk.Error { +func ErrNotMature(codespace sdk.CodespaceType, operation, descriptor string, got, min time.Time) sdk.Error { msg := fmt.Sprintf("%v is not mature requires a min %v of %v, currently it is %v", operation, descriptor, got, min) return sdk.NewError(codespace, CodeUnauthorized, msg) @@ -120,6 +121,10 @@ func ErrNoUnbondingDelegation(codespace sdk.CodespaceType) sdk.Error { return sdk.NewError(codespace, CodeInvalidDelegation, "no unbonding delegation found") } +func ErrExistingUnbondingDelegation(codespace sdk.CodespaceType) sdk.Error { + return sdk.NewError(codespace, CodeInvalidDelegation, "existing unbonding delegation found") +} + func ErrNoRedelegation(codespace sdk.CodespaceType) sdk.Error { return sdk.NewError(codespace, CodeInvalidDelegation, "no redelegation found") } diff --git a/x/stake/types/inflation_test.go b/x/stake/types/inflation_test.go index 555408853..0114b1e05 100644 --- a/x/stake/types/inflation_test.go +++ b/x/stake/types/inflation_test.go @@ -39,11 +39,11 @@ func TestGetInflation(t *testing.T) { // test 7% minimum stop (testing with 100% bonded) {"test 4", sdk.OneRat(), sdk.ZeroRat(), sdk.NewRat(7, 100), sdk.ZeroRat()}, - {"test 5", sdk.OneRat(), sdk.ZeroRat(), sdk.NewRat(70001, 1000000), sdk.NewRat(-1, 1000000).Round(precision)}, + {"test 5", sdk.OneRat(), sdk.ZeroRat(), sdk.NewRat(70001, 1000000), sdk.NewRat(-1, 1000000)}, // test 20% maximum stop (testing with 0% bonded) {"test 6", sdk.ZeroRat(), sdk.ZeroRat(), sdk.NewRat(20, 100), sdk.ZeroRat()}, - {"test 7", sdk.ZeroRat(), sdk.ZeroRat(), sdk.NewRat(199999, 1000000), sdk.NewRat(1, 1000000).Round(precision)}, + {"test 7", sdk.ZeroRat(), sdk.ZeroRat(), sdk.NewRat(199999, 1000000), sdk.NewRat(1, 1000000)}, // perfect balance shouldn't change inflation {"test 8", sdk.NewRat(67), sdk.NewRat(33), sdk.NewRat(15, 100), sdk.ZeroRat()}, @@ -94,8 +94,9 @@ func checkFinalPoolValues(t *testing.T, pool Pool, initialTotalTokens, cumulativ // Processes provisions are added to the pool correctly every hour // Returns expected Provisions, expected Inflation, and pool, to help with cumulative calculations back in main Tests func updateProvisions(t *testing.T, pool Pool, params Params, hr int) (sdk.Rat, sdk.Rat, Pool) { + expInflation := pool.NextInflation(params) - expProvisions := expInflation.Mul(pool.TokenSupply()).Quo(hrsPerYrRat) + expProvisions := expInflation.Mul(pool.TokenSupply().Round(precision)).Quo(hrsPerYrRat) startTotalSupply := pool.TokenSupply() pool = pool.ProcessProvisions(params) diff --git a/x/stake/types/msg.go b/x/stake/types/msg.go index 08fd80128..27edad5dd 100644 --- a/x/stake/types/msg.go +++ b/x/stake/types/msg.go @@ -21,7 +21,7 @@ var _, _ sdk.Msg = &MsgBeginUnbonding{}, &MsgCompleteUnbonding{} var _, _ sdk.Msg = &MsgBeginRedelegate{}, &MsgCompleteRedelegate{} // Initialize Int for the denominator -var maximumBondingRationalDenominator sdk.Int = sdk.NewInt(int64(math.Pow10(MaxBondDenominatorPrecision))) +var maximumBondingRationalDenominator = sdk.NewInt(int64(math.Pow10(MaxBondDenominatorPrecision))) //______________________________________________________________________ diff --git a/x/stake/types/msg_test.go b/x/stake/types/msg_test.go index 73eef084a..82f92d9f3 100644 --- a/x/stake/types/msg_test.go +++ b/x/stake/types/msg_test.go @@ -10,9 +10,9 @@ import ( ) var ( - coinPos = sdk.NewCoin("steak", 1000) - coinZero = sdk.NewCoin("steak", 0) - coinNeg = sdk.NewCoin("steak", -10000) + coinPos = sdk.NewInt64Coin("steak", 1000) + coinZero = sdk.NewInt64Coin("steak", 0) + coinNeg = sdk.NewInt64Coin("steak", -10000) ) // test ValidateBasic for MsgCreateValidator diff --git a/x/stake/types/params.go b/x/stake/types/params.go index 5a7dd6ef5..0ae1ade09 100644 --- a/x/stake/types/params.go +++ b/x/stake/types/params.go @@ -2,13 +2,14 @@ package types import ( "bytes" + "time" sdk "github.com/cosmos/cosmos-sdk/types" ) // defaultUnbondingTime reflects three weeks in seconds as the default // unbonding time. -const defaultUnbondingTime int64 = 60 * 60 * 24 * 3 +const defaultUnbondingTime time.Duration = 60 * 60 * 24 * 3 * time.Second // Params defines the high level settings for staking type Params struct { @@ -17,7 +18,7 @@ type Params struct { InflationMin sdk.Rat `json:"inflation_min"` // minimum inflation rate GoalBonded sdk.Rat `json:"goal_bonded"` // Goal of percent bonded atoms - UnbondingTime int64 `json:"unbonding_time"` + UnbondingTime time.Duration `json:"unbonding_time"` MaxValidators uint16 `json:"max_validators"` // maximum number of validators BondDenom string `json:"bond_denom"` // bondable coin denomination diff --git a/x/stake/types/pool.go b/x/stake/types/pool.go index 01dfacada..5aab4294b 100644 --- a/x/stake/types/pool.go +++ b/x/stake/types/pool.go @@ -3,16 +3,17 @@ package types import ( "bytes" "fmt" + "time" sdk "github.com/cosmos/cosmos-sdk/types" ) // Pool - dynamic parameters of the current state type Pool struct { - LooseTokens sdk.Rat `json:"loose_tokens"` // tokens which are not bonded in a validator - BondedTokens sdk.Rat `json:"bonded_tokens"` // reserve of bonded tokens - InflationLastTime int64 `json:"inflation_last_time"` // block which the last inflation was processed // TODO make time - Inflation sdk.Rat `json:"inflation"` // current annual inflation rate + LooseTokens sdk.Rat `json:"loose_tokens"` // tokens which are not bonded in a validator + BondedTokens sdk.Rat `json:"bonded_tokens"` // reserve of bonded tokens + InflationLastTime time.Time `json:"inflation_last_time"` // block which the last inflation was processed + Inflation sdk.Rat `json:"inflation"` // current annual inflation rate DateLastCommissionReset int64 `json:"date_last_commission_reset"` // unix timestamp for last commission accounting reset (daily) @@ -32,7 +33,7 @@ func InitialPool() Pool { return Pool{ LooseTokens: sdk.ZeroRat(), BondedTokens: sdk.ZeroRat(), - InflationLastTime: 0, + InflationLastTime: time.Unix(0, 0), Inflation: sdk.NewRat(7, 100), DateLastCommissionReset: 0, PrevBondedShares: sdk.ZeroRat(), @@ -80,13 +81,15 @@ func (p Pool) bondedTokensToLoose(bondedTokens sdk.Rat) Pool { //_______________________________________________________________________ // Inflation -const precision = 100000000000 // increased to this precision for accuracy +const precision = 10000 // increased to this precision for accuracy var hrsPerYrRat = sdk.NewRat(8766) // as defined by a julian year of 365.25 days // process provisions for an hour period func (p Pool) ProcessProvisions(params Params) Pool { p.Inflation = p.NextInflation(params) - provisions := p.Inflation.Mul(p.TokenSupply()).Quo(hrsPerYrRat) + provisions := p.Inflation. + Mul(p.TokenSupply().Round(precision)). + Quo(hrsPerYrRat) // TODO add to the fees provisions p.LooseTokens = p.LooseTokens.Add(provisions) @@ -103,7 +106,10 @@ func (p Pool) NextInflation(params Params) (inflation sdk.Rat) { // 7% and 20%. // (1 - bondedRatio/GoalBonded) * InflationRateChange - inflationRateChangePerYear := sdk.OneRat().Sub(p.BondedRatio().Quo(params.GoalBonded)).Mul(params.InflationRateChange) + inflationRateChangePerYear := sdk.OneRat(). + Sub(p.BondedRatio().Round(precision). + Quo(params.GoalBonded)). + Mul(params.InflationRateChange) inflationRateChange := inflationRateChangePerYear.Quo(hrsPerYrRat) // increase the new annual inflation for this next cycle diff --git a/x/stake/types/test_utils.go b/x/stake/types/test_utils.go index 8a7f4a56e..02c4d4fca 100644 --- a/x/stake/types/test_utils.go +++ b/x/stake/types/test_utils.go @@ -1,12 +1,7 @@ package types import ( - "fmt" - "math/rand" - "testing" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" ) @@ -22,171 +17,3 @@ var ( emptyAddr sdk.AccAddress emptyPubkey crypto.PubKey ) - -// Operation reflects any operation that transforms staking state. It takes in -// a RNG instance, pool, validator and returns an updated pool, updated -// validator, delta tokens, and descriptive message. -type Operation func(r *rand.Rand, pool Pool, c Validator) (Pool, Validator, sdk.Rat, string) - -// OpBondOrUnbond implements an operation that bonds or unbonds a validator -// depending on current status. -// nolint: unparam -// TODO split up into multiple operations -func OpBondOrUnbond(r *rand.Rand, pool Pool, validator Validator) (Pool, Validator, sdk.Rat, string) { - var ( - msg string - newStatus sdk.BondStatus - ) - - if validator.Status == sdk.Bonded { - msg = fmt.Sprintf("sdk.Unbonded previously bonded validator %#v", validator) - newStatus = sdk.Unbonded - - } else if validator.Status == sdk.Unbonded { - msg = fmt.Sprintf("sdk.Bonded previously bonded validator %#v", validator) - newStatus = sdk.Bonded - } - - validator, pool = validator.UpdateStatus(pool, newStatus) - return pool, validator, sdk.ZeroRat(), msg -} - -// OpAddTokens implements an operation that adds a random number of tokens to a -// validator. -func OpAddTokens(r *rand.Rand, pool Pool, validator Validator) (Pool, Validator, sdk.Rat, string) { - msg := fmt.Sprintf("validator %#v", validator) - - tokens := int64(r.Int31n(1000)) - validator, pool, _ = validator.AddTokensFromDel(pool, tokens) - msg = fmt.Sprintf("Added %d tokens to %s", tokens, msg) - - // Tokens are removed so for accounting must be negative - return pool, validator, sdk.NewRat(-1 * tokens), msg -} - -// OpRemoveShares implements an operation that removes a random number of -// delegatorshares from a validator. -func OpRemoveShares(r *rand.Rand, pool Pool, validator Validator) (Pool, Validator, sdk.Rat, string) { - var shares sdk.Rat - for { - shares = sdk.NewRat(int64(r.Int31n(1000))) - if shares.LT(validator.DelegatorShares) { - break - } - } - - msg := fmt.Sprintf("Removed %v shares from validator %#v", shares, validator) - - validator, pool, tokens := validator.RemoveDelShares(pool, shares) - return pool, validator, tokens, msg -} - -// RandomOperation returns a random staking operation. -func RandomOperation(r *rand.Rand) Operation { - operations := []Operation{ - OpBondOrUnbond, - OpAddTokens, - OpRemoveShares, - } - r.Shuffle(len(operations), func(i, j int) { - operations[i], operations[j] = operations[j], operations[i] - }) - - return operations[0] -} - -// AssertInvariants ensures invariants that should always be true are true. -// nolint: unparam -func AssertInvariants(t *testing.T, msg string, - pOrig Pool, cOrig []Validator, pMod Pool, vMods []Validator) { - - // total tokens conserved - require.True(t, - pOrig.LooseTokens.Add(pOrig.BondedTokens).Equal( - pMod.LooseTokens.Add(pMod.BondedTokens)), - "Tokens not conserved - msg: %v\n, pOrig.BondedTokens: %v, pOrig.LooseTokens: %v, pMod.BondedTokens: %v, pMod.LooseTokens: %v", - msg, - pOrig.BondedTokens, pOrig.LooseTokens, - pMod.BondedTokens, pMod.LooseTokens) - - // Nonnegative bonded tokens - require.False(t, pMod.BondedTokens.LT(sdk.ZeroRat()), - "Negative bonded shares - msg: %v\npOrig: %v\npMod: %v\n", - msg, pOrig, pMod) - - // Nonnegative loose tokens - require.False(t, pMod.LooseTokens.LT(sdk.ZeroRat()), - "Negative unbonded shares - msg: %v\npOrig: %v\npMod: %v\n", - msg, pOrig, pMod) - - for _, vMod := range vMods { - // Nonnegative ex rate - require.False(t, vMod.DelegatorShareExRate().LT(sdk.ZeroRat()), - "Applying operation \"%s\" resulted in negative validator.DelegatorShareExRate(): %v (validator.Owner: %s)", - msg, - vMod.DelegatorShareExRate(), - vMod.Owner, - ) - - // Nonnegative poolShares - require.False(t, vMod.BondedTokens().LT(sdk.ZeroRat()), - "Applying operation \"%s\" resulted in negative validator.BondedTokens(): %#v", - msg, - vMod, - ) - - // Nonnegative delShares - require.False(t, vMod.DelegatorShares.LT(sdk.ZeroRat()), - "Applying operation \"%s\" resulted in negative validator.DelegatorShares: %#v", - msg, - vMod, - ) - } -} - -// TODO: refactor this random setup - -// randomValidator generates a random validator. -// nolint: unparam -func randomValidator(r *rand.Rand, i int) Validator { - - tokens := sdk.NewRat(int64(r.Int31n(10000))) - delShares := sdk.NewRat(int64(r.Int31n(10000))) - - // TODO add more options here - status := sdk.Bonded - if r.Float64() > float64(0.5) { - status = sdk.Unbonded - } - - validator := NewValidator(addr1, pk1, Description{}) - validator.Status = status - validator.Tokens = tokens - validator.DelegatorShares = delShares - - return validator -} - -// RandomSetup generates a random staking state. -func RandomSetup(r *rand.Rand, numValidators int) (Pool, []Validator) { - pool := InitialPool() - pool.LooseTokens = sdk.NewRat(100000) - - validators := make([]Validator, numValidators) - for i := 0; i < numValidators; i++ { - validator := randomValidator(r, i) - - switch validator.Status { - case sdk.Bonded: - pool.BondedTokens = pool.BondedTokens.Add(validator.Tokens) - case sdk.Unbonded, sdk.Unbonding: - pool.LooseTokens = pool.LooseTokens.Add(validator.Tokens) - default: - panic("improper use of RandomSetup") - } - - validators[i] = validator - } - - return pool, validators -} diff --git a/x/stake/types/validator.go b/x/stake/types/validator.go index f177c123d..089e8ea92 100644 --- a/x/stake/types/validator.go +++ b/x/stake/types/validator.go @@ -13,8 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/wire" ) -const doNotModifyDescVal = "[do-not-modify]" - // Validator defines the total amount of bond shares and their exchange rate to // coins. Accumulation of interest is modelled as an in increase in the // exchange rate, and slashing as a decrease. When coins are delegated to this @@ -250,6 +248,9 @@ func (v Validator) Equal(c2 Validator) bool { v.LastBondedTokens.Equal(c2.LastBondedTokens) } +// constant used in flags to indicate that description field should not be updated +const DoNotModifyDesc = "[do-not-modify]" + // Description - description fields for a validator type Description struct { Moniker string `json:"moniker"` // name @@ -271,16 +272,16 @@ func NewDescription(moniker, identity, website, details string) Description { // UpdateDescription updates the fields of a given description. An error is // returned if the resulting description contains an invalid length. func (d Description) UpdateDescription(d2 Description) (Description, sdk.Error) { - if d.Moniker == doNotModifyDescVal { + if d2.Moniker == DoNotModifyDesc { d2.Moniker = d.Moniker } - if d.Identity == doNotModifyDescVal { + if d2.Identity == DoNotModifyDesc { d2.Identity = d.Identity } - if d.Website == doNotModifyDescVal { + if d2.Website == DoNotModifyDesc { d2.Website = d.Website } - if d.Details == doNotModifyDescVal { + if d2.Details == DoNotModifyDesc { d2.Details = d.Details } @@ -313,8 +314,9 @@ func (d Description) EnsureLength() (Description, sdk.Error) { // ABCIValidator returns an abci.Validator from a staked validator type. func (v Validator) ABCIValidator() abci.Validator { return abci.Validator{ - PubKey: tmtypes.TM2PB.PubKey(v.PubKey), - Power: v.BondedTokens().RoundInt64(), + PubKey: tmtypes.TM2PB.PubKey(v.PubKey), + Address: v.PubKey.Address(), + Power: v.BondedTokens().RoundInt64(), } } @@ -322,8 +324,9 @@ func (v Validator) ABCIValidator() abci.Validator { // with with zero power used for validator updates. func (v Validator) ABCIValidatorZero() abci.Validator { return abci.Validator{ - PubKey: tmtypes.TM2PB.PubKey(v.PubKey), - Power: 0, + PubKey: tmtypes.TM2PB.PubKey(v.PubKey), + Address: v.PubKey.Address(), + Power: 0, } } @@ -434,5 +437,6 @@ func (v Validator) GetStatus() sdk.BondStatus { return v.Status } func (v Validator) GetOwner() sdk.AccAddress { return v.Owner } func (v Validator) GetPubKey() crypto.PubKey { return v.PubKey } func (v Validator) GetPower() sdk.Rat { return v.BondedTokens() } +func (v Validator) GetTokens() sdk.Rat { return v.Tokens } func (v Validator) GetDelegatorShares() sdk.Rat { return v.DelegatorShares } func (v Validator) GetBondHeight() int64 { return v.BondHeight } diff --git a/x/stake/types/validator_test.go b/x/stake/types/validator_test.go index 8d97cbce7..f0dff4732 100644 --- a/x/stake/types/validator_test.go +++ b/x/stake/types/validator_test.go @@ -2,8 +2,8 @@ package types import ( "fmt" - "math/rand" "testing" + "time" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/assert" @@ -26,19 +26,31 @@ func TestValidatorEqual(t *testing.T) { func TestUpdateDescription(t *testing.T) { d1 := Description{ - Moniker: doNotModifyDescVal, - Identity: doNotModifyDescVal, - Website: doNotModifyDescVal, - Details: doNotModifyDescVal, - } - d2 := Description{ Website: "https://validator.cosmos", Details: "Test validator", } + d2 := Description{ + Moniker: DoNotModifyDesc, + Identity: DoNotModifyDesc, + Website: DoNotModifyDesc, + Details: DoNotModifyDesc, + } + + d3 := Description{ + Moniker: "", + Identity: "", + Website: "", + Details: "", + } + d, err := d1.UpdateDescription(d2) require.Nil(t, err) require.Equal(t, d, d1) + + d, err = d1.UpdateDescription(d3) + require.Nil(t, err) + require.Equal(t, d, d3) } func TestABCIValidator(t *testing.T) { @@ -173,7 +185,7 @@ func TestRemoveDelShares(t *testing.T) { pool := Pool{ BondedTokens: sdk.NewRat(248305), LooseTokens: sdk.NewRat(232147), - InflationLastTime: 0, + InflationLastTime: time.Unix(0, 0), Inflation: sdk.NewRat(7, 100), } shares := sdk.NewRat(29) @@ -221,7 +233,7 @@ func TestPossibleOverflow(t *testing.T) { pool := Pool{ LooseTokens: sdk.NewRat(100), BondedTokens: poolTokens, - InflationLastTime: 0, + InflationLastTime: time.Unix(0, 0), Inflation: sdk.NewRat(7, 100), } tokens := int64(71) @@ -234,67 +246,6 @@ func TestPossibleOverflow(t *testing.T) { msg, newValidator.DelegatorShareExRate()) } -// run random operations in a random order on a random single-validator state, assert invariants hold -func TestSingleValidatorIntegrationInvariants(t *testing.T) { - r := rand.New(rand.NewSource(41)) - - for i := 0; i < 10; i++ { - poolOrig, validatorsOrig := RandomSetup(r, 1) - require.Equal(t, 1, len(validatorsOrig)) - - // sanity check - AssertInvariants(t, "no operation", - poolOrig, validatorsOrig, - poolOrig, validatorsOrig) - - for j := 0; j < 5; j++ { - poolMod, validatorMod, _, msg := RandomOperation(r)(r, poolOrig, validatorsOrig[0]) - - validatorsMod := make([]Validator, len(validatorsOrig)) - copy(validatorsMod[:], validatorsOrig[:]) - require.Equal(t, 1, len(validatorsOrig), "j %v", j) - require.Equal(t, 1, len(validatorsMod), "j %v", j) - validatorsMod[0] = validatorMod - - AssertInvariants(t, msg, - poolOrig, validatorsOrig, - poolMod, validatorsMod) - - poolOrig = poolMod - validatorsOrig = validatorsMod - } - } -} - -// run random operations in a random order on a random multi-validator state, assert invariants hold -func TestMultiValidatorIntegrationInvariants(t *testing.T) { - r := rand.New(rand.NewSource(42)) - - for i := 0; i < 10; i++ { - poolOrig, validatorsOrig := RandomSetup(r, 100) - - AssertInvariants(t, "no operation", - poolOrig, validatorsOrig, - poolOrig, validatorsOrig) - - for j := 0; j < 5; j++ { - index := int(r.Int31n(int32(len(validatorsOrig)))) - poolMod, validatorMod, _, msg := RandomOperation(r)(r, poolOrig, validatorsOrig[index]) - validatorsMod := make([]Validator, len(validatorsOrig)) - copy(validatorsMod[:], validatorsOrig[:]) - validatorsMod[index] = validatorMod - - AssertInvariants(t, msg, - poolOrig, validatorsOrig, - poolMod, validatorsMod) - - poolOrig = poolMod - validatorsOrig = validatorsMod - - } - } -} - func TestHumanReadableString(t *testing.T) { validator := NewValidator(addr1, pk1, Description{})