Disable |solana-install| check for edge/beta testnets (#4565 )

The release tarball URL changes for these testnets, which causes the normal |solana-install| check to fail and the testnet is unnecessarily rebooted.
Be explicit about return status
2019-06-05 15:31:33 -07:00 · 2019-06-05 14:11:03 -07:00 · 2019-06-05 12:07:34 -07:00 · 2019-06-05 09:38:43 -07:00 · 2019-06-05 07:53:04 -07:00 · 2019-06-04 21:27:36 -07:00
654 changed files with 23415 additions and 45084 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,40 +0,0 @@
-version: '{build}'
-
-branches:
-  only:
-  - master
-  - /^v[0-9.]+/
-
-cache:
-  - '%USERPROFILE%\.cargo'
-  - '%APPVEYOR_BUILD_FOLDER%\target'
-
-build_script:
-  - bash ci/publish-tarball.sh
-
-notifications:
-  - provider: Slack
-    incoming_webhook:
-      secure: GJsBey+F5apAtUm86MHVJ68Uqa6WN1SImcuIc4TsTZrDhA8K1QWUNw9FFQPybUWDyOcS5dly3kubnUqlGt9ux6Ad2efsfRIQYWv0tOVXKeY=
-    channel: ci-status
-    on_build_success: false
-    on_build_failure: true
-    on_build_status_changed: true
-
-deploy:
-  - provider: S3
-    access_key_id:
-      secure: fTbJl6JpFebR40J7cOWZ2mXBa3kIvEiXgzxAj6L3N7A=
-    secret_access_key:
-      secure: vItsBXb2rEFLvkWtVn/Rcxu5a5+2EwC+b7GsA0waJy9hXh6XuBAD0lnHd9re3g/4
-    bucket: release.solana.com
-    region: us-west-1
-    set_public: true
-
-  - provider: GitHub
-    auth_token:
-      secure: 81fEmPZ0cV1wLtNuUrcmtgxKF6ROQF1+/ft5m+fHX21z6PoeCbaNo8cTyLioWBj7
-    draft: false
-    prerelease: false
-    on:
-      appveyor_repo_tag: true
--- a/.buildkite/env/.gitignore
+++ b/.buildkite/env/.gitignore
@@ -1 +0,0 @@
-/secrets_unencrypted.ejson
--- a/.buildkite/env/secrets.ejson
+++ b/.buildkite/env/secrets.ejson
@@ -1,14 +1,12 @@
 {
    "_public_key": "ae29f4f7ad2fc92de70d470e411c8426d5d48db8817c9e3dae574b122192335f",
    "environment": {
-      "CODECOV_TOKEN": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:ks2/ElgxwgxqgmFcxTHANNLmj23YH74h:U4uzRONRfiQyqy6HrPQ/e7OnBUY4HkW37R0iekkF3KJ9UGnHqT1UvwgVbDqLahtDIJ4rWw==]",
-      "CRATES_IO_TOKEN": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:lKMh3aLW+jyRrfS/c7yvkpB+TaPhXqLq:j0v27EbaPgwRdHZAbsM0FlAnt3r9ScQrFbWJYOAZtM3qestEiByTlKpZ0eyF/823]",
-      "GITHUB_TOKEN": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:Ll78c3jGpYqnTwR7HJq3mNNUC7pOv9Lu:GrInO2r8MjmP5c54szkyygdsrW5KQYkDgJQUVyFEPyG8SWfchyM9Gur8RV0a+cdwuxNkHLi4U2M=]",
-      "INFLUX_DATABASE": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:IlH/ZLTXv3SwlY3TVyAPCX2KzLRY6iG3:gGmUGSU/kCfR/mTwKONaUC/X]",
-      "INFLUX_PASSWORD": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:o2qm95GU4VrrcC4OU06jjPvCwKZy/CZF:OW2ga3kLOQJvaDEdGRJ+gn3L2ckFm8AJZtv9wj/GeUIKDH2A4uBPTHsAH9PMe6zujpuHGk3qbeg=]",
-      "INFLUX_USERNAME": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:yDWW/uIHsJqOTDYskZoSx3pzoB1vztWY:2z31oTA3g0Xs9fCczGNJRcx8xf/hFCed]",
-      "SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:RqRaHlYUvGPNFJa6gmciaYM3tRJTURUH:q78/3GTHCN3Uqx9z4nOBjPZcO1lOazNoB/mdhGRDFsnAqVd2hU8zbKkqLrZfLlGqyD8WQOFuw5oTJR9qWg6L9LcOyj3pGL8jWF2yjgZxdtNMXnkbSrCWLooWBBLT61jYQnEwg73gT8ld3Q8EVv3T+MeSMu6FnPz+0+bqQCAGgfqksP4hsUAJGzgZu+i0tNOdlT7fxnh5KJK/yFM/CKgN2sRwEjukA9hXsffyB61g2zqzTDJxCUDLbCVrCkA/bfUk7Of/t0W5t0nK1H3oyGZEc/lRMauCknDBka3Gz11dVss2QT19WQNh0u7bHVaT/U4lepX1j9Zv]",
-      "SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_apple_darwin": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:wFDl3INEnA3EQDHRX40avqGe1OMoJxyy:6ncCRVRTIRuYI5o/gayeuWCudWvmKNYr8KEHAWeTq34a5bdcKInBdKhjmjX+wLHqsEwQ5gcyhcxy4Ri2mbuN6AHazfZOZlubQkGlyUOAIYO5D5jkbyIh40DAtjVzo1MD/0HsW9zdGOzqUKp5xJJeDsbR4F153jbxa7fvwF90Q4UQjYFTKAtExEmHtDGSJG48ToVwTabTV/OnISMIggDZBviIv2QWHvXgK07b2mUj34rHJywEDGN1nj5rITTDdUeRcB1x4BAMOe94kTFPSTaj/OszvYlGECt8rkKFqbm092qL+XLfiBaImqe/WJHRCnAj6Don]",
-      "SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_pc_windows_msvc": "EJ[1:8iZ6baJB4fbBV+XDsrUooyGAnGL/8Ol+4Qd0zKh5YjI=:wAh+dBuZopv6vruVOYegUcq/aBnbksT1:qIJfCfDvDWiqicMOkmbJs/0n7UJLKNmgMQaKzeQ8J7Q60YpXbtWzKVW3tS6lzlgf64m3MrPXyo1C+mWh6jkjsb18T/OfggZy1ZHM4AcsOC6/ldUkV5YtuxUQuAmd5jCuV/R7iuYY8Z66AcfAevlb+bnLpgIifdA8fh/IktOo58nZUQwZDdppAacmftsLc6Frn5Er6A6+EXpxK1nmnlmLJ4AJztqlh6X0r+JvE2O7qeoZUXrIegnkxo7Aay7I/dd8zdYpp7ICSiTEtfVN/xNIu/5QmTRU7gWoz7cPl9epq4aiEALzPOzb6KVOiRcsOg+TlFvLQ71Ik5o=]"
+      "CODECOV_TOKEN": "EJ[1:eSGdiZR0Qi0g7qnsI+qJ5H+/ik+H2qL3ned/cBdv/SY=:jA0WqO70coUtF0iokRdgtCR/lF/lETAI:d/Wl8Tdl6xVh/B39cTf1DaQkomR7I/2vMhvxd1msJ++BjI2l3p2dFoGsXqWT+/os8VgiPg==]",
+      "CRATES_IO_TOKEN": "EJ[1:eSGdiZR0Qi0g7qnsI+qJ5H+/ik+H2qL3ned/cBdv/SY=:2FaZ6k4RGH8luyNRaN6yeZUQDNAu2KwC:XeYe0tCAivYE0F9HEWM79mAI6kNbfYaqP7k7yY+SBDvs0341U9BdGZp7SErbHleS]",
+      "GITHUB_TOKEN": "EJ[1:eSGdiZR0Qi0g7qnsI+qJ5H+/ik+H2qL3ned/cBdv/SY=:9kh4DGPiGDcUU7ejSFWg3gTW8nrOM09Q:b+GE07Wu6/bEnkDZcUtf48vTKAFphrCSt3tNNER9h6A+wZ80k499edw4pbDdl9kEvxB30fFwrLQ=]",
+      "INFLUX_DATABASE": "EJ[1:eSGdiZR0Qi0g7qnsI+qJ5H+/ik+H2qL3ned/cBdv/SY=:rCHsYi0rc7dmvr1V3wEgNoaNIyr+9ClM:omjVcOqM7vwt44kJ+As4BjJL]",
+      "INFLUX_PASSWORD": "EJ[1:eSGdiZR0Qi0g7qnsI+qJ5H+/ik+H2qL3ned/cBdv/SY=:bP5Gw1Vy66viKFKO41o2Gho998XajH/5:khkCYz2LFvkJkk7R4xY1Hfz1yU3/NENjauiUkPhXA+dmg1qOIToxEagCgIkRwyeCiYaoCR6CZyw=]",
+      "INFLUX_USERNAME": "EJ[1:eSGdiZR0Qi0g7qnsI+qJ5H+/ik+H2qL3ned/cBdv/SY=:ZamCvza2W9/bZRGSkqDu55xNN04XKKhp:5jlmCOdFbpL7EFez41zCbLfk3ZZlfmhI]",
+      "SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu": "EJ[1:eSGdiZR0Qi0g7qnsI+qJ5H+/ik+H2qL3ned/cBdv/SY=:Oi2nsRxnvWnnBYsB6KwEDzLPcYgpYojU:ELbvjXkXKlgFCMES45R+fxG7Ex43WHWErjMbxZoqasxyr7GSH66hQzUWqiQSJyT4ukYrRhRC9YrsKKGkjACLU57X4EGIy9TuLgTnyBYhPnxLYStC3y/7o/MB5FCTt5wHJw3/A9p+me5+T4UmyZ7OeP21NhDUCGQcb0040VwYWS78klW2aQESJJ6wTI1xboE8/zC0vtnB/u50+LydbKEyb21r6y3OH9FYNEpSwIspWKcgpruJdQSCnDoKxP9YR1yzvk2rabss13LJNdV1Y6mQNIdP4OIFQhCs6dXT253RTl5qdZ0MruHwlp8wX4btOuYDcCoM5exr]"
    }
 }
--- a/.buildkite/hooks/post-checkout
+++ b/.buildkite/hooks/post-checkout
@@ -1,8 +1,6 @@
 CI_BUILD_START=$(date +%s)
 export CI_BUILD_START

-source ci/env.sh
-
 #
 # Kill any running docker containers, which are potentially left over from the
 # previous CI job
@@ -33,10 +31,3 @@ source ci/env.sh
    kill -9 "$victim" || true
  done
 )
-
-# HACK: These are in our docker images, need to be removed from CARGO_HOME
-#  because we try to cache downloads across builds with CARGO_HOME
-# cargo lacks a facility for "system" tooling, always tries CARGO_HOME first
-cargo uninstall cargo-audit || true
-cargo uninstall svgbob_cli || true
-cargo uninstall mdbook || true
--- a/.buildkite/pipeline-upload.sh
+++ b/.buildkite/pipeline-upload.sh
@@ -10,13 +10,7 @@
 set -e
 cd "$(dirname "$0")"/..

-if [[ -n $BUILDKITE_TAG ]]; then
-  buildkite-agent annotate --style info --context release-tag \
-    "https://github.com/solana-labs/solana/releases/$BUILDKITE_TAG"
-  buildkite-agent pipeline upload ci/buildkite-release.yml
-else
-  buildkite-agent pipeline upload ci/buildkite.yml
-fi
+buildkite-agent pipeline upload ci/buildkite.yml

 if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then
  # Add helpful link back to the corresponding Github Pull Request
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,24 +0,0 @@
-only: pulls
-
-# Number of days of inactivity before a pull request becomes stale
-daysUntilStale: 30
-
-# Number of days of inactivity before a stale pull request is closed
-daysUntilClose: 7
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - security
-
-# Label to use when marking a pull request as stale
-staleLabel: stale
-
-# Comment to post when marking a pull request as stale. Set to `false` to disable
-markComment: >
-  This pull request has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs.
-
-# Comment to post when closing a stale pull request. Set to `false` to disable
-closeComment: >
-  This stale pull request has been automatically closed.
-  Thank you for your contributions.
--- a/.gitignore
+++ b/.gitignore
@@ -2,16 +2,18 @@
 /book/src/img/
 /book/src/tests.ok
 /farf/
+/metrics/scripts/lib/
 /solana-release/
-/solana-release.tar.bz2
-/solana-metrics/
-/solana-metrics.tar.bz2
+solana-release.tar.bz2
 /target/

 **/*.rs.bk
 .cargo

+# node config that is rsynced
 /config/
+# node config that remains local
+/config-local/

 # log files
 *.log
@@ -20,4 +22,3 @@ log-*.txt
 # intellij files
 /.idea/
 /solana.iml
-/.vscode/
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,77 +0,0 @@
-# Validate your changes with:
-#
-#   $ curl -F 'data=@.mergify.yml' https://gh.mergify.io/validate
-#
-# https://doc.mergify.io/
-pull_request_rules:
-  - name: remove outdated reviews
-    conditions:
-      - base=master
-    actions:
-      dismiss_reviews:
-        changes_requested: true
-  - name: set automerge label on mergify backport PRs
-    conditions:
-      - author=mergify[bot]
-      - head~=^mergify/bp/
-      - "#status-failure=0"
-    actions:
-      label:
-        add:
-          - automerge
-  - name: v0.16 backport
-    conditions:
-      - base=master
-      - label=v0.16
-    actions:
-      backport:
-        branches:
-          - v0.16
-  - name: v0.17 backport
-    conditions:
-      - base=master
-      - label=v0.17
-    actions:
-      backport:
-        branches:
-          - v0.17
-  - name: v0.18 backport
-    conditions:
-      - base=master
-      - label=v0.18
-    actions:
-      backport:
-        branches:
-          - v0.18
-  - name: v0.19 backport
-    conditions:
-      - base=master
-      - label=v0.19
-    actions:
-      backport:
-        branches:
-          - v0.19
-  - name: v0.20 backport
-    conditions:
-      - base=master
-      - label=v0.20
-    actions:
-      backport:
-        branches:
-          - v0.20
-  - name: v0.21 backport
-    conditions:
-      - base=master
-      - label=v0.21
-    actions:
-      backport:
-        branches:
-          - v0.21
-  - name: v0.22 backport
-    conditions:
-      - base=master
-      - label=v0.22
-    actions:
-      backport:
-        branches:
-          - v0.22
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +0,0 @@
-os:
-  - osx
-
-language: rust
-cache: cargo
-rust:
-  - 1.37.0
-
-install:
-  - source ci/rust-version.sh
-  - test $rust_stable = $TRAVIS_RUST_VERSION # Update .travis.yml rust version above when this fails
-
-script:
-  - source ci/env.sh
-  - ci/publish-tarball.sh
-
-branches:
-  only:
-    - master
-    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
-
-notifications:
-  slack:
-    on_success: change
-    secure: F4IjOE05MyaMOdPRL+r8qhs7jBvv4yDM3RmFKE1zNXnfUOqV4X38oQM1EI+YVsgpMQLj/pxnEB7wcTE4Bf86N6moLssEULCpvAuMVoXj4QbWdomLX+01WbFa6fLVeNQIg45NHrz2XzVBhoKOrMNnl+QI5mbR2AlS5oqsudHsXDnyLzZtd4Y5SDMdYG1zVWM01+oNNjgNfjcCGmOE/K0CnOMl6GPi3X9C34tJ19P2XT7MTDsz1/IfEF7fro2Q8DHEYL9dchJMoisXSkem5z7IDQkGzXsWdWT4NnndUvmd1MlTCE9qgoXDqRf95Qh8sB1Dz08HtvgfaosP2XjtNTfDI9BBYS15Ibw9y7PchAJE1luteNjF35EOy6OgmCLw/YpnweqfuNViBZz+yOPWXVC0kxnPIXKZ1wyH9ibeH6E4hr7a8o9SV/6SiWIlbYF+IR9jPXyTCLP/cc3sYljPWxDnhWFwFdRVIi3PbVAhVu7uWtVUO17Oc9gtGPgs/GrhOMkJfwQPXaudRJDpVZowxTX4x9kefNotlMAMRgq+Drbmgt4eEBiCNp0ITWgh17BiE1U09WS3myuduhoct85+FoVeaUkp1sxzHVtGsNQH0hcz7WcpZyOM+AwistJA/qzeEDQao5zi1eKWPbO2xAhi2rV1bDH6bPf/4lDBwLRqSiwvlWU=
-
-deploy:
-  - provider: s3
-    access_key_id: $AWS_ACCESS_KEY_ID
-    secret_access_key: $AWS_SECRET_ACCESS_KEY
-    bucket: release.solana.com
-    region: us-west-1
-    skip_cleanup: true
-    acl: public_read
-    local_dir: travis-s3-upload
-    on:
-      all_branches: true
-  - provider: releases
-    api_key: $GITHUB_TOKEN
-    skip_cleanup: true
-    file_glob: true
-    file: travis-release-upload/*
-    on:
-      tags: true
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,41 +3,31 @@ members = [
    "bench-exchange",
    "bench-streamer",
    "bench-tps",
-    "chacha-sys",
    "client",
    "core",
    "drone",
    "validator",
    "genesis",
-    "genesis_programs",
    "gossip",
    "install",
    "keygen",
    "kvstore",
    "ledger-tool",
-    "local_cluster",
    "logger",
-    "merkle-tree",
-    "measure",
    "metrics",
+    "netutil",
    "programs/bpf",
-    "programs/bpf_loader_api",
-    "programs/bpf_loader_program",
+    "programs/bpf_loader",
    "programs/budget_api",
    "programs/budget_program",
    "programs/config_api",
    "programs/config_program",
-    "programs/config_tests",
    "programs/exchange_api",
    "programs/exchange_program",
    "programs/failure_program",
-    "programs/move_loader_api",
-    "programs/move_loader_program",
-    "programs/librapay_api",
    "programs/noop_program",
    "programs/stake_api",
    "programs/stake_program",
-    "programs/stake_tests",
    "programs/storage_api",
    "programs/storage_program",
    "programs/token_api",
@@ -47,15 +37,8 @@ members = [
    "replicator",
    "runtime",
    "sdk",
-    "sdk-c",
    "upload-perf",
-    "validator-info",
-    "utils/netutil",
-    "utils/fixed_buf",
    "vote-signer",
-    "cli",
-]
-
-exclude = [
-    "programs/bpf/rust/noop",
+    "wallet",
 ]
+exclude = ["programs/bpf/rust/noop"]
--- a/README.md
+++ b/README.md
@@ -30,40 +30,6 @@ Before you jump into the code, review the online book [Solana: Blockchain Rebuil

 (The _latest_ development version of the online book is also [available here](https://solana-labs.github.io/book-edge/).)

-Release Binaries
-===
-Official release binaries are available at [Github Releases](https://github.com/solana-labs/solana/releases).
-
-Additionally we provide pre-release binaries for the latest code on the edge and
-beta channels.  Note that these pre-release binaries may be less stable than an
-official release.
-
-### Edge channel
-#### Linux (x86_64-unknown-linux-gnu)
-* [solana.tar.bz2](http://release.solana.com/edge/solana-release-x86_64-unknown-linux-gnu.tar.bz2)
-* [solana-install-init](http://release.solana.com/edge/solana-install-init-x86_64-unknown-linux-gnu) as a stand-alone executable
-#### mac OS (x86_64-apple-darwin)
-* [solana.tar.bz2](http://release.solana.com/edge/solana-release-x86_64-apple-darwin.tar.bz2)
-* [solana-install-init](http://release.solana.com/edge/solana-install-init-x86_64-apple-darwin) as a stand-alone executable
-#### Windows (x86_64-pc-windows-msvc)
-* [solana.tar.bz2](http://release.solana.com/edge/solana-release-x86_64-pc-windows-msvc.tar.bz2)
-* [solana-install-init.exe](http://release.solana.com/edge/solana-install-init-x86_64-pc-windows-msvc.exe) as a stand-alone executable
-#### All platforms
-* [solana-metrics.tar.bz2](http://release.solana.com.s3.amazonaws.com/edge/solana-metrics.tar.bz2)
-
-### Beta channel
-#### Linux (x86_64-unknown-linux-gnu)
-* [solana.tar.bz2](http://release.solana.com/beta/solana-release-x86_64-unknown-linux-gnu.tar.bz2)
-* [solana-install-init](http://release.solana.com/beta/solana-install-init-x86_64-unknown-linux-gnu) as a stand-alone executable
-#### mac OS (x86_64-apple-darwin)
-* [solana.tar.bz2](http://release.solana.com/beta/solana-release-x86_64-apple-darwin.tar.bz2)
-* [solana-install-init](http://release.solana.com/beta/solana-install-init-x86_64-apple-darwin) as a stand-alone executable
-#### Windows (x86_64-pc-windows-msvc)
-* [solana.tar.bz2](http://release.solana.com/beta/solana-release-x86_64-pc-windows-msvc.tar.bz2)
-* [solana-install-init.exe](http://release.solana.com/beta/solana-install-init-x86_64-pc-windows-msvc.exe) as a stand-alone executable
-#### All platforms
-* [solana-metrics.tar.bz2](http://release.solana.com.s3.amazonaws.com/beta/solana-metrics.tar.bz2)
-
 Developing
 ===

@@ -78,7 +44,7 @@ $ source $HOME/.cargo/env
 $ rustup component add rustfmt
 ```

-If your rustc version is lower than 1.37.0, please update it:
+If your rustc version is lower than 1.34.0, please update it:

 ```bash
 $ rustup update
@@ -127,9 +93,12 @@ Remote Testnets

 We maintain several testnets:

-* `testnet` - public stable testnet accessible via testnet.solana.com. Runs 24/7
+* `testnet` - public stable testnet accessible via testnet.solana.com, with an https proxy for web apps at api.testnet.solana.com. Runs 24/7
 * `testnet-beta` - public beta channel testnet accessible via beta.testnet.solana.com. Runs 24/7
 * `testnet-edge` - public edge channel testnet accessible via edge.testnet.solana.com. Runs 24/7
+* `testnet-perf` - permissioned stable testnet running a 24/7 soak test
+* `testnet-beta-perf` - permissioned beta channel testnet running a multi-hour soak test weekday mornings
+* `testnet-edge-perf` - permissioned edge channel testnet running a multi-hour soak test weekday mornings

 ## Deploy process

@@ -240,3 +209,5 @@ problem is solved by this code?" On the other hand, if a test does fail and you
 better way to solve the same problem, a Pull Request with your solution would most certainly be
 welcome! Likewise, if rewriting a test can better communicate what code it's protecting, please
 send us that patch!
+
+
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -61,7 +61,7 @@ There are three release channels that map to branches as follows:

 ## Release Steps

-### Creating a new branch from master
+### Advance the Channels

 #### Create the new branch
 1. Pick your branch point for release on master.
@@ -84,12 +84,6 @@ There are three release channels that map to branches as follows:
 At this point, `ci/channel-info.sh` should show your freshly cut release branch as
 "BETA_CHANNEL" and the previous release branch as "STABLE_CHANNEL".

-### Update documentation
-
-Document the new recommended version by updating
-```export SOLANA_RELEASE=[new scheduled TESTNET_TAG value]```
-in book/src/testnet-participation.md on the release (beta) branch.
-
 ### Make the Release

 We use [github's Releases UI](https://github.com/solana-labs/solana/releases) for tagging a release.
@@ -112,25 +106,6 @@ We use [github's Releases UI](https://github.com/solana-labs/solana/releases) fo
 1. Push your Cargo.toml change and the autogenerated Cargo.lock changes to the
   release branch.

-### Publish updated Book
-We maintain three copies of the "book" as official documentation:
-
-1) "Book" is the documentation for the latest official release.  This should get manually updated whenever a new release is made.  It is published here:
-https://solana-labs.github.io/book/
-
-2) "Book-edge" tracks the tip of the master branch and updates automatically.
-https://solana-labs.github.io/book-edge/
-
-3) "Book-beta" tracks the tip of the beta branch and updates automatically.
-https://solana-labs.github.io/book-beta/
-
-To manually trigger an update of the "Book", create a new job of the manual-update-book pipeline.
-Set the tag of the latest release as the PUBLISH_BOOK_TAG environment variable.
-```bash
-PUBLISH_BOOK_TAG=v0.16.6
-```
-https://buildkite.com/solana-labs/manual-update-book
-
 ### Update software on testnet.solana.com

 The testnet running on testnet.solana.com is set to use a fixed release tag
@@ -170,6 +145,12 @@ TESTNET_TAG=[same value as used in TESTNET_TAG in the schedules]
 TESTNET_OP=create-and-start
 ```

+#### Update documentation
+
+Document the new recommended version by updating
+```export SOLANA_RELEASE=[new scheduled TESTNET_TAG value]```
+in book/src/testnet-participation.md for both edge and beta channel branches.
+
 ### Alert the community

 Notify Discord users on #validator-support that a new release for
--- a/bench-exchange/.gitignore
+++ b/bench-exchange/.gitignore
@@ -1,4 +1,3 @@
 /target/
 /config/
 /config-local/
-/farf/
--- a/bench-exchange/Cargo.toml
+++ b/bench-exchange/Cargo.toml
@@ -2,42 +2,40 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-exchange"
-version = "0.18.0"
+version = "0.15.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 publish = false

 [dependencies]
-bincode = "1.1.4"
-bs58 = "0.2.4"
+bs58 = "0.2.0"
 clap = "2.32.0"
-env_logger = "0.6.2"
+bincode = "1.1.4"
+env_logger = "0.6.0"
 itertools = "0.8.0"
-log = "0.4.8"
-num-derive = "0.2"
+log = "0.4.6"
 num-traits = "0.2"
+num-derive = "0.2"
 rand = "0.6.5"
-rayon = "1.1.0"
-serde = "1.0.99"
-serde_derive = "1.0.99"
-serde_json = "1.0.40"
-serde_yaml = "0.8.9"
+rayon = "1.0.3"
+serde = "1.0.91"
+serde_derive = "1.0.91"
+serde_json = "1.0.38"
 # solana-runtime = { path = "../solana/runtime"}
-solana-core = { path = "../core", version = "0.18.0" }
-solana-local-cluster = { path = "../local_cluster", version = "0.18.0" }
-solana-client = { path = "../client", version = "0.18.0" }
-solana-drone = { path = "../drone", version = "0.18.0" }
-solana-exchange-api = { path = "../programs/exchange_api", version = "0.18.0" }
-solana-exchange-program = { path = "../programs/exchange_program", version = "0.18.0" }
-solana-logger = { path = "../logger", version = "0.18.0" }
-solana-metrics = { path = "../metrics", version = "0.18.0" }
-solana-netutil = { path = "../utils/netutil", version = "0.18.0" }
-solana-runtime = { path = "../runtime", version = "0.18.0" }
-solana-sdk = { path = "../sdk", version = "0.18.0" }
-untrusted = "0.7.0"
-ws = "0.9.0"
+solana = { path = "../core", version = "0.15.2"    }
+solana-client = { path = "../client", version = "0.15.2"    }
+solana-drone = { path = "../drone", version = "0.15.2"    }
+solana-exchange-api = { path = "../programs/exchange_api", version = "0.15.2"    }
+solana-exchange-program = { path = "../programs/exchange_program", version = "0.15.2"    }
+solana-logger = { path = "../logger", version = "0.15.2"    }
+solana-metrics = { path = "../metrics", version = "0.15.2"    }
+solana-netutil = { path = "../netutil", version = "0.15.2"    }
+solana-runtime = { path = "../runtime", version = "0.15.2"    }
+solana-sdk = { path = "../sdk", version = "0.15.2"    }
+ws = "0.8.1"
+untrusted = "0.6.2"

 [features]
-cuda = ["solana-core/cuda"]
-
+cuda = ["solana/cuda"]
+erasure = []
--- a/bench-exchange/README.md
+++ b/bench-exchange/README.md
@@ -6,10 +6,10 @@ learn how to start and interact with the exchange.

 ### Table of Contents
 [Overview](#Overview)<br>
-[Premise](#Premise)<br>
+[Premiss](#Premiss)<br>
 [Exchange startup](#Exchange-startup)<br>
-[Order Requests](#Trade-requests)<br>
-[Order Cancellations](#Trade-cancellations)<br>
+[Trade requests](#Trade-requests)<br>
+[Trade cancellations](#Trade-cancellations)<br>
 [Trade swap](#Trade-swap)<br>
 [Exchange program operations](#Exchange-program-operations)<br>
 [Quotes and OHLCV](#Quotes-and-OHLCV)<br>
@@ -22,9 +22,9 @@ An exchange is a marketplace where one asset can be traded for another.  This
 demo demonstrates one way to host an exchange on the Solana blockchain by
 emulating a currency exchange.

-The assets are virtual tokens held by investors who may post order requests to
-the exchange.  A Matcher monitors the exchange and posts swap requests for
-matching orders.  All the transactions can execute concurrently.
+The assets are virtual tokens held by investors who may post trade requests to
+the exchange.  A Swapper monitors the exchange and posts swap requests for
+matching trade orders.  All the transactions can execute concurrently.

 ## Premise

@@ -42,91 +42,92 @@ matching orders.  All the transactions can execute concurrently.
  - A request to create a token account
 - Token request
  - A request to deposit tokens of a particular type into a token account.
- Asset pair
-  - A struct with fields Base and Quote, representing the two assets which make up a 
-    trading pair,  which themselves are Tokens. The Base or 'primary' asset is the
-    numerator and the Quote is the denominator for pricing purposes.
- Order side
-  - Describes which side of the market an investor wants to place a trade on. Options
-    are "Bid" or "Ask", where a bid represents an offer to purchase the Base asset of
-    the AssetPair for a sum of the Quote Asset and an Ask is an offer to sell Base asset
-    for the Quote asset.
+- Token pair
+  - A unique ordered list of two tokens.  For the four types of tokens used in
+    this demo, the valid pairs are AB, AC, AD, BC, BD, CD.
+- Direction of trade
+  - Describes which token in the pair the investor wants to sell and buy and can
+    be either "To" or "From".  For example, if an investor issues a "To" trade
+    for "AB" then they which to exchange A tokens to B tokens.  A "From" order
+    would read the other way,  A tokens from B tokens.
 - Price ratio
-  -  An expression of the relative prices of two tokens. Calculated with the Base
-     Asset as the numerator and the Quote Asset as the denominator. Ratios are 
-     represented as fixed point numbers.  The fixed point scaler is defined in
+  -  An expression of the relative prices of two tokens.  They consist of the
+     price of the primary token and the price of the secondary token.  For
+     simplicity sake, the primary token's price is always 1, which forces the
+     secondary to be the common denominator.  For example, if token A was worth
+     2 and token B was worth 6, the price ratio would be 1:3 or just 3.  Price
+     ratios are represented as fixed point numbers.  The fixed point scaler is
+     defined in
     [exchange_state.rs](https://github.com/solana-labs/solana/blob/c2fdd1362a029dcf89c8907c562d2079d977df11/programs/exchange_api/src/exchange_state.rs#L7)
- Order request
-  - A Solana transaction sent by a trader to the exchange to submit an order. 
-    Order requests are made up of the token pair, the order side (bid or ask),
-    quantity of the primary token, the price ratio, and the two token accounts
-    to be credited/deducted.  An example trade request looks like "T AB 5 2" 
-    which reads "Exchange 5 A tokens to B tokens at a price ratio of 1:2"  A fulfilled trade would result in 5 A tokens
+- Trade request
+  - A Solana transaction executed by the exchange requesting the trade of one
+    type of token for another.  Trade requests are made up of the token pair,
+    the direction of the trade, quantity of the primary token, the price ratio,
+    and the two token accounts to be credited/deducted.  An example trade
+    request looks like "T AB 5 2" which reads "Exchange 5 A tokens to B tokens
+    at a price ratio of 1:2"  A fulfilled trade would result in 5 A tokens
    deducted and 10 B tokens credited to the trade initiator's token accounts.
-    Successful order requests result in an order.
- Order
-  - The result of a successful order request.  orders are stored in
-    accounts owned by the submitter of the order request.  They can only be
+    Successful trade requests result in a trade order.
+- Trade order
+  - The result of a successful trade request.  Trade orders are stored in
+    accounts owned by the submitter of the trade request.  They can only be
    canceled by their owner but can be used by anyone in a trade swap.  They
-    contain the same information as the order request.
+    contain the same information as the trade request.
 - Price spread
-  - The difference between the two matching orders. The spread is the
-    profit of the Matcher initiating the swap request.
- Match requirements
+  - The difference between the two matching trade orders. The spread is the
+    profit of the Swapper initiating the swap request.
+- Swap requirements
  - Policies that result in a successful trade swap.
- Match request
-  - A request to fill two complementary orders (bid/ask), resulting if successful,
-    in a trade being created.
- Trade
-  - A successful trade is created from two matching orders that meet
-    swap requirements which are submitted in a Match Request by a Matcher and
-    executed by the exchange. A trade may not wholly satisfy one or both of the
-    orders in which case the orders are adjusted appropriately. Upon execution,
-    tokens are distributed to the traders' accounts and any overlap or 
-    "negative spread" between orders is deposited into the Matcher's profit
-    account.  All successful trades are recorded in the data of a new solana 
-    account for posterity.
+- Swap request
+  - A request to exchange tokens between to trade orders
+- Trade swap
+  - A successful trade.  A swap consists of two matching trade orders that meet
+    swap requirements.  A trade swap may not wholly satisfy one or both of the
+    trade orders in which case the trade orders are adjusted appropriately.  As
+    long as the swap requirements are met there will be an exchange of tokens
+    between accounts.  Any price spread is deposited into the Swapper's profit
+    account.  All trade swaps are recorded in a new account for posterity.
 - Investor
  - Individual investors who hold a number of tokens and wish to trade them on
    the exchange.  Investors operate as Solana thin clients who own a set of
-    accounts containing tokens and/or order requests.  Investors post
+    accounts containing tokens and/or trade requests.  Investors post
    transactions to the exchange in order to request tokens and post or cancel
-    order requests.
- Matcher
-  - An agent who facilitates trading between investors.  Matchers operate as
-    Solana thin clients who monitor all the orders looking for a trade
-    match.  Once found, the Matcher issues a swap request to the exchange.
-    Matchers are the engine of the exchange and are rewarded for their efforts by
-    accumulating the price spreads of the swaps they initiate.  Matchers also
+    trade requests.
+- Swapper
+  - An agent who facilitates trading between investors.  Swappers operate as
+    Solana thin clients who monitor all the trade orders looking for a trade
+    match.  Once found, the Swapper issues a swap request to the exchange.
+    Swappers are the engine of the exchange and are rewarded for their efforts by
+    accumulating the price spreads of the swaps they initiate.  Swappers also
    provide current bid/ask price and OHLCV (Open, High, Low, Close, Volume)
    information on demand via a public network port.
 - Transaction fees
  - Solana transaction fees are paid for by the transaction submitters who are
-    the Investors and Matchers.
+    the Investors and Swappers.

 ## Exchange startup

 The exchange is up and running when it reaches a state where it can take
-investors' trades and Matchers' match requests.  To achieve this state the
+investor's trades and Swapper's swap requests.  To achieve this state the
 following must occur in order:

 - Start the Solana blockchain
- Start the  thin-client
- The Matcher subscribes to change notifications for all the accounts owned by
+- Start the Swapper thin-client
+- The Swapper subscribes to change notifications for all the accounts owned by
  the exchange program id.  The subscription is managed via Solana's JSON RPC
  interface.
- The Matcher starts responding to queries for bid/ask price and OHLCV
+- The Swapper starts responding to queries for bid/ask price and OHLCV

-The Matcher responding successfully to price and OHLCV requests is the signal to
+The Swapper responding successfully to price and OHLCV requests is the signal to
 the investors that trades submitted after that point will be analyzed.  <!--This
 is not ideal, and instead investors should be able to submit trades at any time,
-and the Matcher could come and go without missing a trade.  One way to achieve
-this is for the Matcher to read the current state of all accounts looking for all
-open orders.-->
+and the Swapper could come and go without missing a trade.  One way to achieve
+this is for the Swapper to read the current state of all accounts looking for all
+open trade orders.-->

 Investors will initially query the exchange to discover their current balance
 for each type of token.  If the investor does not already have an account for
-each type of token, they will submit account requests.  Matcher as well will
+each type of token, they will submit account requests.  Swappers as well will
 request accounts to hold the tokens they earn by initiating trade swaps.

 ```rust
@@ -164,7 +165,7 @@ pub struct TokenAccountInfo {
 }
 ```

-For this demo investors or Matcher can request more tokens from the exchange at
+For this demo investors or Swappers can request more tokens from the exchange at
 any time by submitting token requests. In non-demos, an exchange of this type
 would provide another way to exchange a 3rd party asset into tokens.

@@ -180,19 +181,19 @@ pub enum ExchangeInstruction {
 }
 ```

-## Order Requests
+## Trade requests

 When an investor decides to exchange a token of one type for another, they
-submit a transaction to the Solana Blockchain containing an order request, which,
-if successful, is turned into an order.  orders do not expire but are
-cancellable. <!-- orders should have a timestamp to enable trade
-expiration -->  When an order is created, tokens are deducted from a token
-account and the order acts as an escrow.  The tokens are held until the
-order is fulfilled or canceled. If the direction is `To`, then the number
+submit a transaction to the Solana Blockchain containing a trade request, which,
+if successful, is turned into a trade order.  Trade orders do not expire but are
+cancellable. <!-- Trade orders should have a timestamp to enable trade
+expiration -->  When a trade order is created, tokens are deducted from a token
+account and the trade order acts as an escrow.  The tokens are held until the
+trade order is fulfilled or canceled. If the direction is `To`, then the number
 of `tokens` are deducted from the primary account, if `From` then `tokens`
-multiplied by `price` are deducted from the secondary account.  orders are
+multiplied by `price` are deducted from the secondary account.  Trade orders are
 no longer valid when the number of `tokens` goes to zero, at which point they
-can no longer be used. <!-- Could support refilling orders, so order
+can no longer be used. <!-- Could support refilling trade orders, so trade order
 accounts are refilled rather than accumulating -->

 ```rust
@@ -204,7 +205,7 @@ pub enum Direction {
    From,
 }

-pub struct OrderRequestInfo {
+pub struct TradeRequestInfo {
    /// Direction of trade
    pub direction: Direction,

@@ -223,7 +224,7 @@ pub struct OrderRequestInfo {
 }

 pub enum ExchangeInstruction {
-    /// order request
+    /// Trade request
    /// key 0 - Signer
    /// key 1 - Account in which to record the swap
    /// key 2 - Token account associated with this trade
@@ -232,7 +233,7 @@ pub enum ExchangeInstruction {

 /// Trade accounts are populated with this structure
 pub struct TradeOrderInfo {
-    /// Owner of the order
+    /// Owner of the trade order
    pub owner: Pubkey,
    /// Direction of the exchange
    pub direction: Direction,
@@ -251,7 +252,7 @@ pub struct TradeOrderInfo {
 }
 ```

-## Order cancellations
+## Trade cancellations

 An investor may cancel a trade at anytime, but only trades they own.  If the
 cancellation is successful, any tokens held in escrow are returned to the
@@ -259,24 +260,24 @@ account from which they came.

 ```rust
 pub enum ExchangeInstruction {
-    /// order cancellation
+    /// Trade cancellation
    /// key 0 - Signer
-    /// key 1 -order to cancel
+    /// key 1 -Trade order to cancel
    TradeCancellation,
 }
 ```

 ## Trade swaps

-The Matcher is monitoring the accounts assigned to the exchange program and
-building a trade-order table.  The order table is used to identify
-matching orders which could be fulfilled.  When a match is found the
-Matcher should issue a swap request.  Swap requests may not satisfy the entirety
+The Swapper is monitoring the accounts assigned to the exchange program and
+building a trade-order table.  The trade order table is used to identify
+matching trade orders which could be fulfilled.  When a match is found the
+Swapper should issue a swap request.  Swap requests may not satisfy the entirety
 of either order, but the exchange will greedily fulfill it.  Any leftover tokens
-in either account will keep the order valid for further swap requests in
+in either account will keep the trade order valid for further swap requests in
 the future.

-Matching orders are defined by the following swap requirements:
+Matching trade orders are defined by the following swap requirements:

 - Opposite polarity (one `To` and one `From`)
 - Operate on the same token pair
@@ -309,14 +310,14 @@ whole for clarity.
 | 5 | 1 T AB 2 10 | 2 F AB 1 5 |

 As part of a successful swap request, the exchange will credit tokens to the
-Matcher's account equal to the difference in the price ratios or the two orders.
-These tokens are considered the Matcher's profit for initiating the trade.
+Swapper's account equal to the difference in the price ratios or the two orders.
+These tokens are considered the Swapper's profit for initiating the trade.

-The Matcher would initiate the following swap on the order table above:
+The Swapper would initiate the following swap on the order table above:

  - Row 1, To:   Investor 1 trades 2 A tokens to 8 B tokens
  - Row 1, From: Investor 2 trades 2 A tokens from 8 B tokens
-  - Matcher takes 8 B tokens as profit
+  - Swapper takes 8 B tokens as profit

 Both row 1 trades are fully realized, table becomes:

@@ -327,11 +328,11 @@ Both row 1 trades are fully realized, table becomes:
 | 3 | 1 T AB 2 8  | 2 F AB 3 6 |
 | 4 | 1 T AB 2 10 | 2 F AB 1 5 |

-The Matcher would initiate the following swap:
+The Swapper would initiate the following swap:

  - Row 1, To:   Investor 1 trades 1 A token to 4 B tokens
  - Row 1, From: Investor 2 trades 1 A token from 4 B tokens
-  - Matcher takes 4 B tokens as profit
+  - Swapper takes 4 B tokens as profit

 Row 1 From is not fully realized, table becomes:

@@ -342,11 +343,11 @@ Row 1 From is not fully realized, table becomes:
 | 3 | 1 T AB 2 10 | 2 F AB 3 6 |
 | 4 |             | 2 F AB 1 5 |

-The Matcher would initiate the following swap:
+The Swapper would initiate the following swap:

  - Row 1, To:   Investor 1 trades 1 A token to 6 B tokens
  - Row 1, From: Investor 2 trades 1 A token from 6 B tokens
-  - Matcher takes 2 B tokens as profit
+  - Swapper takes 2 B tokens as profit

 Row 1 To is now fully realized, table becomes:

@@ -356,11 +357,11 @@ Row 1 To is now fully realized, table becomes:
 | 2 | 1 T AB 2 8  | 2 F AB 3 5 |
 | 3 | 1 T AB 2 10 | 2 F AB 1 5 |

-The Matcher would initiate the following last swap:
+The Swapper would initiate the following last swap:

  - Row 1, To:   Investor 1 trades 2 A token to 12 B tokens
  - Row 1, From: Investor 2 trades 2 A token from 12 B tokens
-  - Matcher takes 4 B tokens as profit
+  - Swapper takes 4 B tokens as profit

 Table becomes:

@@ -378,11 +379,11 @@ pub enum ExchangeInstruction {
    /// Trade swap request
    /// key 0 - Signer
    /// key 1 - Account in which to record the swap
-    /// key 2 - 'To' order
-    /// key 3 - `From` order
+    /// key 2 - 'To' trade order
+    /// key 3 - `From` trade order
    /// key 4 - Token account associated with the To Trade
    /// key 5 - Token account associated with From trade
-    /// key 6 - Token account in which to deposit the Matcher profit from the swap.
+    /// key 6 - Token account in which to deposit the Swappers profit from the swap.
    SwapRequest,
 }

@@ -390,9 +391,9 @@ pub enum ExchangeInstruction {
 pub struct TradeSwapInfo {
    /// Pair swapped
    pub pair: TokenPair,
-    /// `To` order
+    /// `To` trade order
    pub to_trade_order: Pubkey,
-    /// `From` order
+    /// `From` trade order
    pub from_trade_order: Pubkey,
    /// Number of primary tokens exchanged
    pub primary_tokens: u64,
@@ -423,32 +424,32 @@ pub enum ExchangeInstruction {
    ///         the exchange has a limitless number of tokens it can transfer.
    TransferRequest(Token, u64),

-    /// order request
+    /// Trade request
    /// key 0 - Signer
    /// key 1 - Account in which to record the swap
    /// key 2 - Token account associated with this trade
    TradeRequest(TradeRequestInfo),

-    /// order cancellation
+    /// Trade cancellation
    /// key 0 - Signer
-    /// key 1 -order to cancel
+    /// key 1 -Trade order to cancel
    TradeCancellation,

    /// Trade swap request
    /// key 0 - Signer
    /// key 1 - Account in which to record the swap
-    /// key 2 - 'To' order
-    /// key 3 - `From` order
+    /// key 2 - 'To' trade order
+    /// key 3 - `From` trade order
    /// key 4 - Token account associated with the To Trade
    /// key 5 - Token account associated with From trade
-    /// key 6 - Token account in which to deposit the Matcher profit from the swap.
+    /// key 6 - Token account in which to deposit the Swappers profit from the swap.
    SwapRequest,
 }
 ```

 ## Quotes and OHLCV

-The Matcher will provide current bid/ask price quotes based on trade actively and
+The Swapper will provide current bid/ask price quotes based on trade actively and
 also provide OHLCV based on some time window.  The details of how the bid/ask
 price quotes are calculated are yet to be decided.

@@ -477,3 +478,6 @@ To also see the cluster messages:
 ```bash
 $ RUST_LOG=solana_bench_exchange=info,solana=info cargo test --release -- --nocapture test_exchange_local_cluster
 ```
+
+
+
--- a/bench-exchange/src/bench.rs
+++ b/bench-exchange/src/bench.rs
@@ -5,8 +5,8 @@ use itertools::izip;
 use log::*;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
+use solana::gen_keys::GenKeys;
 use solana_client::perf_utils::{sample_txs, SampleStats};
-use solana_core::gen_keys::GenKeys;
 use solana_drone::drone::request_airdrop_transaction;
 use solana_exchange_api::exchange_instruction;
 use solana_exchange_api::exchange_state::*;
@@ -20,12 +20,9 @@ use solana_sdk::system_instruction;
 use solana_sdk::timing::{duration_as_ms, duration_as_s};
 use solana_sdk::transaction::Transaction;
 use std::cmp;
-use std::collections::{HashMap, VecDeque};
-use std::fs::File;
-use std::io::prelude::*;
+use std::collections::VecDeque;
 use std::mem;
 use std::net::SocketAddr;
-use std::path::Path;
 use std::process::exit;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::mpsc::{channel, Receiver, Sender};
@@ -51,8 +48,6 @@ pub struct Config {
    pub batch_size: usize,
    pub chunk_size: usize,
    pub account_groups: usize,
-    pub client_ids_and_stake_file: String,
-    pub read_from_client_file: bool,
 }

 impl Default for Config {
@@ -66,38 +61,10 @@ impl Default for Config {
            batch_size: 10,
            chunk_size: 10,
            account_groups: 100,
-            client_ids_and_stake_file: String::new(),
-            read_from_client_file: false,
        }
    }
 }

-pub fn create_client_accounts_file(
-    client_ids_and_stake_file: &str,
-    batch_size: usize,
-    account_groups: usize,
-    fund_amount: u64,
-) {
-    let accounts_in_groups = batch_size * account_groups;
-    const NUM_KEYPAIR_GROUPS: u64 = 2;
-    let total_keys = accounts_in_groups as u64 * NUM_KEYPAIR_GROUPS;
-
-    let keypairs = generate_keypairs(total_keys);
-
-    let mut accounts = HashMap::new();
-    keypairs.iter().for_each(|keypair| {
-        accounts.insert(
-            serde_json::to_string(&keypair.to_bytes().to_vec()).unwrap(),
-            fund_amount,
-        );
-    });
-
-    let serialized = serde_yaml::to_string(&accounts).unwrap();
-    let path = Path::new(&client_ids_and_stake_file);
-    let mut file = File::create(path).unwrap();
-    file.write_all(&serialized.into_bytes()).unwrap();
-}
-
 pub fn do_bench_exchange<T>(clients: Vec<T>, config: Config)
 where
    T: 'static + Client + Send + Sync,
@@ -111,8 +78,6 @@ where
        batch_size,
        chunk_size,
        account_groups,
-        client_ids_and_stake_file,
-        read_from_client_file,
    } = config;

    info!(
@@ -127,55 +92,35 @@ where
    );

    let accounts_in_groups = batch_size * account_groups;
-    const NUM_KEYPAIR_GROUPS: u64 = 2;
-    let total_keys = accounts_in_groups as u64 * NUM_KEYPAIR_GROUPS;
-
-    let mut signer_keypairs = if read_from_client_file {
-        let path = Path::new(&client_ids_and_stake_file);
-        let file = File::open(path).unwrap();
-
-        let accounts: HashMap<String, u64> = serde_yaml::from_reader(file).unwrap();
-        accounts
-            .into_iter()
-            .map(|(keypair, _)| {
-                let bytes: Vec<u8> = serde_json::from_str(keypair.as_str()).unwrap();
-                Keypair::from_bytes(&bytes).unwrap()
-            })
-            .collect()
-    } else {
-        info!("Generating {:?} signer keys", total_keys);
-        generate_keypairs(total_keys)
-    };
-
-    let trader_signers: Vec<_> = signer_keypairs
-        .drain(0..accounts_in_groups)
-        .map(Arc::new)
-        .collect();
-    let swapper_signers: Vec<_> = signer_keypairs
-        .drain(0..accounts_in_groups)
-        .map(Arc::new)
-        .collect();
-
+    let exit_signal = Arc::new(AtomicBool::new(false));
    let clients: Vec<_> = clients.into_iter().map(Arc::new).collect();
    let client = clients[0].as_ref();

-    if !read_from_client_file {
-        info!("Fund trader accounts");
-        fund_keys(client, &identity, &trader_signers, fund_amount);
-        info!("Fund swapper accounts");
-        fund_keys(client, &identity, &swapper_signers, fund_amount);
-    }
+    const NUM_KEYPAIR_GROUPS: u64 = 4;
+    let total_keys = accounts_in_groups as u64 * NUM_KEYPAIR_GROUPS;
+    info!("Generating {:?} keys", total_keys);
+    let mut keypairs = generate_keypairs(total_keys);
+    let trader_signers: Vec<_> = keypairs
+        .drain(0..accounts_in_groups)
+        .map(Arc::new)
+        .collect();
+    let swapper_signers: Vec<_> = keypairs
+        .drain(0..accounts_in_groups)
+        .map(Arc::new)
+        .collect();
+    let src_pubkeys: Vec<_> = keypairs
+        .drain(0..accounts_in_groups)
+        .map(|keypair| keypair.pubkey())
+        .collect();
+    let profit_pubkeys: Vec<_> = keypairs
+        .drain(0..accounts_in_groups)
+        .map(|keypair| keypair.pubkey())
+        .collect();

-    info!("Generating {:?} account keys", total_keys);
-    let mut account_keypairs = generate_keypairs(total_keys);
-    let src_pubkeys: Vec<_> = account_keypairs
-        .drain(0..accounts_in_groups)
-        .map(|keypair| keypair.pubkey())
-        .collect();
-    let profit_pubkeys: Vec<_> = account_keypairs
-        .drain(0..accounts_in_groups)
-        .map(|keypair| keypair.pubkey())
-        .collect();
+    info!("Fund trader accounts");
+    fund_keys(client, &identity, &trader_signers, fund_amount);
+    info!("Fund swapper accounts");
+    fund_keys(client, &identity, &swapper_signers, fund_amount);

    info!("Create {:?} source token accounts", src_pubkeys.len());
    create_token_accounts(client, &trader_signers, &src_pubkeys);
@@ -191,7 +136,6 @@ where
        transfer_delay
    );

-    let exit_signal = Arc::new(AtomicBool::new(false));
    let shared_txs: SharedTransactions = Arc::new(RwLock::new(VecDeque::new()));
    let total_txs_sent_count = Arc::new(AtomicUsize::new(0));
    let s_threads: Vec<_> = (0..threads)
@@ -332,7 +276,7 @@ fn do_tx_transfers<T>(

 struct TradeInfo {
    trade_account: Pubkey,
-    order_info: OrderInfo,
+    order_info: TradeOrderInfo,
 }
 #[allow(clippy::too_many_arguments)]
 fn swapper<T>(
@@ -509,7 +453,7 @@ fn trader<T>(
    T: Client,
 {
    // TODO Hard coded for now
-    let pair = AssetPair::default();
+    let pair = TokenPair::AB;
    let tokens = 1;
    let price = 1000;
    let mut account_group: usize = 0;
@@ -527,21 +471,21 @@ fn trader<T>(
        let mut trade_infos = vec![];
        let start = account_group * batch_size as usize;
        let end = account_group * batch_size as usize + batch_size as usize;
-        let mut side = OrderSide::Ask;
+        let mut direction = Direction::To;
        for (signer, trade, src) in izip!(
            signers[start..end].iter(),
            trade_keys,
            srcs[start..end].iter(),
        ) {
-            side = if side == OrderSide::Ask {
-                OrderSide::Bid
+            direction = if direction == Direction::To {
+                Direction::From
            } else {
-                OrderSide::Ask
+                Direction::To
            };
-            let order_info = OrderInfo {
+            let order_info = TradeOrderInfo {
                /// Owner of the trade order
                owner: Pubkey::default(), // don't care
-                side,
+                direction,
                pair,
                tokens,
                price,
@@ -551,7 +495,7 @@ fn trader<T>(
                trade_account: trade.pubkey(),
                order_info,
            });
-            trades.push((signer, trade.pubkey(), side, src));
+            trades.push((signer, trade.pubkey(), direction, src));
        }
        account_group = (account_group + 1) % account_groups as usize;

@@ -562,7 +506,7 @@ fn trader<T>(
        trades.chunks(chunk_size).for_each(|chunk| {
            let trades_txs: Vec<_> = chunk
                .par_iter()
-                .map(|(signer, trade, side, src)| {
+                .map(|(signer, trade, direction, src)| {
                    let s: &Keypair = &signer;
                    let owner = &signer.pubkey();
                    let space = mem::size_of::<ExchangeState>() as u64;
@@ -571,7 +515,7 @@ fn trader<T>(
                        vec![
                            system_instruction::create_account(owner, trade, 1, space, &id()),
                            exchange_instruction::trade_request(
-                                owner, trade, *side, pair, tokens, price, src,
+                                owner, trade, *direction, pair, tokens, price, src,
                            ),
                        ],
                        blockhash,
@@ -646,21 +590,7 @@ where
    false
 }

-fn verify_funding_transfer<T: SyncClient + ?Sized>(
-    client: &T,
-    tx: &Transaction,
-    amount: u64,
-) -> bool {
-    for a in &tx.message().account_keys[1..] {
-        if client.get_balance(a).unwrap_or(0) >= amount {
-            return true;
-        }
-    }
-
-    false
-}
-
-pub fn fund_keys(client: &dyn Client, source: &Keypair, dests: &[Arc<Keypair>], lamports: u64) {
+pub fn fund_keys(client: &Client, source: &Keypair, dests: &[Arc<Keypair>], lamports: u64) {
    let total = lamports * (dests.len() as u64 + 1);
    let mut funded: Vec<(&Keypair, u64)> = vec![(source, total)];
    let mut notfunded: Vec<&Arc<Keypair>> = dests.iter().collect();
@@ -717,7 +647,6 @@ pub fn fund_keys(client: &dyn Client, source: &Keypair, dests: &[Arc<Keypair>],
                .collect();

            let mut retries = 0;
-            let amount = chunk[0].1[0].1;
            while !to_fund_txs.is_empty() {
                let receivers = to_fund_txs
                    .iter()
@@ -746,7 +675,7 @@ pub fn fund_keys(client: &dyn Client, source: &Keypair, dests: &[Arc<Keypair>],
                let mut waits = 0;
                loop {
                    sleep(Duration::from_millis(200));
-                    to_fund_txs.retain(|(_, tx)| !verify_funding_transfer(client, &tx, amount));
+                    to_fund_txs.retain(|(_, tx)| !verify_transfer(client, &tx));
                    if to_fund_txs.is_empty() {
                        break;
                    }
@@ -778,7 +707,7 @@ pub fn fund_keys(client: &dyn Client, source: &Keypair, dests: &[Arc<Keypair>],
    }
 }

-pub fn create_token_accounts(client: &dyn Client, signers: &[Arc<Keypair>], accounts: &[Pubkey]) {
+pub fn create_token_accounts(client: &Client, signers: &[Arc<Keypair>], accounts: &[Pubkey]) {
    let mut notfunded: Vec<(&Arc<Keypair>, &Pubkey)> = signers.iter().zip(accounts).collect();

    while !notfunded.is_empty() {
@@ -908,7 +837,7 @@ fn generate_keypairs(num: u64) -> Vec<Keypair> {
    rnd.gen_n_keypairs(num)
 }

-pub fn airdrop_lamports(client: &dyn Client, drone_addr: &SocketAddr, id: &Keypair, amount: u64) {
+pub fn airdrop_lamports(client: &Client, drone_addr: &SocketAddr, id: &Keypair, amount: u64) {
    let balance = client.get_balance(&id.pubkey());
    let balance = balance.unwrap_or(0);
    if balance >= amount {
@@ -963,11 +892,11 @@ pub fn airdrop_lamports(client: &dyn Client, drone_addr: &SocketAddr, id: &Keypa
 #[cfg(test)]
 mod tests {
    use super::*;
-    use solana_core::gossip_service::{discover_cluster, get_multi_client};
-    use solana_core::validator::ValidatorConfig;
+    use solana::gossip_service::{discover_cluster, get_clients};
+    use solana::local_cluster::{ClusterConfig, LocalCluster};
+    use solana::validator::ValidatorConfig;
    use solana_drone::drone::run_local_drone;
    use solana_exchange_api::exchange_processor::process_instruction;
-    use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
    use solana_runtime::bank::Bank;
    use solana_runtime::bank_client::BankClient;
    use solana_sdk::genesis_block::create_genesis_block;
@@ -978,6 +907,7 @@ mod tests {
        solana_logger::setup();

        const NUM_NODES: usize = 1;
+        let validator_config = ValidatorConfig::default();

        let mut config = Config::default();
        config.identity = Keypair::new();
@@ -999,7 +929,7 @@ mod tests {
        let cluster = LocalCluster::new(&ClusterConfig {
            node_stakes: vec![100_000; NUM_NODES],
            cluster_lamports: 100_000_000_000_000,
-            validator_configs: vec![ValidatorConfig::default(); NUM_NODES],
+            validator_config,
            native_instruction_processors: [solana_exchange_program!()].to_vec(),
            ..ClusterConfig::default()
        });
@@ -1022,20 +952,25 @@ mod tests {
                exit(1);
            });

-        let (client, num_clients) = get_multi_client(&nodes);
+        let clients = get_clients(&nodes);

-        info!("clients: {}", num_clients);
-        assert!(num_clients >= NUM_NODES);
+        if clients.len() < NUM_NODES {
+            error!(
+                "Error: Insufficient nodes discovered.  Expecting {} or more",
+                NUM_NODES
+            );
+            exit(1);
+        }

        const NUM_SIGNERS: u64 = 2;
        airdrop_lamports(
-            &client,
+            &clients[0],
            &drone_addr,
            &config.identity,
            fund_amount * (accounts_in_groups + 1) as u64 * NUM_SIGNERS,
        );

-        do_bench_exchange(vec![client], config);
+        do_bench_exchange(clients, config);
    }

    #[test]
--- a/bench-exchange/src/cli.rs
+++ b/bench-exchange/src/cli.rs
@@ -1,5 +1,5 @@
 use clap::{crate_description, crate_name, crate_version, value_t, App, Arg, ArgMatches};
-use solana_core::gen_keys::GenKeys;
+use solana::gen_keys::GenKeys;
 use solana_drone::drone::DRONE_PORT;
 use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil};
 use std::net::SocketAddr;
@@ -18,9 +18,6 @@ pub struct Config {
    pub batch_size: usize,
    pub chunk_size: usize,
    pub account_groups: usize,
-    pub client_ids_and_stake_file: String,
-    pub write_to_client_file: bool,
-    pub read_from_client_file: bool,
 }

 impl Default for Config {
@@ -37,9 +34,6 @@ impl Default for Config {
            batch_size: 100,
            chunk_size: 100,
            account_groups: 100,
-            client_ids_and_stake_file: String::new(),
-            write_to_client_file: false,
-            read_from_client_file: false,
        }
    }
 }
@@ -147,20 +141,6 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
                .default_value("10")
                .help("Number of account groups to cycle for each batch"),
        )
-        .arg(
-            Arg::with_name("write-client-keys")
-                .long("write-client-keys")
-                .value_name("FILENAME")
-                .takes_value(true)
-                .help("Generate client keys and stakes and write the list to YAML file"),
-        )
-        .arg(
-            Arg::with_name("read-client-keys")
-                .long("read-client-keys")
-                .value_name("FILENAME")
-                .takes_value(true)
-                .help("Read client keys and stakes from the YAML file"),
-        )
 }

 pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
@@ -204,15 +184,5 @@ pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
    args.account_groups = value_t!(matches.value_of("account-groups"), usize)
        .expect("Failed to parse account-groups");

-    if let Some(s) = matches.value_of("write-client-keys") {
-        args.write_to_client_file = true;
-        args.client_ids_and_stake_file = s.to_string();
-    }
-
-    if let Some(s) = matches.value_of("read-client-keys") {
-        assert!(!args.write_to_client_file);
-        args.read_from_client_file = true;
-        args.client_ids_and_stake_file = s.to_string();
-    }
    args
 }
--- a/bench-exchange/src/main.rs
+++ b/bench-exchange/src/main.rs
@@ -6,9 +6,9 @@ pub mod order_book;
 #[macro_use]
 extern crate solana_exchange_program;

-use crate::bench::{airdrop_lamports, create_client_accounts_file, do_bench_exchange, Config};
+use crate::bench::{airdrop_lamports, do_bench_exchange, Config};
 use log::*;
-use solana_core::gossip_service::{discover_cluster, get_multi_client};
+use solana::gossip_service::{discover_cluster, get_clients};
 use solana_sdk::signature::KeypairUtil;

 fn main() {
@@ -30,12 +30,33 @@ fn main() {
        batch_size,
        chunk_size,
        account_groups,
-        client_ids_and_stake_file,
-        write_to_client_file,
-        read_from_client_file,
        ..
    } = cli_config;

+    info!("Connecting to the cluster");
+    let (nodes, _replicators) =
+        discover_cluster(&entrypoint_addr, num_nodes).unwrap_or_else(|_| {
+            panic!("Failed to discover nodes");
+        });
+
+    let clients = get_clients(&nodes);
+
+    info!("{} nodes found", clients.len());
+    if clients.len() < num_nodes {
+        panic!("Error: Insufficient nodes discovered");
+    }
+
+    info!("Funding keypair: {}", identity.pubkey());
+
+    let accounts_in_groups = batch_size * account_groups;
+    const NUM_SIGNERS: u64 = 2;
+    airdrop_lamports(
+        &clients[0],
+        &drone_addr,
+        &identity,
+        fund_amount * (accounts_in_groups + 1) as u64 * NUM_SIGNERS,
+    );
+
    let config = Config {
        identity,
        threads,
@@ -45,43 +66,7 @@ fn main() {
        batch_size,
        chunk_size,
        account_groups,
-        client_ids_and_stake_file,
-        read_from_client_file,
    };

-    if write_to_client_file {
-        create_client_accounts_file(
-            &config.client_ids_and_stake_file,
-            config.batch_size,
-            config.account_groups,
-            config.fund_amount,
-        );
-    } else {
-        info!("Connecting to the cluster");
-        let (nodes, _replicators) =
-            discover_cluster(&entrypoint_addr, num_nodes).unwrap_or_else(|_| {
-                panic!("Failed to discover nodes");
-            });
-
-        let (client, num_clients) = get_multi_client(&nodes);
-
-        info!("{} nodes found", num_clients);
-        if num_clients < num_nodes {
-            panic!("Error: Insufficient nodes discovered");
-        }
-
-        if !read_from_client_file {
-            info!("Funding keypair: {}", config.identity.pubkey());
-
-            let accounts_in_groups = batch_size * account_groups;
-            const NUM_SIGNERS: u64 = 2;
-            airdrop_lamports(
-                &client,
-                &drone_addr,
-                &config.identity,
-                fund_amount * (accounts_in_groups + 1) as u64 * NUM_SIGNERS,
-            );
-        }
-        do_bench_exchange(vec![client], config);
-    }
+    do_bench_exchange(clients, config);
 }
--- a/bench-exchange/src/order_book.rs
+++ b/bench-exchange/src/order_book.rs
@@ -10,7 +10,7 @@ use std::{error, fmt};
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ToOrder {
    pub pubkey: Pubkey,
-    pub info: OrderInfo,
+    pub info: TradeOrderInfo,
 }

 impl Ord for ToOrder {
@@ -26,7 +26,7 @@ impl PartialOrd for ToOrder {
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct FromOrder {
    pub pubkey: Pubkey,
-    pub info: OrderInfo,
+    pub info: TradeOrderInfo,
 }

 impl Ord for FromOrder {
@@ -95,13 +95,17 @@ impl OrderBook {
    // pub fn cancel(&mut self, pubkey: Pubkey) -> Result<(), Box<dyn error::Error>> {
    //     Ok(())
    // }
-    pub fn push(&mut self, pubkey: Pubkey, info: OrderInfo) -> Result<(), Box<dyn error::Error>> {
-        check_trade(info.side, info.tokens, info.price)?;
-        match info.side {
-            OrderSide::Ask => {
+    pub fn push(
+        &mut self,
+        pubkey: Pubkey,
+        info: TradeOrderInfo,
+    ) -> Result<(), Box<dyn error::Error>> {
+        check_trade(info.direction, info.tokens, info.price)?;
+        match info.direction {
+            Direction::To => {
                self.to_ab.push(ToOrder { pubkey, info });
            }
-            OrderSide::Bid => {
+            Direction::From => {
                self.from_ab.push(FromOrder { pubkey, info });
            }
        }
--- a/bench-streamer/.gitignore
+++ b/bench-streamer/.gitignore
@@ -1,2 +1 @@
 /target/
-/farf/
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -2,17 +2,17 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "0.18.0"
+version = "0.15.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"

 [dependencies]
 clap = "2.33.0"
-solana-core = { path = "../core", version = "0.18.0" }
-solana-logger = { path = "../logger", version = "0.18.0" }
-solana-netutil = { path = "../utils/netutil", version = "0.18.0" }
+solana = { path = "../core", version = "0.15.2"    }
+solana-logger = { path = "../logger", version = "0.15.2"    }
+solana-netutil = { path = "../netutil", version = "0.15.2"    }

 [features]
-cuda = ["solana-core/cuda"]
-
+cuda = ["solana/cuda"]
+erasure = []
--- a/bench-streamer/src/main.rs
+++ b/bench-streamer/src/main.rs
@@ -1,8 +1,7 @@
 use clap::{crate_description, crate_name, crate_version, App, Arg};
-use solana_core::packet::PacketsRecycler;
-use solana_core::packet::{Packet, Packets, BLOB_SIZE, PACKET_DATA_SIZE};
-use solana_core::result::Result;
-use solana_core::streamer::{receiver, PacketReceiver};
+use solana::packet::{Packet, Packets, BLOB_SIZE, PACKET_DATA_SIZE};
+use solana::result::Result;
+use solana::streamer::{receiver, PacketReceiver};
 use std::cmp::max;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
@@ -17,7 +16,7 @@ fn producer(addr: &SocketAddr, exit: Arc<AtomicBool>) -> JoinHandle<()> {
    let send = UdpSocket::bind("0.0.0.0:0").unwrap();
    let mut msgs = Packets::default();
    msgs.packets.resize(10, Packet::default());
-    for w in msgs.packets.iter_mut() {
+    for w in &mut msgs.packets {
        w.meta.size = PACKET_DATA_SIZE;
        w.meta.set_addr(&addr);
    }
@@ -75,7 +74,6 @@ fn main() -> Result<()> {

    let mut read_channels = Vec::new();
    let mut read_threads = Vec::new();
-    let recycler = PacketsRecycler::default();
    for _ in 0..num_sockets {
        let read = solana_netutil::bind_to(port, false).unwrap();
        read.set_read_timeout(Some(Duration::new(1, 0))).unwrap();
@@ -85,13 +83,7 @@ fn main() -> Result<()> {

        let (s_reader, r_reader) = channel();
        read_channels.push(r_reader);
-        read_threads.push(receiver(
-            Arc::new(read),
-            &exit,
-            s_reader,
-            recycler.clone(),
-            "bench-streamer-test",
-        ));
+        read_threads.push(receiver(Arc::new(read), &exit, s_reader));
    }

    let t_producer1 = producer(&addr, exit.clone());
--- a/bench-tps/.gitignore
+++ b/bench-tps/.gitignore
@@ -1,4 +1,3 @@
 /target/
 /config/
 /config-local/
-/farf/
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -2,34 +2,25 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "0.18.0"
+version = "0.15.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"

 [dependencies]
-bincode = "1.1.4"
 clap = "2.33.0"
-log = "0.4.8"
-rayon = "1.1.0"
-serde = "1.0.99"
-serde_derive = "1.0.99"
-serde_json = "1.0.40"
-serde_yaml = "0.8.9"
-solana-core = { path = "../core", version = "0.18.0" }
-solana-local-cluster = { path = "../local_cluster", version = "0.18.0" }
-solana-client = { path = "../client", version = "0.18.0" }
-solana-drone = { path = "../drone", version = "0.18.0" }
-solana-librapay-api = { path = "../programs/librapay_api", version = "0.18.0" }
-solana-logger = { path = "../logger", version = "0.18.0" }
-solana-metrics = { path = "../metrics", version = "0.18.0" }
-solana-measure = { path = "../measure", version = "0.18.0" }
-solana-netutil = { path = "../utils/netutil", version = "0.18.0" }
-solana-runtime = { path = "../runtime", version = "0.18.0" }
-solana-sdk = { path = "../sdk", version = "0.18.0" }
-solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.18.0" }
-solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.18.0" }
+log = "0.4.6"
+rayon = "1.0.3"
+serde_json = "1.0.39"
+solana = { path = "../core", version = "0.15.2"    }
+solana-client = { path = "../client", version = "0.15.2"    }
+solana-drone = { path = "../drone", version = "0.15.2"    }
+solana-logger = { path = "../logger", version = "0.15.2"    }
+solana-metrics = { path = "../metrics", version = "0.15.2"    }
+solana-netutil = { path = "../netutil", version = "0.15.2"    }
+solana-runtime = { path = "../runtime", version = "0.15.2"    }
+solana-sdk = { path = "../sdk", version = "0.15.2"    }

 [features]
-cuda = ["solana-core/cuda"]
-
+cuda = ["solana/cuda"]
+erasure = []
--- a/bench-tps/src/bench.rs
+++ b/bench-tps/src/bench.rs
@@ -1,17 +1,13 @@
 use solana_metrics;

-use bincode;
 use log::*;
 use rayon::prelude::*;
+use solana::gen_keys::GenKeys;
 use solana_client::perf_utils::{sample_txs, SampleStats};
-use solana_core::gen_keys::GenKeys;
 use solana_drone::drone::request_airdrop_transaction;
-use solana_librapay_api::{create_genesis, upload_mint_program, upload_payment_program};
-use solana_measure::measure::Measure;
 use solana_metrics::datapoint_info;
 use solana_sdk::client::Client;
 use solana_sdk::hash::Hash;
-use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::system_instruction;
 use solana_sdk::system_transaction;
@@ -21,6 +17,7 @@ use solana_sdk::transaction::Transaction;
 use std::cmp;
 use std::collections::VecDeque;
 use std::net::SocketAddr;
+use std::process::exit;
 use std::sync::atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering};
 use std::sync::{Arc, RwLock};
 use std::thread::sleep;
@@ -28,17 +25,8 @@ use std::thread::Builder;
 use std::time::Duration;
 use std::time::Instant;

-use solana_librapay_api::librapay_transaction;
-
-pub const MAX_SPENDS_PER_TX: u64 = 4;
-pub const NUM_LAMPORTS_PER_ACCOUNT: u64 = 128;
-
-#[derive(Debug)]
-pub enum BenchTpsError {
-    AirdropFailure,
-}
-
-pub type Result<T> = std::result::Result<T, BenchTpsError>;
+pub const MAX_SPENDS_PER_TX: usize = 4;
+pub const NUM_LAMPORTS_PER_ACCOUNT: u64 = 20;

 pub type SharedTransactions = Arc<RwLock<VecDeque<Vec<(Transaction, u64)>>>>;

@@ -49,7 +37,6 @@ pub struct Config {
    pub duration: Duration,
    pub tx_count: usize,
    pub sustained: bool,
-    pub use_move: bool,
 }

 impl Default for Config {
@@ -61,19 +48,15 @@ impl Default for Config {
            duration: Duration::new(std::u64::MAX, 0),
            tx_count: 500_000,
            sustained: false,
-            use_move: false,
        }
    }
 }

-type LibraKeys = (Keypair, Pubkey, Pubkey, Vec<Keypair>);
-
 pub fn do_bench_tps<T>(
    clients: Vec<T>,
    config: Config,
    gen_keypairs: Vec<Keypair>,
    keypair0_balance: u64,
-    libra_args: Option<LibraKeys>,
 ) -> u64
 where
    T: 'static + Client + Send + Sync,
@@ -85,7 +68,6 @@ where
        duration,
        tx_count,
        sustained,
-        ..
    } = config;

    let clients: Vec<_> = clients.into_iter().map(Arc::new).collect();
@@ -177,7 +159,6 @@ where
            &keypairs[len..],
            threads,
            reclaim_lamports_back_to_source_account,
-            &libra_args,
        );
        // In sustained mode overlap the transfers with generation
        // this has higher average performance but lower peak performance
@@ -234,74 +215,6 @@ fn metrics_submit_lamport_balance(lamport_balance: u64) {
    );
 }

-fn generate_move_txs(
-    source: &[Keypair],
-    dest: &[Keypair],
-    reclaim: bool,
-    move_keypairs: &[Keypair],
-    libra_pay_program_id: &Pubkey,
-    libra_mint_id: &Pubkey,
-    blockhash: &Hash,
-) -> Vec<(Transaction, u64)> {
-    let count = move_keypairs.len() / 2;
-    let source_move = &move_keypairs[..count];
-    let dest_move = &move_keypairs[count..];
-    let pairs: Vec<_> = if !reclaim {
-        source_move
-            .iter()
-            .zip(dest_move.iter())
-            .zip(source.iter())
-            .collect()
-    } else {
-        dest_move
-            .iter()
-            .zip(source_move.iter())
-            .zip(dest.iter())
-            .collect()
-    };
-
-    pairs
-        .par_iter()
-        .map(|((from, to), payer)| {
-            (
-                librapay_transaction::transfer(
-                    libra_pay_program_id,
-                    libra_mint_id,
-                    &payer,
-                    &from,
-                    &to.pubkey(),
-                    1,
-                    *blockhash,
-                ),
-                timestamp(),
-            )
-        })
-        .collect()
-}
-
-fn generate_system_txs(
-    source: &[Keypair],
-    dest: &[Keypair],
-    reclaim: bool,
-    blockhash: &Hash,
-) -> Vec<(Transaction, u64)> {
-    let pairs: Vec<_> = if !reclaim {
-        source.iter().zip(dest.iter()).collect()
-    } else {
-        dest.iter().zip(source.iter()).collect()
-    };
-
-    pairs
-        .par_iter()
-        .map(|(from, to)| {
-            (
-                system_transaction::create_user_account(from, &to.pubkey(), 1, *blockhash),
-                timestamp(),
-            )
-        })
-        .collect()
-}
-
 fn generate_txs(
    shared_txs: &SharedTransactions,
    blockhash: &Hash,
@@ -309,31 +222,25 @@ fn generate_txs(
    dest: &[Keypair],
    threads: usize,
    reclaim: bool,
-    libra_args: &Option<LibraKeys>,
 ) {
    let tx_count = source.len();
    println!("Signing transactions... {} (reclaim={})", tx_count, reclaim);
    let signing_start = Instant::now();

-    let transactions = if let Some((
-        libra_genesis_keypair,
-        libra_pay_program_id,
-        _libra_mint_program_id,
-        libra_keys,
-    )) = libra_args
-    {
-        generate_move_txs(
-            source,
-            dest,
-            reclaim,
-            &libra_keys,
-            libra_pay_program_id,
-            &libra_genesis_keypair.pubkey(),
-            blockhash,
-        )
+    let pairs: Vec<_> = if !reclaim {
+        source.iter().zip(dest.iter()).collect()
    } else {
-        generate_system_txs(source, dest, reclaim, blockhash)
+        dest.iter().zip(source.iter()).collect()
    };
+    let transactions: Vec<_> = pairs
+        .par_iter()
+        .map(|(id, keypair)| {
+            (
+                system_transaction::create_user_account(id, &keypair.pubkey(), 1, *blockhash),
+                timestamp(),
+            )
+        })
+        .collect();

    let duration = signing_start.elapsed();
    let ns = duration.as_secs() * 1_000_000_000 + u64::from(duration.subsec_nanos());
@@ -428,36 +335,23 @@ fn verify_funding_transfer<T: Client>(client: &T, tx: &Transaction, amount: u64)
 /// fund the dests keys by spending all of the source keys into MAX_SPENDS_PER_TX
 /// on every iteration.  This allows us to replay the transfers because the source is either empty,
 /// or full
-pub fn fund_keys<T: Client>(
-    client: &T,
-    source: &Keypair,
-    dests: &[Keypair],
-    total: u64,
-    max_fee: u64,
-    mut extra: u64,
-) {
+pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Keypair], lamports: u64) {
+    let total = lamports * dests.len() as u64;
    let mut funded: Vec<(&Keypair, u64)> = vec![(source, total)];
    let mut notfunded: Vec<&Keypair> = dests.iter().collect();
-    let lamports_per_account = (total - (extra * max_fee)) / (notfunded.len() as u64 + 1);

-    println!(
-        "funding keys {} with lamports: {:?} total: {}",
-        dests.len(),
-        client.get_balance(&source.pubkey()),
-        total
-    );
+    println!("funding keys {}", dests.len());
    while !notfunded.is_empty() {
        let mut new_funded: Vec<(&Keypair, u64)> = vec![];
        let mut to_fund = vec![];
        println!("creating from... {}", funded.len());
        for f in &mut funded {
-            let max_units = cmp::min(notfunded.len() as u64, MAX_SPENDS_PER_TX);
+            let max_units = cmp::min(notfunded.len(), MAX_SPENDS_PER_TX);
            if max_units == 0 {
                break;
            }
-            let start = notfunded.len() - max_units as usize;
-            let fees = if extra > 0 { max_fee } else { 0 };
-            let per_unit = (f.1 - lamports_per_account - fees) / max_units;
+            let start = notfunded.len() - max_units;
+            let per_unit = f.1 / (max_units as u64);
            let moves: Vec<_> = notfunded[start..]
                .iter()
                .map(|k| (k.pubkey(), per_unit))
@@ -469,7 +363,6 @@ pub fn fund_keys<T: Client>(
            if !moves.is_empty() {
                to_fund.push((f.0, moves));
            }
-            extra -= 1;
        }

        // try to transfer a "few" at a time with recent blockhash
@@ -484,10 +377,13 @@ pub fn fund_keys<T: Client>(
            let mut to_fund_txs: Vec<_> = chunk
                .par_iter()
                .map(|(k, m)| {
-                    let tx = Transaction::new_unsigned_instructions(
-                        system_instruction::transfer_many(&k.pubkey(), &m),
-                    );
-                    (k.clone(), tx)
+                    (
+                        k.clone(),
+                        Transaction::new_unsigned_instructions(system_instruction::transfer_many(
+                            &k.pubkey(),
+                            &m,
+                        )),
+                    )
                })
                .collect();

@@ -546,7 +442,7 @@ pub fn airdrop_lamports<T: Client>(
    drone_addr: &SocketAddr,
    id: &Keypair,
    tx_count: u64,
-) -> Result<()> {
+) {
    let starting_balance = client.get_balance(&id.pubkey()).unwrap_or(0);
    metrics_submit_lamport_balance(starting_balance);
    println!("starting balance {}", starting_balance);
@@ -595,10 +491,9 @@ pub fn airdrop_lamports<T: Client>(
                current_balance,
                starting_balance
            );
-            return Err(BenchTpsError::AirdropFailure);
+            exit(1);
        }
    }
-    Ok(())
 }

 fn compute_and_report_stats(
@@ -675,186 +570,31 @@ fn should_switch_directions(num_lamports_per_account: u64, i: u64) -> bool {
    i % (num_lamports_per_account / 4) == 0 && (i >= (3 * num_lamports_per_account) / 4)
 }

-pub fn generate_keypairs(seed_keypair: &Keypair, count: u64) -> (Vec<Keypair>, u64) {
+pub fn generate_keypairs(seed_keypair: &Keypair, count: usize) -> Vec<Keypair> {
    let mut seed = [0u8; 32];
    seed.copy_from_slice(&seed_keypair.to_bytes()[..32]);
    let mut rnd = GenKeys::new(seed);

    let mut total_keys = 0;
-    let mut extra = 0; // This variable tracks the number of keypairs needing extra transaction fees funded
-    let mut delta = 1;
-    while total_keys < count {
-        extra += delta;
-        delta *= MAX_SPENDS_PER_TX;
-        total_keys += delta;
+    let mut target = count;
+    while target > 1 {
+        total_keys += target;
+        // Use the upper bound for this division otherwise it may not generate enough keys
+        target = (target + MAX_SPENDS_PER_TX - 1) / MAX_SPENDS_PER_TX;
    }
-    (rnd.gen_n_keypairs(total_keys), extra)
-}
-
-fn fund_move_keys<T: Client>(
-    client: &T,
-    funding_key: &Keypair,
-    keypairs: &[Keypair],
-    total: u64,
-    libra_pay_program_id: &Pubkey,
-    libra_mint_program_id: &Pubkey,
-    libra_mint_key: &Keypair,
-) {
-    let (mut blockhash, _fee_calculator) = client.get_recent_blockhash().unwrap();
-
-    info!("creating the libra funding account..");
-    let libra_funding_key = Keypair::new();
-    let tx = librapay_transaction::create_account(
-        funding_key,
-        &libra_funding_key.pubkey(),
-        1,
-        blockhash,
-    );
-    client.send_message(&[funding_key], tx.message).unwrap();
-
-    info!("minting to funding keypair");
-    let tx = librapay_transaction::mint_tokens(
-        &libra_mint_program_id,
-        funding_key,
-        libra_mint_key,
-        &libra_funding_key.pubkey(),
-        total,
-        blockhash,
-    );
-    client
-        .send_message(&[funding_key, libra_mint_key], tx.message)
-        .unwrap();
-
-    info!("creating {} move accounts...", keypairs.len());
-    let create_len = 8;
-    let mut funding_time = Measure::start("funding_time");
-    for (i, keys) in keypairs.chunks(create_len).enumerate() {
-        if client.get_balance(&keys[0].pubkey()).unwrap_or(0) > 0 {
-            // already created these accounts.
-            break;
-        }
-
-        let pubkeys: Vec<_> = keys.iter().map(|k| k.pubkey()).collect();
-        let tx = librapay_transaction::create_accounts(funding_key, &pubkeys, 1, blockhash);
-
-        let ser_size = bincode::serialized_size(&tx).unwrap();
-
-        client.send_message(&[funding_key], tx.message).unwrap();
-
-        if i % 10 == 0 {
-            info!(
-                "size: {} created {} accounts of {}",
-                ser_size,
-                i,
-                (keypairs.len() / create_len),
-            );
-        }
-    }
-    funding_time.stop();
-    info!("funding accounts {}ms", funding_time.as_ms());
-
-    const NUM_FUNDING_KEYS: usize = 4;
-    let funding_keys: Vec<_> = (0..NUM_FUNDING_KEYS).map(|_| Keypair::new()).collect();
-    let pubkey_amounts: Vec<_> = funding_keys
-        .iter()
-        .map(|key| (key.pubkey(), total / NUM_FUNDING_KEYS as u64))
-        .collect();
-    let tx = Transaction::new_signed_instructions(
-        &[funding_key],
-        system_instruction::transfer_many(&funding_key.pubkey(), &pubkey_amounts),
-        blockhash,
-    );
-    client.send_message(&[funding_key], tx.message).unwrap();
-    let mut balance = 0;
-    for _ in 0..20 {
-        balance = client.get_balance(&funding_keys[0].pubkey()).unwrap();
-        if balance > 0 {
-            break;
-        } else {
-            sleep(Duration::from_millis(100));
-        }
-    }
-    assert!(balance > 0);
-    info!("funded multiple funding accounts.. {:?}", balance);
-
-    let libra_funding_keys: Vec<_> = (0..NUM_FUNDING_KEYS).map(|_| Keypair::new()).collect();
-    for (i, key) in libra_funding_keys.iter().enumerate() {
-        let tx =
-            librapay_transaction::create_account(&funding_keys[i], &key.pubkey(), 1, blockhash);
-        client
-            .send_message(&[&funding_keys[i]], tx.message)
-            .unwrap();
-
-        let tx = librapay_transaction::transfer(
-            libra_pay_program_id,
-            &libra_mint_key.pubkey(),
-            &funding_keys[i],
-            &libra_funding_key,
-            &key.pubkey(),
-            total / NUM_FUNDING_KEYS as u64,
-            blockhash,
-        );
-        client
-            .send_message(&[&funding_keys[i], &libra_funding_key], tx.message)
-            .unwrap();
-
-        info!("funded libra funding key {}", i);
-    }
-
-    let tx_count = keypairs.len();
-    let amount = total / (tx_count as u64);
-    for (i, keys) in keypairs[..tx_count].chunks(NUM_FUNDING_KEYS).enumerate() {
-        for (j, key) in keys.iter().enumerate() {
-            let tx = librapay_transaction::transfer(
-                libra_pay_program_id,
-                &libra_mint_key.pubkey(),
-                &funding_keys[j],
-                &libra_funding_keys[j],
-                &key.pubkey(),
-                amount,
-                blockhash,
-            );
-
-            let _sig = client
-                .async_send_transaction(tx.clone())
-                .expect("create_account in generate_and_fund_keypairs");
-        }
-
-        info!("sent... checking balance {}", i);
-        for (j, key) in keys.iter().enumerate() {
-            let mut times = 0;
-            loop {
-                let balance =
-                    librapay_transaction::get_libra_balance(client, &key.pubkey()).unwrap();
-                if balance >= amount {
-                    break;
-                } else if times > 20 {
-                    info!("timed out.. {} key: {} balance: {}", i, j, balance);
-                    break;
-                } else {
-                    times += 1;
-                    sleep(Duration::from_millis(100));
-                }
-            }
-        }
-
-        info!("funded: {} of {}", i, keypairs.len() / NUM_FUNDING_KEYS);
-        blockhash = client.get_recent_blockhash().unwrap().0;
-    }
-
-    info!("done funding keys..");
+    rnd.gen_n_keypairs(total_keys as u64)
 }

 pub fn generate_and_fund_keypairs<T: Client>(
    client: &T,
    drone_addr: Option<SocketAddr>,
-    funding_key: &Keypair,
+    funding_pubkey: &Keypair,
    tx_count: usize,
    lamports_per_account: u64,
-    use_move: bool,
-) -> Result<(Vec<Keypair>, Option<LibraKeys>, u64)> {
+) -> (Vec<Keypair>, u64) {
    info!("Creating {} keypairs...", tx_count * 2);
-    let (mut keypairs, extra) = generate_keypairs(funding_key, tx_count as u64 * 2);
+    let mut keypairs = generate_keypairs(funding_pubkey, tx_count * 2);
+
    info!("Get lamports...");

    // Sample the first keypair, see if it has lamports, if so then resume.
@@ -863,86 +603,33 @@ pub fn generate_and_fund_keypairs<T: Client>(
        .get_balance(&keypairs[tx_count * 2 - 1].pubkey())
        .unwrap_or(0);

-    let mut move_keypairs_ret = None;
-
    if lamports_per_account > last_keypair_balance {
-        let (_blockhash, fee_calculator) = client.get_recent_blockhash().unwrap();
-        let account_desired_balance =
-            lamports_per_account - last_keypair_balance + fee_calculator.max_lamports_per_signature;
-        let extra_fees = extra * fee_calculator.max_lamports_per_signature;
-        let mut total = account_desired_balance * (1 + keypairs.len() as u64) + extra_fees;
-        if use_move {
-            total *= 3;
+        let extra = lamports_per_account - last_keypair_balance;
+        let total = extra * (keypairs.len() as u64);
+        if client.get_balance(&funding_pubkey.pubkey()).unwrap_or(0) < total {
+            airdrop_lamports(client, &drone_addr.unwrap(), funding_pubkey, total);
        }
-
-        println!("Previous key balance: {} max_fee: {} lamports_per_account: {} extra: {} desired_balance: {} total: {}",
-                 last_keypair_balance, fee_calculator.max_lamports_per_signature, lamports_per_account, extra,
-                 account_desired_balance, total
-                 );
-
-        if client.get_balance(&funding_key.pubkey()).unwrap_or(0) < total {
-            airdrop_lamports(client, &drone_addr.unwrap(), funding_key, total)?;
-        }
-
-        if use_move {
-            let libra_genesis_keypair = create_genesis(&funding_key, client, 10_000_000);
-            let libra_mint_program_id = upload_mint_program(&funding_key, client);
-            let libra_pay_program_id = upload_payment_program(&funding_key, client);
-
-            // Generate another set of keypairs for move accounts.
-            // Still fund the solana ones which will be used for fees.
-            let seed = [0u8; 32];
-            let mut rnd = GenKeys::new(seed);
-            let move_keypairs = rnd.gen_n_keypairs(tx_count as u64 * 2);
-            fund_move_keys(
-                client,
-                funding_key,
-                &move_keypairs,
-                total / 3,
-                &libra_pay_program_id,
-                &libra_mint_program_id,
-                &libra_genesis_keypair,
-            );
-            move_keypairs_ret = Some((
-                libra_genesis_keypair,
-                libra_pay_program_id,
-                libra_mint_program_id,
-                move_keypairs,
-            ));
-
-            // Give solana keys 1/3 and move keys 1/3 the lamports. Keep 1/3 for fees.
-            total /= 3;
-        }
-
-        fund_keys(
-            client,
-            funding_key,
-            &keypairs,
-            total,
-            fee_calculator.max_lamports_per_signature,
-            extra,
-        );
+        info!("adding more lamports {}", extra);
+        fund_keys(client, funding_pubkey, &keypairs, extra);
    }

    // 'generate_keypairs' generates extra keys to be able to have size-aligned funding batches for fund_keys.
    keypairs.truncate(2 * tx_count);

-    Ok((keypairs, move_keypairs_ret, last_keypair_balance))
+    (keypairs, last_keypair_balance)
 }

 #[cfg(test)]
 mod tests {
-
    use super::*;
+    use solana::cluster_info::FULLNODE_PORT_RANGE;
+    use solana::local_cluster::{ClusterConfig, LocalCluster};
+    use solana::validator::ValidatorConfig;
    use solana_client::thin_client::create_client;
-    use solana_core::cluster_info::FULLNODE_PORT_RANGE;
-    use solana_core::validator::ValidatorConfig;
    use solana_drone::drone::run_local_drone;
-    use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
    use solana_runtime::bank::Bank;
    use solana_runtime::bank_client::BankClient;
    use solana_sdk::client::SyncClient;
-    use solana_sdk::fee_calculator::FeeCalculator;
    use solana_sdk::genesis_block::create_genesis_block;
    use std::sync::mpsc::channel;

@@ -961,68 +648,47 @@ mod tests {
        assert_eq!(should_switch_directions(20, 101), false);
    }

-    fn test_bench_tps_local_cluster(config: Config) {
+    #[test]
+    fn test_bench_tps_local_cluster() {
        solana_logger::setup();
+        let validator_config = ValidatorConfig::default();
        const NUM_NODES: usize = 1;
        let cluster = LocalCluster::new(&ClusterConfig {
            node_stakes: vec![999_990; NUM_NODES],
-            cluster_lamports: 200_000_000,
-            validator_configs: vec![ValidatorConfig::default(); NUM_NODES],
-            native_instruction_processors: vec![solana_move_loader_program!()],
+            cluster_lamports: 2_000_000,
+            validator_config,
            ..ClusterConfig::default()
        });

        let drone_keypair = Keypair::new();
-        cluster.transfer(
-            &cluster.funding_keypair,
-            &drone_keypair.pubkey(),
-            100_000_000,
-        );
+        cluster.transfer(&cluster.funding_keypair, &drone_keypair.pubkey(), 1_000_000);
+
+        let (addr_sender, addr_receiver) = channel();
+        run_local_drone(drone_keypair, addr_sender, None);
+        let drone_addr = addr_receiver.recv_timeout(Duration::from_secs(2)).unwrap();
+
+        let mut config = Config::default();
+        config.tx_count = 100;
+        config.duration = Duration::from_secs(5);

        let client = create_client(
            (cluster.entry_point_info.rpc, cluster.entry_point_info.tpu),
            FULLNODE_PORT_RANGE,
        );

-        let (addr_sender, addr_receiver) = channel();
-        run_local_drone(drone_keypair, addr_sender, None);
-        let drone_addr = addr_receiver.recv_timeout(Duration::from_secs(2)).unwrap();
-
        let lamports_per_account = 100;
-
-        let (keypairs, move_keypairs, _keypair_balance) = generate_and_fund_keypairs(
+        let (keypairs, _keypair_balance) = generate_and_fund_keypairs(
            &client,
            Some(drone_addr),
            &config.id,
            config.tx_count,
            lamports_per_account,
-            config.use_move,
-        )
-        .unwrap();
+        );

-        let total = do_bench_tps(vec![client], config, keypairs, 0, move_keypairs);
+        let total = do_bench_tps(vec![client], config, keypairs, 0);
        assert!(total > 100);
    }

-    #[test]
-    fn test_bench_tps_local_cluster_solana() {
-        let mut config = Config::default();
-        config.tx_count = 100;
-        config.duration = Duration::from_secs(10);
-
-        test_bench_tps_local_cluster(config);
-    }
-
-    #[test]
-    fn test_bench_tps_local_cluster_move() {
-        let mut config = Config::default();
-        config.tx_count = 100;
-        config.duration = Duration::from_secs(20);
-        config.use_move = true;
-
-        test_bench_tps_local_cluster(config);
-    }
-
    #[test]
    fn test_bench_tps_bank_client() {
        let (genesis_block, id) = create_genesis_block(10_000);
@@ -1034,11 +700,10 @@ mod tests {
        config.tx_count = 10;
        config.duration = Duration::from_secs(5);

-        let (keypairs, _move_keypairs, _keypair_balance) =
-            generate_and_fund_keypairs(&clients[0], None, &config.id, config.tx_count, 20, false)
-                .unwrap();
+        let (keypairs, _keypair_balance) =
+            generate_and_fund_keypairs(&clients[0], None, &config.id, config.tx_count, 20);

-        do_bench_tps(clients, config, keypairs, 0, None);
+        do_bench_tps(clients, config, keypairs, 0);
    }

    #[test]
@@ -1049,37 +714,12 @@ mod tests {
        let tx_count = 10;
        let lamports = 20;

-        let (keypairs, _move_keypairs, _keypair_balance) =
-            generate_and_fund_keypairs(&client, None, &id, tx_count, lamports, false).unwrap();
+        let (keypairs, _keypair_balance) =
+            generate_and_fund_keypairs(&client, None, &id, tx_count, lamports);

        for kp in &keypairs {
-            assert_eq!(client.get_balance(&kp.pubkey()).unwrap(), lamports);
-        }
-    }
-
-    #[test]
-    fn test_bench_tps_fund_keys_with_fees() {
-        let (mut genesis_block, id) = create_genesis_block(10_000);
-        let fee_calculator = FeeCalculator::new(11);
-        genesis_block.fee_calculator = fee_calculator;
-        let bank = Bank::new(&genesis_block);
-        let client = BankClient::new(bank);
-        let tx_count = 10;
-        let lamports = 20;
-
-        let (keypairs, _move_keypairs, _keypair_balance) =
-            generate_and_fund_keypairs(&client, None, &id, tx_count, lamports, false).unwrap();
-
-        let max_fee = client
-            .get_recent_blockhash()
-            .unwrap()
-            .1
-            .max_lamports_per_signature;
-        for kp in &keypairs {
-            assert_eq!(
-                client.get_balance(&kp.pubkey()).unwrap(),
-                lamports + max_fee
-            );
+            // TODO: This should be >= lamports, but fails at the moment
+            assert_ne!(client.get_balance(&kp.pubkey()).unwrap(), 0);
        }
    }
 }
--- a/bench-tps/src/cli.rs
+++ b/bench-tps/src/cli.rs
@@ -4,7 +4,6 @@ use std::time::Duration;

 use clap::{crate_description, crate_name, crate_version, App, Arg, ArgMatches};
 use solana_drone::drone::DRONE_PORT;
-use solana_sdk::fee_calculator::FeeCalculator;
 use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil};

 /// Holds the configuration for a single run of the benchmark
@@ -18,11 +17,6 @@ pub struct Config {
    pub tx_count: usize,
    pub thread_batch_sleep_ms: usize,
    pub sustained: bool,
-    pub client_ids_and_stake_file: String,
-    pub write_to_client_file: bool,
-    pub read_from_client_file: bool,
-    pub target_lamports_per_signature: u64,
-    pub use_move: bool,
 }

 impl Default for Config {
@@ -37,11 +31,6 @@ impl Default for Config {
            tx_count: 500_000,
            thread_batch_sleep_ms: 0,
            sustained: false,
-            client_ids_and_stake_file: String::new(),
-            write_to_client_file: false,
-            read_from_client_file: false,
-            target_lamports_per_signature: FeeCalculator::default().target_lamports_per_signature,
-            use_move: false,
        }
    }
 }
@@ -102,11 +91,6 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
                .long("sustained")
                .help("Use sustained performance mode vs. peak mode. This overlaps the tx generation with transfers."),
        )
-        .arg(
-            Arg::with_name("use-move")
-                .long("use-move")
-                .help("Use Move language transactions to perform transfers."),
-        )
        .arg(
            Arg::with_name("tx_count")
                .long("tx_count")
@@ -122,30 +106,6 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
                .takes_value(true)
                .help("Per-thread-per-iteration sleep in ms"),
        )
-        .arg(
-            Arg::with_name("write-client-keys")
-                .long("write-client-keys")
-                .value_name("FILENAME")
-                .takes_value(true)
-                .help("Generate client keys and stakes and write the list to YAML file"),
-        )
-        .arg(
-            Arg::with_name("read-client-keys")
-                .long("read-client-keys")
-                .value_name("FILENAME")
-                .takes_value(true)
-                .help("Read client keys and stakes from the YAML file"),
-        )
-        .arg(
-            Arg::with_name("target_lamports_per_signature")
-                .long("target-lamports-per-signature")
-                .value_name("LAMPORTS")
-                .takes_value(true)
-                .help(
-                    "The cost in lamports that the cluster will charge for signature \
-                     verification when the cluster is operating at target-signatures-per-slot",
-                ),
-        )
 }

 /// Parses a clap `ArgMatches` structure into a `Config`
@@ -203,22 +163,5 @@ pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {

    args.sustained = matches.is_present("sustained");

-    if let Some(s) = matches.value_of("write-client-keys") {
-        args.write_to_client_file = true;
-        args.client_ids_and_stake_file = s.to_string();
-    }
-
-    if let Some(s) = matches.value_of("read-client-keys") {
-        assert!(!args.write_to_client_file);
-        args.read_from_client_file = true;
-        args.client_ids_and_stake_file = s.to_string();
-    }
-
-    if let Some(v) = matches.value_of("target_lamports_per_signature") {
-        args.target_lamports_per_signature = v.to_string().parse().expect("can't parse lamports");
-    }
-
-    args.use_move = matches.is_present("use-move");
-
    args
 }
--- a/bench-tps/src/main.rs
+++ b/bench-tps/src/main.rs
@@ -1,27 +1,12 @@
-#[cfg(test)]
-#[macro_use]
-extern crate solana_move_loader_program;
-
 mod bench;
 mod cli;

-use crate::bench::{
-    do_bench_tps, generate_and_fund_keypairs, generate_keypairs, Config, NUM_LAMPORTS_PER_ACCOUNT,
-};
-use solana_core::gossip_service::{discover_cluster, get_multi_client};
-use solana_sdk::fee_calculator::FeeCalculator;
-use solana_sdk::signature::{Keypair, KeypairUtil};
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::prelude::*;
-use std::path::Path;
+use crate::bench::{do_bench_tps, generate_and_fund_keypairs, Config, NUM_LAMPORTS_PER_ACCOUNT};
+use solana::gossip_service::{discover_cluster, get_clients};
 use std::process::exit;

-/// Number of signatures for all transactions in ~1 week at ~100K TPS
-pub const NUM_SIGNATURES_FOR_TXS: u64 = 100_000 * 60 * 60 * 24 * 7;
-
 fn main() {
-    solana_logger::setup_with_filter("solana=info");
+    solana_logger::setup();
    solana_metrics::set_panic_hook("bench-tps");

    let matches = cli::build_args().get_matches();
@@ -37,45 +22,15 @@ fn main() {
        tx_count,
        thread_batch_sleep_ms,
        sustained,
-        client_ids_and_stake_file,
-        write_to_client_file,
-        read_from_client_file,
-        target_lamports_per_signature,
-        use_move,
    } = cli_config;

-    if write_to_client_file {
-        let (keypairs, _) = generate_keypairs(&id, tx_count as u64 * 2);
-        let num_accounts = keypairs.len() as u64;
-        let max_fee = FeeCalculator::new(target_lamports_per_signature).max_lamports_per_signature;
-        let num_lamports_per_account = (num_accounts - 1 + NUM_SIGNATURES_FOR_TXS * max_fee)
-            / num_accounts
-            + NUM_LAMPORTS_PER_ACCOUNT;
-        let mut accounts = HashMap::new();
-        keypairs.iter().for_each(|keypair| {
-            accounts.insert(
-                serde_json::to_string(&keypair.to_bytes().to_vec()).unwrap(),
-                num_lamports_per_account,
-            );
-        });
-
-        let serialized = serde_yaml::to_string(&accounts).unwrap();
-        let path = Path::new(&client_ids_and_stake_file);
-        let mut file = File::create(path).unwrap();
-        file.write_all(&serialized.into_bytes()).unwrap();
-        return;
-    }
-
    println!("Connecting to the cluster");
    let (nodes, _replicators) =
        discover_cluster(&entrypoint_addr, num_nodes).unwrap_or_else(|err| {
            eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
            exit(1);
        });
-
-    let (client, num_clients) = get_multi_client(&nodes);
-
-    if nodes.len() < num_clients {
+    if nodes.len() < num_nodes {
        eprintln!(
            "Error: Insufficient nodes discovered.  Expecting {} or more",
            num_nodes
@@ -83,38 +38,15 @@ fn main() {
        exit(1);
    }

-    let (keypairs, move_keypairs, keypair_balance) = if read_from_client_file && !use_move {
-        let path = Path::new(&client_ids_and_stake_file);
-        let file = File::open(path).unwrap();
+    let clients = get_clients(&nodes);

-        let accounts: HashMap<String, u64> = serde_yaml::from_reader(file).unwrap();
-        let mut keypairs = vec![];
-        let mut last_balance = 0;
-
-        accounts.into_iter().for_each(|(keypair, balance)| {
-            let bytes: Vec<u8> = serde_json::from_str(keypair.as_str()).unwrap();
-            keypairs.push(Keypair::from_bytes(&bytes).unwrap());
-            last_balance = balance;
-        });
-        // Sort keypairs so that do_bench_tps() uses the same subset of accounts for each run.
-        // This prevents the amount of storage needed for bench-tps accounts from creeping up
-        // across multiple runs.
-        keypairs.sort_by(|x, y| x.pubkey().to_string().cmp(&y.pubkey().to_string()));
-        (keypairs, None, last_balance)
-    } else {
-        generate_and_fund_keypairs(
-            &client,
-            Some(drone_addr),
-            &id,
-            tx_count,
-            NUM_LAMPORTS_PER_ACCOUNT,
-            use_move,
-        )
-        .unwrap_or_else(|e| {
-            eprintln!("Error could not fund keys: {:?}", e);
-            exit(1);
-        })
-    };
+    let (keypairs, keypair_balance) = generate_and_fund_keypairs(
+        &clients[0],
+        Some(drone_addr),
+        &id,
+        tx_count,
+        NUM_LAMPORTS_PER_ACCOUNT,
+    );

    let config = Config {
        id,
@@ -123,14 +55,7 @@ fn main() {
        duration,
        tx_count,
        sustained,
-        use_move,
    };

-    do_bench_tps(
-        vec![client],
-        config,
-        keypairs,
-        keypair_balance,
-        move_keypairs,
-    );
+    do_bench_tps(clients, config, keypairs, keypair_balance);
 }
--- a/book/art/spv-bank-merkle.bob
+++ b/book/art/spv-bank-merkle.bob
@@ -1,18 +0,0 @@
-                             +------------+
-                             | Bank-Merkle|
-                             +------------+
-                                ^      ^
-                               /        \
-               +-----------------+    +-------------+
-               | Bank-Diff-Merkle|    | Block-Merkle|
-               +-----------------+    +-------------+
-                     ^     ^
-                    /       \
-               +------+   +--------------------------+
-               | Hash |   | Previous Bank-Diff-Merkle|
-               +------+   +--------------------------+
-               ^      ^
-              /        \
- +---------------+   +---------------+
- | Hash(Account1)|   | Hash(Account2)|
- +---------------+   +---------------+
--- a/book/art/spv-block-merkle.bob
+++ b/book/art/spv-block-merkle.bob
@@ -1,19 +0,0 @@
-                                   +---------------+
-                                   |  Block-Merkle |
-                                   +---------------+
-                                  ^                ^
-                                 /                  \
-                      +-------------+            +-------------+
-                      | Entry-Merkle|            | Entry-Merkle|
-                      +-------------+            +-------------+
-                         ^                                 ^
-                        /                                   \
-                  +-------+                               +-------+
-                  |  Hash |                               |  Hash |
-                  +-------+                               +-------+
-                 ^        ^                                ^      ^
-                /         |                                |       \
- +-----------------+   +-----------------+   +-----------------+   +---+
- | Hash(T1, status)|   | Hash(T2, status)|   | Hash(T3, status)|   | 0 | 
- +-----------------+   +-----------------+   +-----------------+   +---+
-
--- a/book/build.sh
+++ b/book/build.sh
@@ -3,4 +3,4 @@ set -e

 cd "$(dirname "$0")"

-make -j"$(nproc)" test
+make -j"$(nproc)"
--- a/book/makefile
+++ b/book/makefile
@@ -4,14 +4,11 @@ MD_SRCS=$(wildcard src/*.md)

 SVG_IMGS=$(BOB_SRCS:art/%.bob=src/img/%.svg) $(MSC_SRCS:art/%.msc=src/img/%.svg)

-TARGET=html/index.html
-TEST_STAMP=src/tests.ok
+all: html/index.html

-all: $(TARGET)
+test: src/tests.ok

-test: $(TEST_STAMP)
-
-open: $(TEST_STAMP)
+open: all
 	mdbook build --open

 watch: $(SVG_IMGS)
@@ -29,11 +26,11 @@ src/%.md: %.md
 	@mkdir -p $(@D)
 	@cp $< $@

-$(TEST_STAMP): $(TARGET)
+src/tests.ok: $(SVG_IMGS) $(MD_SRCS)
 	mdbook test
 	touch $@

-$(TARGET): $(SVG_IMGS) $(MD_SRCS)
+html/index.html: src/tests.ok
 	mdbook build

 clean:
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -5,8 +5,7 @@
 - [Terminology](terminology.md)

 - [Getting Started](getting-started.md)
-  - [Testnet Participation](testnet-participation.md)
-  - [Example Client: Web Wallet](webwallet.md)
+  - [Example: Web Wallet](webwallet.md)

 - [Programming Model](programs.md)
  - [Example: Tic-Tac-Toe](tictactoe.md)
@@ -17,7 +16,7 @@
  - [Leader Rotation](leader-rotation.md)
  - [Fork Generation](fork-generation.md)
  - [Managing Forks](managing-forks.md)
-  - [Turbine Block Propagation](turbine-block-propagation.md)
+  - [Data Plane Fanout](data-plane-fanout.md)
  - [Ledger Replication](ledger-replication.md)
  - [Secure Vote Signing](vote-signing.md)
  - [Stake Delegation and Rewards](stake-delegation-and-rewards.md)
@@ -30,28 +29,11 @@
  - [Gossip Service](gossip.md)
  - [The Runtime](runtime.md)

- [Anatomy of a Transaction](transaction.md)
-
- [Running a Validator](running-validator.md)
-  - [Hardware Requirements](validator-hardware.md)
-  - [Choosing a Testnet](validator-testnet.md)
-  - [Installing the Validator Software](validator-software.md)
-  - [Starting a Validator](validator-start.md)
-  - [Staking](validator-stake.md)
-  - [Monitoring a Validator](validator-monitor.md)
-  - [Publishing Validator Info](validator-info.md)
-  - [Troubleshooting](validator-troubleshoot.md)
-  - [FAQ](validator-faq.md)
-
- [Running a Replicator](running-replicator.md)
-
 - [API Reference](api-reference.md)
-  - [Transaction](transaction-api.md)
-  - [Instruction](instruction-api.md)
  - [Blockstreamer](blockstreamer.md)
  - [JSON RPC API](jsonrpc-api.md)
  - [JavaScript API](javascript-api.md)
-  - [solana CLI](cli.md)
+  - [solana-wallet CLI](wallet.md)

 - [Accepted Design Proposals](proposals.md)
  - [Ledger Replication](ledger-replication-to-implement.md)
@@ -71,21 +53,17 @@
 	- [Economic Design MVP](ed_mvp.md)
    - [References](ed_references.md)
  - [Cluster Test Framework](cluster-test-framework.md)
+  - [Credit-only Accounts](credit-only-credit-debit-accounts.md)
+  - [Deterministic Transaction Fees](transaction-fees.md)
  - [Validator](validator-proposal.md)
-  - [Simple Payment and State Verification](simple-payment-and-state-verification.md)
-  - [Cross-Program Invocation](cross-program-invocation.md)

 - [Implemented Design Proposals](implemented-proposals.md)
-  - [Blocktree](blocktree.md)
-  - [Cluster Software Installation and Updates](installer.md)
-  - [Deterministic Transaction Fees](transaction-fees.md)
-  - [Tower BFT](tower-bft.md)
+  - [Fork Selection](fork-selection.md)
  - [Leader-to-Leader Transition](leader-leader-transition.md)
  - [Leader-to-Validator Transition](leader-validator-transition.md)
-  - [Passive Stake Delegation and Rewards](passive-stake-delegation-and-rewards.md)
-  - [Persistent Account Storage](persistent-account-storage.md)
-  - [Reliable Vote Transmission](reliable-vote-transmission.md)
-  - [Repair Service](repair-service.md)
+  - [Testnet Participation](testnet-participation.md)
  - [Testing Programs](testing-programs.md)
-  - [Credit-only Accounts](credit-only-credit-debit-accounts.md)
-  - [Embedding the Move Langauge](embedding-move.md)
+  - [Reliable Vote Transmission](reliable-vote-transmission.md)
+  - [Persistent Account Storage](persistent-account-storage.md)
+  - [Cluster Software Installation and Updates](installer.md)
+  - [Passive Stake Delegation and Rewards](passive-stake-delegation-and-rewards.md)
--- a/book/src/block-confirmation.md
+++ b/book/src/block-confirmation.md
@@ -4,7 +4,7 @@ A validator votes on a PoH hash for two purposes. First, the vote indicates it
 believes the ledger is valid up until that point in time. Second, since many
 valid forks may exist at a given height, the vote also indicates exclusive
 support for the fork. This document describes only the former. The latter is
-described in [Tower BFT](tower-bft.md).
+described in [fork selection](fork-selection.md).

 ## Current Design

@@ -50,11 +50,12 @@ log the time since the NewBlock transaction was submitted.

 ### Finality and Payouts

-[Tower BFT](tower-bft.md) is the proposed fork selection algorithm.  It proposes
-that payment to miners be postponed until the *stack* of validator votes reaches
-a certain depth, at which point rollback is not economically feasible. The vote
-program may therefore implement Tower BFT. Vote instructions would need to
-reference a global Tower account so that it can track cross-block state.
+Locktower is the proposed [fork selection](fork-selection.md) algorithm. It
+proposes that payment to miners be postponed until the *stack* of validator
+votes reaches a certain depth, at which point rollback is not economically
+feasible. The vote program may therefore implement locktower. Vote instructions
+would need to reference a global locktower account so that it can track
+cross-block state.

 ## Challenges

--- a/book/src/cross-program-invocation.md
+++ b/book/src/cross-program-invocation.md
@@ -1,111 +0,0 @@
-# Cross-Program Invocation
-
-## Problem
-
-In today's implementation a client can create a transaction that modifies two
-accounts, each owned by a separate on-chain program:
-
-```rust,ignore
-let message = Message::new(vec![
-    token_instruction::pay(&alice_pubkey),
-    acme_instruction::launch_missiles(&bob_pubkey),
-]);
-client.send_message(&[&alice_keypair, &bob_keypair], &message);
-```
-
-The current implementation does not, however, allow the `acme` program to
-conveniently invoke `token` instructions on the client's behalf:
-
-```rust,ignore
-let message = Message::new(vec![
-    acme_instruction::pay_and_launch_missiles(&alice_pubkey, &bob_pubkey),
-]);
-client.send_message(&[&alice_keypair, &bob_keypair], &message);
-```
-
-Currently, there is no way to create instruction `pay_and_launch_missiles` that executes
-`token_instruction::pay` from the `acme` program. The workaround is to extend the
-`acme` program with the implementation of the `token` program, and create `token`
-accounts with `ACME_PROGRAM_ID`, which the `acme` program is permitted to modify.
-With that workaround, `acme` can modify token-like accounts created by the `acme`
-program, but not token accounts created by the `token` program.
-
-
-## Proposed Solution
-
-The goal of this design is to modify Solana's runtime such that an on-chain
-program can invoke an instruction from another program.
-
-Given two on-chain programs `token` and `acme`, each implementing instructions
-`pay()` and `launch_missiles()` respectively, we would ideally like to implement
-the `acme` module with a call to a function defined in the `token` module:
-
-```rust,ignore
-use token;
-
-fn launch_missiles(keyed_accounts: &[KeyedAccount]) -> Result<()> {
-    ...
-}
-
-fn pay_and_launch_missiles(keyed_accounts: &[KeyedAccount]) -> Result<()> {
-    token::pay(&keyed_accounts[1..])?;
-
-    launch_missiles(keyed_accounts)?;
-}
-```
-
-The above code would require that the `token` crate be dynamically linked,
-so that a custom linker could intercept calls and validate accesses to
-`keyed_accounts`. That is, even though the client intends to modify both
-`token` and `acme` accounts, only `token` program is permitted to modify
-the `token` account, and only the `acme` program is permitted to modify
-the `acme` account.
-
-Backing off from that ideal cross-program call, a slightly more
-verbose solution is to expose token's existing `process_instruction()`
-entrypoint to the acme program:
-
-```rust,ignore
-use token_instruction;
-
-fn launch_missiles(keyed_accounts: &[KeyedAccount]) -> Result<()> {
-    ...
-}
-
-fn pay_and_launch_missiles(keyed_accounts: &[KeyedAccount]) -> Result<()> {
-    let alice_pubkey = keyed_accounts[1].key;
-    let instruction = token_instruction::pay(&alice_pubkey);
-    process_instruction(&instruction)?;
-
-    launch_missiles(keyed_accounts)?;
-}
-```
-
-where `process_instruction()` is built into Solana's runtime and responsible
-for routing the given instruction to the `token` program via the instruction's
-`program_id` field. Before invoking `pay()`, the runtime must also ensure that
-`acme` didn't modify any accounts owned by `token`. It does this by calling
-`runtime::verify_instruction()` and then afterward updating all the `pre_*`
-variables to tentatively commit `acme`'s account modifications. After `pay()`
-completes, the runtime must again ensure that `token` didn't modify any
-accounts owned by `acme`. It should call `verify_instruction()` again, but this
-time with the `token` program ID. Lastly, after `pay_and_launch_missiles()`
-completes, the runtime must call `verify_instruction()` one more time, where it
-normally would, but using all updated `pre_*` variables.  If executing
-`pay_and_launch_missiles()` up to `pay()` made no invalid account changes,
-`pay()` made no invalid changes, and executing from `pay()` until
-`pay_and_launch_missiles()` returns made no invalid changes, then the runtime
-can transitively assume `pay_and_launch_missiles()` as whole made no invalid
-account changes, and therefore commit all account modifications.
-
-### Setting `KeyedAccount.is_signer`
-
-When `process_instruction()` is invoked, the runtime must create a new
-`KeyedAccounts` parameter using the signatures from the *original* transaction
-data. Since the `token` program is immutable and existed on-chain prior to the
-`acme` program, the runtime can safely treat the transaction signature as a
-signature of a transaction with a `token` instruction. When the runtime sees
-the given instruction references `alice_pubkey`, it looks up the key in the
-transaction to see if that key corresponds to a transaction signature. In this
-case it does and so sets `KeyedAccount.is_signer`, thereby authorizing the
-`token` program to modify Alice's account.
--- a/book/src/turbine-block-propagation.md
+++ b/book/src/turbine-block-propagation.md
@@ -1,12 +1,12 @@
-# Turbine Block Propagation
+# Data Plane Fanout

-A Solana cluster uses a multi-layer block propagation mechanism called *Turbine*
-to broadcast transaction blobs to all nodes with minimal amount of duplicate
-messages.  The cluster divides itself into small collections of nodes, called
-*neighborhoods*. Each node is responsible for sharing any data it receives with
-the other nodes in its neighborhood, as well as propagating the data on to a
-small set of nodes in other neighborhoods.  This way each node only has to
-communicate with a small number of nodes.
+A Solana cluster uses a multi-layer mechanism called *data plane fanout* to
+broadcast transaction blobs to all nodes in a very quick and efficient manner.
+In order to establish the fanout, the cluster divides itself into small
+collections of nodes, called *neighborhoods*. Each node is responsible for
+sharing any data it receives with the other nodes in its neighborhood, as well
+as propagating the data on to a small set of nodes in other neighborhoods. 
+This way each node only has to communicate with a small number of nodes.

 During its slot, the leader node distributes blobs between the validator nodes
 in the first neighborhood (layer 0). Each validator shares its data within its
@@ -26,14 +26,6 @@ make up layer 0. These will automatically be the highest stake holders, allowing
 the heaviest votes to come back to the leader first. Layer-0 and lower-layer
 nodes use the same logic to find their neighbors and next layer peers.

-To reduce the possibility of attack vectors, each blob is transmitted over a
-random tree of neighborhoods.  Each node uses the same set of nodes representing
-the cluster.  A random tree is generated from the set for each blob using
-randomness derived from the blob itself.  Since the random seed is not known in
-advance, attacks that try to eclipse neighborhoods from certain leaders or
-blocks become very difficult, and should require almost complete control of the
-stake in the cluster.
-
 ## Layer and Neighborhood Structure

 The current leader makes its initial broadcasts to at most `DATA_PLANE_FANOUT`
--- a/book/src/ed_overview.md
+++ b/book/src/ed_overview.md
@@ -2,15 +2,15 @@

 Solana’s crypto-economic system is designed to promote a healthy, long term self-sustaining economy with participant incentives aligned to the security and decentralization of the network. The main participants in this economy are validation-clients and replication-clients. Their contributions to the network, state validation and data storage respectively, and their requisite remittance mechanisms are discussed below.

-The main channels of participant remittances are referred to as protocol-based rewards and transaction fees. Protocol-based rewards are protocol-derived issuances from a protocol-defined, global inflation rate. These rewards will constitute the total reward delivered to replication clients and a portion of the total rewards for validation clients, the remaining sourced from transaction fees. In the early days of the network, it is likely that protocol-based rewards, deployed based on predefined issuance schedule, will drive the majority of participant incentives to join the network.
+The main channels of participant remittances are referred to as protocol-based rewards and transaction fees. Protocol-based rewards are protocol-derived issuances from a network-controlled reserve of tokens (sometimes referred to as the ‘mining pool’). These rewards will constitute the total reward delivered to replication clients and a portion of the total rewards for validation clients, the remaining sourced from transaction fees. In the early days of the network, it is likely that protocol-based rewards, deployed based on predefined issuance schedule, will drive the majority of participant incentives to join the network.

-These protocol-based rewards, to be distributed to participating validation and replication clients, are to be a result of a global supply inflation rate, calculated per Solana epoch and distributed amongst the active validator set. As discussed further below, the per annum inflation rate is based on a pre-determined disinflationary schedule. This provides the network with monetary supply predictability which supports long term economic stability and security. 
+These protocol-based rewards, to be distributed to participating validation and replication clients, are to be specified as annual interest rates calculated per, real-time, Solana epoch [DEFINITION]. As discussed further below, the issuance rates are determined as a function of total network validator staked percentage and total replication provided by replicators in each previous epoch. The choice for validator and replicator client rewards to be based on participation rates, rather than a global fixed inflation or interest rate, emphasizes a protocol priority of overall economic security, rather than monetary supply predictability. Due to Solana’s hard total supply cap of 1B tokens and the bounds of client participant rates in the protocol, we believe that global interest, and supply issuance, scenarios should be able to be modeled with reasonable uncertainties.

-Transaction fees are market-based participant-to-participant transfers, attached to network interactions as a necessary motivation and compensation for the inclusion and execution of a proposed transaction (be it a state execution or proof-of-replication verification). A mechanism for continuous and long-term economic stability through partial burning of each transaction fee is also discussed below.
+Transaction fees are market-based participant-to-participant transfers, attached to network interactions as a necessary motivation and compensation for the inclusion and execution of a proposed transaction (be it a state execution or proof-of-replication verification). A mechanism for continuous and long-term funding of the mining pool through a pre-dedicated portion of transaction fees is also discussed below.

-A high-level schematic of Solana’s crypto-economic design is shown below in **Figure 1**. The specifics of validation-client economics are described in sections: [Validation-client Economics](ed_validation_client_economics.md), [State-validation Protocol-based Rewards](ed_vce_state_validation_protocol_based_rewards.md), [State-validation Transaction Fees](ed_vce_state_validation_transaction_fees.md) and [Replication-validation Transaction Fees](ed_vce_replication_validation_transaction_fees.md). Also, the chapter titled [Validation Stake Delegation](ed_vce_validation_stake_delegation.md) closes with a discussion of validator delegation opportunties and marketplace. Additionally, in [Storage Rent Economics](ed_storage_rend_economics.md), we describe an implementation of storage rent to account for the externality costs of maintaining the active state of the ledger. The [Replication-client Economics](ed_replication_client_economics.md) chapter will review the Solana network design for global ledger storage/redundancy and replicator-client economics ([Storage-replication rewards](ed_rce_storage_replication_rewards.md)) along with a replicator-to-validator delegation mechanism designed to aide participant on-boarding into the Solana economy discussed in [Replication-client Reward Auto-delegation](ed_rce_replication_client_reward_auto_delegation.md). The [Economic Sustainability](ed_economic_sustainability.md) section dives deeper into Solana’s design for long-term economic sustainability and outlines the constraints and conditions for a self-sustaining economy. An outline of features for an MVP economic design is discussed in the [Economic Design MVP](ed_mvp.md) section. Finally, in chapter [Attack Vectors](ed_attack_vectors.md), various attack vectors will be described and potential vulnerabilities explored and parameterized.
+A high-level schematic of Solana’s crypto-economic design is shown below in **Figure 1**. The specifics of validation-client economics are described in sections: [Validation-client Economics](ed_validation_client_economics.md), [State-validation Protocol-based Rewards](ed_vce_state_validation_protocol_based_rewards.md), [State-validation Transaction Fees](ed_vce_state_validation_transaction_fees.md) and [Replication-validation Transaction Fees](ed_vce_replication_validation_transaction_fees.md). Also, the chapter titled [Validation Stake Delegation](ed_vce_validation_stake_delegation.md) closes with a discussion of validator delegation opportunties and marketplace. The [Replication-client Economics](ed_replication_client_economics.md) chapter will review the Solana network design for global ledger storage/redundancy and replicator-client economics ([Storage-replication rewards](ed_rce_storage_replication_rewards.md)) along with a replicator-to-validator delegation mechanism designed to aide participant on-boarding into the Solana economy discussed in [Replication-client Reward Auto-delegation](ed_rce_replication_client_reward_auto_delegation.md). The [Economic Sustainability](ed_economic_sustainability.md) section dives deeper into Solana’s design for long-term economic sustainability and outlines the constraints and conditions for a self-sustaining economy. An outline of features for an MVP economic design is discussed in the [Economic Design MVP](ed_mvp.md) section. Finally, in chapter [Attack Vectors](ed_attack_vectors.md), various attack vectors will be described and potential vulnerabilities explored and parameterized.

 <!-- ![img alt text](solana_economic_design.png) -->
-<p style="text-align:center;"><img src="img/economic_design_infl_230719.png" alt="== Solana Economic Design Diagram ==" width="800"/></p>
+<p style="text-align:center;"><img src="img/solana_economic_design.png" alt="== Solana Economic Design Diagram ==" width="800"/></p>

 **Figure 1**: Schematic overview of Solana economic incentive design.
--- a/book/src/ed_validation_client_economics.md
+++ b/book/src/ed_validation_client_economics.md
@@ -1,3 +1,3 @@
 ## Validation-client Economics

-Validator-clients are eligible to receive protocol-based (i.e. via inflation) rewards issued via stake-based annual interest rates (calculated per epoch) by providing compute (CPU+GPU) resources to validate and vote on a given PoH state. These protocol-based rewards are determined through an algorithmic disinflationary schedule as a function of total amount of circulating tokens. Additionally, these clients may earn revenue through fees via state-validation transactions and Proof-of-Replication (PoRep) transactions. For clarity, we separately describe the design and motivation of these revenue distriubutions for validation-clients below: state-validation protocol-based rewards, state-validation transaction fees and rent,  and PoRep-validation transaction fees.
+Validator-clients are eligible to receive protocol-based (i.e. via mining pool) rewards issued via stake-based annual interest rates by providing compute (CPU+GPU) resources to validate and vote on a given PoH state. These protocol-based rewards are determined through an algorithmic schedule as a function of total amount of Solana tokens staked in the system and duration since network launch (genesis block). Additionally, these clients may earn revenue through two types of transaction fees: state-validation transaction fees and pooled Proof-of-Replication (PoRep) transaction fees. The distribution of these two types of transaction fees to the participating validation set are designed independently as economic goals and attack vectors are unique between the state- generation/validation mechanism and the ledger replication/validation mechanism. For clarity, we separately describe the design and motivation of the three types of potential revenue streams for validation-clients below: state-validation protocol-based rewards, state-validation transaction fees and PoRep-validation transaction fees.
--- a/book/src/ed_vce_replication_validation_transaction_fees.md
+++ b/book/src/ed_vce_replication_validation_transaction_fees.md
@@ -2,8 +2,8 @@

 As previously mentioned, validator-clients will also be responsible for validating PoReps submitted into the PoH stream by replicator-clients. In this case, validators are providing compute (CPU/GPU) and light storage resources to confirm that these replication proofs could only be generated by a client that is storing the referenced PoH leger block.2

-While replication-clients are incentivized and rewarded through protocol-based rewards schedule (see [Replication-client Economics](ed_replication_client_economics.md)), validator-clients will be incentivized to include and validate PoReps in PoH through collection of transaction fees associated with the submitted PoReps and distribution of protocol rewards proportional to the validated PoReps. As will be described in detail in the Section 3.1, replication-client rewards are protocol-based and designed to reward based on a global data redundancy factor. I.e. the protocol will incentivize replication-client participation through rewards based on a target ledger redundancy (e.g. 10x data redundancy). 
+While replication-clients are incentivized and rewarded through protocol-based rewards schedule (see [Replication-client Economics](ed_replication_client_economics.md)), validator-clients will be incentivized to include and validate PoReps in PoH through the distribution of the transaction fees associated with the submitted PoRep. As will be described in detail in the Section 3.1, replication-client rewards are protocol-based and designed to reward based on a global data redundancy factor. I.e. the protocol will incentivize replication-client participation through rewards based on a target ledger redundancy (e.g. 10x data redundancy). It was chosen not to include a distribution of these rewards to PoRep validators, and to rely only on the collection of PoRep attached transaction fees, due to the fact that the confluence of two participation incentive modes (state-validation inflation rate via global staked % and replication-validation rewards based on global redundancy factor) on the incentives of a single network participant (a validator-client) potentially opened up a significant incentive-driven attack surface area.

-The validation of PoReps by validation-clients is computationally more expensive than state-validation (detail in the [Economic Sustainability](ed_economic_sustainability.md) chapter), thus the transaction fees are expected to be proportionally higher. 
+The validation of PoReps by validation-clients is computationally more expensive than state-validation (detail in the [Economic Sustainability](ed_economic_sustainability.md) chapter), thus the transaction fees are expected to be proportionally higher. However, because replication-client rewards are distributed in proportion to and only after submitted PoReps are validated, they are uniquely motivated for the inclusion and validation of their proofs. This pressure is expected to generate an adequate market economy between replication-clients and validation-clients. Additionally, transaction fees submitted with PoReps have no minimum amount pre-allocated to the mining pool, as do state-validation transaction fees.

-There are various attack vectors available for colluding validation and replication clients, as described in detail below in [Economic Sustainability](ed_economic_sustainability). To protect against various collusion attack vectors, for a given epoch, validator rewards are distributed across participating validation-clients in proportion to the number of validated PoReps in the epoch less the number of PoReps that mismatch the replicators challenge. The PoRep challenge game is described in [Ledger Replication](https://github.com/solana-labs/solana/blob/master/book/src/ledger-replication.md#the-porep-game). This design rewards validators proportional to the number of PoReps they process and validate, while providing negative pressure for validation-clients to submit lazy or malicious invalid votes on submitted PoReps (note that it is computationally prohibitive to determine whether a validator-client has marked a valid PoRep as invalid).
+There are various attack vectors available for colluding validation and replication clients, as described in detail below in [Economic Sustainability](ed_economic_sustainability). To protect against various collusion attack vectors, for a given epoch, PoRep transaction fees are pooled, and redistributed across participating validation-clients in proportion to the number of validated PoReps in the epoch less the number of invalidated PoReps [DIAGRAM]. This design rewards validators proportional to the number of PoReps they process and validate, while providing negative pressure for validation-clients to submit lazy or malicious invalid votes on submitted PoReps (note that it is computationally prohibitive to determine whether a validator-client has marked a valid PoRep as invalid).
--- a/book/src/ed_vce_state_validation_protocol_based_rewards.md
+++ b/book/src/ed_vce_state_validation_protocol_based_rewards.md
@@ -1,40 +1,46 @@
 ### State-validation protocol-based rewards

-Validator-clients have two functional roles in the Solana network:
+Validator-clients have two functional roles in the Solana network

-* Validate (vote) the current global state of that PoH along with any Proofs-of-Replication (see [Replication Client Economics](ed_replication_client_economics.md)) that they are eligible to validate.
+* Validate (vote) the current global state of that PoH along with any Proofs-of-Replication (see [Replication Client Economics](ed_replication_client_economics.md)) that they are eligible to validate

 * Be elected as ‘leader’ on a stake-weighted round-robin schedule during which time they are responsible for collecting outstanding transactions and Proofs-of-Replication and incorporating them into the PoH, thus updating the global state of the network and providing chain continuity.

-Validator-client rewards for these services are to be distributed at the end of each Solana epoch. Compensation for validator-clients is provided via a protocol-based annual inflation rate dispersed in proportion to the stake-weight of each validator (see below) along with leader-claimed transaction fees available during each leader rotation. I.e. during the time a given validator-client is elected as leader, it has the opportunity to keep a portion of each transaction fee, less a protocol-specified amount that is destroyed (see [Validation-client State Transaction Fees](ed_vce_state_validation_transaction_fees.md)). PoRep transaction fees are also collected by the leader client and validator PoRep rewards are distributed in proportion to the number of validated PoReps less the number of PoReps that mismatch a replicator's challenge. (see [Replication-client Transaction Fees](ed_vce_replication_validation_transaction_fees.md))
+Validator-client rewards for these services are to be distributed at the end of each Solana epoch. Compensation for validator-clients is provided via a protocol-based annual interest rate dispersed in proportion to the stake-weight of each validator (see below) along with leader-claimed transaction fees available during each leader rotation. I.e. during the time a given validator-client is elected as leader, it has the opportunity to keep a portion of each non-PoRep transaction fee, less a protocol-specified amount that is returned to the mining pool (see [Validation-client State Transaction Fees](ed_vce_state_validation_transaction_fees.md)). PoRep transaction fees are not collected directly by the leader client but pooled and returned to the validator set in proportion to the number of successfully validated PoReps. (see [Replication-client Transaction Fees](ed_vce_replication_validation_transaction_fees.md))


-The effective protocol-based annual interest rate (%) per epoch to be distributed to validation-clients is to be a function of:
+The protocol-based annual interest-rate (%) per epoch to be distributed to validation-clients is to be a function of:

-* the current global inflation rate, derived from the pre-determined dis-inflationary issuance schedule
+* the current fraction of staked SOLs out of the current total circulating supply,

-* the fraction of staked SOLs out of the current total circulating supply,
+* the global time since the genesis block instantiation

-* the up-time/participation [% of available slots that validator had opportunity to vote on] of a given validator over the previous epoch.
+* the up-time/participation [% of available slots/blocks that validator had opportunity to vote on?] of a given validator over the previous epoch.

-The first factor is a function of protocol parameters only (i.e. independent of validator behavior in a given epoch) and results in a global validation reward schedule designed to incentivize early participation, provide clear montetary stability and provide optimal security in the network. 
+The first two factors are protocol parameters only (i.e. independent of validator behavior in a given epoch) and describe a global validation reward schedule designed to both incentivize early participation and optimal security in the network. This schedule sets a maximum annual validator-client interest rate per epoch.

-At any given point in time, a specific validator's interest rate can be determined based on the porportion of circulating supply that is staked by the network and the validator's uptime/activity in the previous epoch. For an illustrative example, consider a hypothetical instance of the network with an initial circulating token supply of 250MM tokens with an additional 250MM vesting over 3 years. Additionally an inflation rate is specified at network launch of 7.5%, and a disinflationary schedule of 20% decrease in inflation rate per year (the actual rates to be implemented are to be worked out during the testnet experimentation phase of mainnet launch). With these broad assumptions, the 10-year inflation rate (adjusted daily for this example) is shown in **Figure 2**, while the total circulating token supply is illustrated in **Figure 3**. Neglected in this toy-model is the inflation supression due to the portion of each transaction fee that is to be destroyed.
+At any given point in time, this interest rate is pegged to a defined value given a specific % staked SOL out of the circulating supply (e.g. 10% interest rate when 66% of circulating SOL is staked). The interest rate adjusts as the square-root [TBD] of the % staked, leading to higher validation-client interest rates as the % staked drops below the targeted goal, thus incentivizing more participation leading to more security in the network. An example of such a schedule, for a specified point in time (e.g. network launch) is shown in **Table 1**.

-<p style="text-align:center;"><img src="img/p_ex_schedule.png" alt="drawing" width="800"/></p>
-**Figure 2:** In this example schedule, the annual inflation rate [%] reduces at around 20% per year, until it reaches the long-term, fixed, 1.5% rate.
+| Percentage circulating supply staked [%] | Annual validator-client interest rate [%] |
+| ---:    | ---:      |
+| 5       | 13.87     |
+| 15      | 13.31     |
+| 25      | 12.73     |
+| 35      | 12.12     |
+| 45      | 11.48     |
+| 55      | 10.80     |
+| **66**  | **10.00** |
+| 75      | 9.29      |
+| 85      | 8.44      |    

-<p style="text-align:center;"><img src="img/p_ex_supply.png" alt="drawing" width="800"/></p>
-**Figure 3:** The total token supply over a 10-year period, based on an initial 250MM tokens with the disinflationary inflation schedule as shown in **Figure 2**
+**Table 1:** Example interest rate schedule based on % SOL staked out of circulating supply. In this case, interest rates are fixed at 10% for 66% of staked circulating supply

-Over time, the interest rate, at a fixed network staked percentage, will reduce concordant with network inflation. Validation-client interest rates are designed to be higher in the early days of the network to incentivize participation and jumpstart the network economy. As previously mentioned, the inflation rate is expected to stabalize near 1-2% which also results in a fixed, long-term, interest rate to be provided to validator-clients. This value does not represent the total interest available to validator-clients as transaction fees for both state-validation and ledger storage replication (PoReps) are not accounted for here. 
-
-Given these example parameters, annualized validator-specific interest rates can be determined based on the global fraction of tokens bonded as stake, as well as their uptime/activity in the previous epoch. For the purpose of this example, we assume 100% uptime for all validators and a split in interest-based rewards between validators and replicator nodes of 80%/20%. Additionally, the fraction of staked circulating supply is assummed to be constant. Based on these assumptions, an annualized validation-client interest rate schedule as a function of % circulating token supply that is staked is shown in** Figure 4**.
+Over time, the interest rate, at any network staked percentage, will drop as described by an algorithmic schedule. Validation-client interest rates are designed to be higher in the early days of the network to incentivize participation and jumpstart the network economy. This mining-pool provided interest rate will reduce over time until a network-chosen baseline value is reached. This is a fixed, long-term, interest rate to be provided to validator-clients. This value does not represent the total interest available to validator-clients as transaction fees for both state-validation and ledger storage replication (PoReps) are not accounted for here. A validation-client interest rate schedule as a function of % network staked and time is shown in** Figure 2**.

 <!-- ![== Validation Client Interest Rates Figure ==](validation_client_interest_rates.png =250x) -->

-<p style="text-align:center;"><img src="img/p_ex_interest.png" alt="drawing" width="800"/></p>
+<p style="text-align:center;"><img src="img/validation_client_interest_rates.png" alt="drawing" width="800"/></p>

-**Figure 4:** Shown here are example validator interest rates over time, neglecting transaction fees, segmented by fraction of total circulating supply bonded as stake.
+**Figure 2:** In this example schedule, the annual interest rate [%] reduces at around 16.7% per year, until it reaches the long-term, fixed, 4% rate.

-This epoch-specific protocol-defined interest rate sets an upper limit of *protocol-generated* annual interest rate (not absolute total interest rate) possible to be delivered to any validator-client per epoch. The distributed interest rate per epoch is then discounted from this value based on the participation of the validator-client during the previous epoch.
+This epoch-specific protocol-defined interest rate sets an upper limit of *protocol-generated* annual interest rate (not absolute total interest rate) possible to be delivered to any validator-client per epoch. The distributed interest rate per epoch is then discounted from this value based on the participation of the validator-client during the previous epoch. Each epoch is comprised of XXX slots. The protocol-defined interest rate is then discounted by the log [TBD] of the % of slots a given validator submitted a vote on a PoH branch during that epoch, see **Figure XX**
--- a/book/src/ed_vce_state_validation_transaction_fees.md
+++ b/book/src/ed_vce_state_validation_transaction_fees.md
@@ -1,6 +1,6 @@
 ### State-validation Transaction Fees

-Each transaction sent through the network, to be processed by the current leader validation-client and confirmed as a global state transaction, must contain a transaction fee. Transaction fees offer many benefits in the Solana economic design, for example they:
+Each message sent through the network, to be processed by the current leader validation-client and confirmed as a global state transaction, must contain a transaction fee. Transaction fees offer many benefits in the Solana economic design, for example they:

 * provide unit compensation to the validator network for the CPU/GPU resources necessary to process the state transaction,

@@ -10,11 +10,11 @@ Each transaction sent through the network, to be processed by the current leader

 * and provide potential long-term economic stability of the network through a protocol-captured minimum fee amount per transaction, as described below.

-Many current blockchain economies (e.g. Bitcoin, Ethereum), rely on protocol-based rewards to support the economy in the short term, with the assumption that the revenue generated through transaction fees will support the economy in the long term, when the protocol derived rewards expire. In an attempt to create a sustainable economy through protocol-based rewards and transaction fees, a fixed portion of each transaction fee is destroyed, with the remaining fee going to the current leader processing the transaction. A scheduled global inflation rate provides a source for rewards distributed to validation-clients, through the process described above, and replication-clients, as discussed below. 
+Many current blockchain economies (e.g. Bitcoin, Ethereum), rely on protocol-based rewards to support the economy in the short term, with the assumption that the revenue generated through transaction fees will support the economy in the long term, when the protocol derived rewards expire. In an attempt to create a sustainable economy through protocol-based rewards and transaction fees, a fixed portion of each transaction fee is sent to the mining pool, with the resulting fee going to the current leader processing the transaction. These pooled fees, then re-enter the system through rewards distributed to validation-clients, through the process described above, and replication-clients, as discussed below.

-Transaction fees are set by the network cluster based on recent historical throughput, see [Congestion Driven Fees](transaction-fees.md#congestion-driven-fees). This minimum portion of each transaction fee can be dynamically adjusted depending on historical gas usage. In this way, the protocol can use the minimum fee to target a desired hardware utilisation. By monitoring a protocol specified gas usage with respect to a desired, target usage amount, the minimum fee can be raised/lowered which should, in turn, lower/raise the actual gas usage per block until it reaches the target amount. This adjustment process can be thought of as similar to the difficulty adjustment algorithm in the Bitcoin protocol, however in this case it is adjusting the minimum transaction fee to guide the transaction processing hardware usage to a desired level. 
+The intent of this design is to retain leader incentive to include as many transactions as possible within the leader-slot time, while providing a redistribution avenue that protects against "tax evasion" attacks (i.e. side-channel fee payments)<sup>[1](ed_referenced.md)</sup>. Constraints on the fixed portion of transaction fees going to the mining pool, to establish long-term economic sustainability, are established and discussed in detail in the [Economic Sustainability](ed_economic_sustainability.md) section.

-As mentioned, a fixed-proportion of each transaction fee is to be destroyed. The intent of this design is to retain leader incentive to include as many transactions as possible within the leader-slot time, while providing an inflation limiting mechansim that protects against "tax evasion" attacks (i.e. side-channel fee payments)<sup>[1](ed_referenced.md)</sup>. 
+This minimum, protocol-earmarked, portion of each transaction fee can be dynamically adjusted depending on historical gas usage. In this way, the protocol can use the minimum fee to target a desired hardware utilisation. By monitoring a protocol specified gas usage with respect to a desired, target usage amount (e.g. 50% of a block's capacity), the minimum fee can be raised/lowered which should, in turn, lower/raise the actual gas usage per block until it reaches the target amount. This adjustment process can be thought of as similar to the difficulty adjustment algorithm in the Bitcoin protocol, however in this case it is adjusting the minimum transaction fee to guide the transaction processing hardware usage to a desired level.

-Additionally, the burnt fees can be a consideration in fork selection. In the case of a PoH fork with a  malicious, censoring leader, we would expect the total fees destroyed to be less than a comparable honest fork, due to the fees lost from censoring. If the censoring leader is to compensate for these lost protocol fees, they would have to replace the burnt fees on their fork themselves, thus potentially reducing the incentive to censor in the first place. 
+Additionally, the minimum protocol captured fee can be a consideration in fork selection. In the case of a PoH fork with a  malicious, censoring leader, we would expect the total procotol captured fee to be less than a comparable honest fork, due to the fees lost from censoring. If the censoring leader is to compensate for these lost protocol fees, they would have to replace the fees on their fork themselves, thus potentially reducing the incentive to censor in the first place. 

--- a/book/src/embedding-move.md
+++ b/book/src/embedding-move.md
@@ -1,66 +0,0 @@
-# Embedding the Move Language
-
-## Problem
-
-Solana enables developers to write on-chain programs in general purpose
-programming languages such as C or Rust, but those programs contain
-Solana-specific mechanisms. For example, there isn't another chain that asks
-developers to create a Rust module with a `process_instruction(KeyedAccounts)`
-function. Whenever practical, Solana should offer dApp developers more portable
-options.
-
-Until just recently, no popular blockchain offered a language that could expose
-the value of Solana's massively parallel [runtime](runtime.md). Solidity
-contracts, for example, do not separate references to shared data from contract
-code, and therefore need to be executed serially to ensure deterministic
-behavior.  In practice we see that the most aggressively optimized EVM-based
-blockchains all seem to peak out around 1,200 TPS - a small fraction of what
-Solana can do. The Libra project, on the other hand, designed an on-chain
-programming language called Move that is more suitable for parallel execution.
-Like Solana's runtime, Move programs depend on accounts for all shared state.
-
-The biggest design difference between Solana's runtime and Libra's Move VM is
-how they manage safe invocations between modules.  Solana took an operating
-systems approach and Libra took the domain-specific language approach.  In the
-runtime, a module must trap back into the runtime to ensure the caller's module
-did not write to data owned by the callee. Likewise, when the callee completes,
-it must again trap back to the runtime to ensure the callee did not write to
-data owned by the caller. Move, on the other hand, includes an advanced type
-system that allows these checks to be run by its bytecode verifier. Because
-Move bytecode can be verified, the cost of verification is paid just once, at
-the time the module is loaded on-chain. In the runtime, the cost is paid each
-time a transaction crosses between modules. The difference is similar in spirit
-to the difference between a dynamically-typed language like Python versus a
-statically-typed language like Java. Solana's runtime allows dApps to be
-written in general purpose programming languages, but that comes with the cost
-of runtime checks when jumping between programs.
-
-This proposal attempts to define a way to embed the Move VM such that:
-
-* cross-module invocations within Move do not require the runtime's
-  cross-program runtime checks
-* Move programs can leverage functionality in other Solana programs and vice
-  versa
-* Solana's runtime parallelism is exposed to batches of Move and non-Move
-  transactions
-
-## Proposed Solution
-
-### Move VM as a Solana loader
-
-The Move VM shall be embedded as a Solana loader under the identifier
-`MOVE_PROGRAM_ID`, so that Move modules can be marked as `executable` with the
-VM as its `owner`. This will allow modules to load module dependencies, as well
-as allow for parallel execution of Move scripts.
-
-All data accounts owned by Move modules must set their owners to the loader,
-`MOVE_PROGRAM_ID`. Since Move modules encapsulate their account data in the
-same way Solana programs encapsulate theirs, the Move module owner should be
-embedded in the account data. The runtime will grant write access to the Move
-VM, and Move grants access to the module accounts.
-
-### Interacting with Solana programs
-
-To invoke instructions in non-Move programs, Solana would need to extend the
-Move VM with a `process_instruction()` system call. It would work the same as
-`process_instruction()` Rust BPF programs.
--- a/book/src/fork-generation.md
+++ b/book/src/fork-generation.md
@@ -55,7 +55,7 @@ Validators can ignore forks at other points (e.g. from the wrong leader), or
 slash the leader responsible for the fork.

 Validators vote based on a greedy choice to maximize their reward described in
-[Tower BFT](tower-bft.md).
+[forks selection](fork-selection.md).

 ### Validator's View

--- a/book/src/fork-selection.md
+++ b/book/src/fork-selection.md
@@ -1,7 +1,7 @@
-# Tower BFT
+# Fork Selection

-This design describes Solana's *Tower BFT* algorithm. It addresses the
-following problems:
+This design describes a *Fork Selection* algorithm. It addresses the following
+problems:

 * Some forks may not end up accepted by the super-majority of the cluster, and
 voters need to recover from voting on such forks.
--- a/book/src/getting-started.md
+++ b/book/src/getting-started.md
@@ -161,7 +161,7 @@ This will dump all the threads stack traces into gdb.txt
 In this example the client connects to our public testnet. To run validators on the testnet you would need to open udp ports `8000-10000`.

 ```bash
-$ ./multinode-demo/client.sh --entrypoint testnet.solana.com:8001 --drone testnet.solana.com:9900 --duration 60 --tx_count 50
+$ ./multinode-demo/client.sh --entrypoint testnet.solana.com:8001 --duration 60
 ```

 You can observe the effects of your client's transactions on our [dashboard](https://metrics.solana.com:3000/d/testnet/testnet-hud?orgId=2&from=now-30m&to=now&refresh=5s&var-testnet=testnet)
--- a/book/src/gossip.md
+++ b/book/src/gossip.md
@@ -22,7 +22,7 @@ gossip endpoint (a socket address).

 Records shared over gossip are arbitrary, but signed and versioned (with a
 timestamp) as needed to make sense to the node receiving them. If a node
-receives two records from the same source, it updates its own copy with the
+recieves two records from the same source, it it updates its own copy with the
 record with the most recent timestamp.

 ## Gossip Service Interface
@@ -34,8 +34,8 @@ Nodes send push messages to `PUSH_FANOUT` push peers.

 Upon receiving a push message, a node examines the message for:

-1. Duplication: if the message has been seen before, the node drops the message
-   and may respond with `PushMessagePrune` if forwarded from a low staked node
+1. Duplication: if the message has been seen before, the node responds with
+   `PushMessagePrune` and drops the message

 2. New data: if the message is new to the node
   * Stores the new information with an updated version in its cluster info and
@@ -51,7 +51,7 @@ Upon receiving a push message, a node examines the message for:
 A nodes selects its push peers at random from the active set of known peers.
 The node keeps this selection for a relatively long time.  When a prune message
 is received, the node drops the push peer that sent the prune.  Prune is an
-indication that there is another, higher stake weighted path to that node than direct push.
+indication that there is another, faster path to that node than direct push.

 The set of push peers is kept fresh by rotating a new node into the set every
 `PUSH_MSG_TIMEOUT/2` milliseconds.
--- a/book/src/img/economic_design_infl_230719.png
+++ b/book/src/img/economic_design_infl_230719.png
--- a/book/src/img/p_ex_schedule.png
+++ b/book/src/img/p_ex_schedule.png
--- a/book/src/img/p_ex_supply.png
+++ b/book/src/img/p_ex_supply.png
--- a/book/src/img/solana_economic_design.png
+++ b/book/src/img/solana_economic_design.png
--- a/book/src/installer.md
+++ b/book/src/installer.md
@@ -12,18 +12,18 @@ updates is managed using an on-chain update manifest program.
 #### Fetch and run a pre-built installer using a bootstrap curl/shell script
 The easiest install method for supported platforms:
 ```bash
-$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.18.0/install/solana-install-init.sh | sh
+$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.13.0/install/solana-install-init.sh | sh
 ```

 This script will check github for the latest tagged release and download and run the
-`solana-install-init` binary from there.
+`solana-install` binary from there.


 If additional arguments need to be specified during the installation, the
 following shell syntax is used:
 ```bash
-$ init_args=.... # arguments for `solana-install-init ...`
-$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.18.0/install/solana-install-init.sh | sh -s - ${init_args}
+$ init_args=.... # arguments for `solana-installer init ...`
+$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.13.0/install/solana-install-init.sh | sh -s - ${init_args}
 ```

 #### Fetch and run a pre-built installer from a Github release
@@ -31,9 +31,9 @@ With a well-known release URL, a pre-built binary can be obtained for supported
 platforms:

 ```bash
-$ curl -o solana-install-init https://github.com/solana-labs/solana/releases/download/v0.18.0/solana-install-init-x86_64-apple-darwin
-$ chmod +x ./solana-install-init
-$ ./solana-install-init --help
+$ curl -o solana-install https://github.com/solana-labs/solana/releases/download/v0.13.0/solana-install-x86_64-apple-darwin
+$ chmod +x ./solana-install
+$ ./solana-install --help
 ```

 #### Build and run the installer from source
@@ -49,7 +49,7 @@ $ cargo run -- --help
 Given a solana release tarball (as created by `ci/publish-tarball.sh`) that has already been uploaded to a publicly accessible URL,
 the following commands will deploy the update:
 ```bash
-$ solana-keygen new -o update-manifest.json  # <-- only generated once, the public key is shared with users
+$ solana-keygen -o update-manifest.json  # <-- only generated once, the public key is shared with users
 $ solana-install deploy http://example.com/path/to/solana-release.tar.bz2 update-manifest.json
 ```

@@ -119,7 +119,7 @@ It manages the following files and directories in the user's home directory:

 #### Command-line Interface
 ```manpage
-solana-install 0.16.0
+solana-install 0.13.0
 The solana cluster software installer

 USAGE:
@@ -130,7 +130,7 @@ FLAGS:
    -V, --version    Prints version information

 OPTIONS:
-    -c, --config <PATH>    Configuration file to use [default: .../Library/Preferences/solana/install.yml]
+    -c, --config <PATH>    Configuration file to use [default: /Users/mvines/Library/Preferences/solana/install.yml]

 SUBCOMMANDS:
    deploy    deploys a new update
@@ -152,8 +152,8 @@ FLAGS:
    -h, --help    Prints help information

 OPTIONS:
-    -d, --data_dir <PATH>    Directory to store install data [default: .../Library/Application Support/solana]
-    -u, --url <URL>          JSON RPC URL for the solana cluster [default: http://testnet.solana.com:8899]
+    -d, --data_dir <PATH>    Directory to store install data [default: /Users/mvines/Library/Application Support/solana]
+    -u, --url <URL>          JSON RPC URL for the solana cluster [default: https://api.testnet.solana.com/]
    -p, --pubkey <PUBKEY>    Public key of the update manifest [default: 9XX329sPuskWhH4DQh6k16c87dHKhXLBZTL3Gxmve8Gp]
 ```

--- a/book/src/instruction-api.md
+++ b/book/src/instruction-api.md
@@ -1,25 +0,0 @@
-# Instructions
-
-For the purposes of building a [Transaction](transaction.md), a more
-verbose instruction format is used:
-
-* **Instruction:**
-  * **program_id:** The pubkey of the on-chain program that executes the
-    instruction
-  * **accounts:** An ordered list of accounts that should be passed to
-    the program processing the instruction, including metadata detailing
-    if an account is a signer of the transaction and if it is a credit
-    only account.
-  * **data:** A byte array that is passed to the program executing the
-    instruction
-  
-A more compact form is actually included in a `Transaction`:
-
-* **CompiledInstruction:**
-  * **program_id_index:** The index of the `program_id` in the
-    `account_keys` list
-  * **accounts:** An ordered list of indices into `account_keys`
-    specifying the accounds that should be passed to the program
-    processing the instruction.
-  * **data:** A byte array that is passed to the program executing the
-    instruction
--- a/book/src/introduction.md
+++ b/book/src/introduction.md
@@ -1,13 +1,13 @@
 # What is Solana?

-Solana is an open source project implementing a new,
+Solana is the name of an open source project that is implementing a new,
 high-performance, permissionless blockchain. Solana is also the name of a
 company headquartered in San Francisco that maintains the open source project.

 # About this Book

 This book describes the Solana open source project, a blockchain built from the
-ground up for scale. The book covers why Solana is useful, how to use it, how it
+ground up for scale. The book covers why it's useful, how to use it, how it
 works, and why it will continue to work long after the company Solana closes
 its doors. The goal of the Solana architecture is to demonstrate there exists a
 set of software algorithms that when used in combination to implement a
--- a/book/src/jsonrpc-api.md
+++ b/book/src/jsonrpc-api.md
@@ -25,22 +25,12 @@ Methods
 * [getAccountInfo](#getaccountinfo)
 * [getBalance](#getbalance)
 * [getClusterNodes](#getclusternodes)
-* [getEpochInfo](#getepochinfo)
-* [getGenesisBlockhash](#getgenesisblockhash)
-* [getLeaderSchedule](#getleaderschedule)
-* [getProgramAccounts](#getprogramaccounts)
 * [getRecentBlockhash](#getrecentblockhash)
 * [getSignatureStatus](#getsignaturestatus)
-* [getSlot](#getslot)
 * [getSlotLeader](#getslotleader)
-* [getSlotsPerSegment](#getslotspersegment)
-* [getStorageTurn](#getstorageturn)
-* [getStorageTurnRate](#getstorageturnrate)
 * [getNumBlocksSinceSignatureConfirmation](#getnumblockssincesignatureconfirmation)
 * [getTransactionCount](#gettransactioncount)
-* [getTotalSupply](#gettotalsupply)
-* [getVersion](#getversion)
-* [getVoteAccounts](#getvoteaccounts)
+* [getEpochVoteAccounts](#getepochvoteaccounts)
 * [requestAirdrop](#requestairdrop)
 * [sendTransaction](#sendtransaction)
 * [startSubscriptionChannel](#startsubscriptionchannel)
@@ -105,32 +95,6 @@ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "
 {"jsonrpc":"2.0","result":true,"id":1}
 ```

---
-
-### getAccountInfo
-Returns all information associated with the account of provided Pubkey
-
-##### Parameters:
-* `string` - Pubkey of account to query, as base-58 encoded string
-
-##### Results:
-The result field will be a JSON object with the following sub fields:
-
-* `lamports`, number of lamports assigned to this account, as a signed 64-bit integer
-* `owner`, array of 32 bytes representing the program this account has been assigned to
-* `data`, array of bytes representing any data associated with the account
-* `executable`, boolean indicating if the account contains a program (and is strictly read-only)
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getAccountInfo", "params":["2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST"]}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":{"executable":false,"owner":[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"lamports":1,"data":[3,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,50,48,53,48,45,48,49,45,48,49,84,48,48,58,48,48,58,48,48,90,252,10,7,28,246,140,88,177,98,82,10,227,89,81,18,30,194,101,199,16,11,73,133,20,246,62,114,39,20,113,189,32,50,0,0,0,0,0,0,0,247,15,36,102,167,83,225,42,133,127,82,34,36,224,207,130,109,230,224,188,163,33,213,13,5,117,211,251,65,159,197,51,0,0,0,0,0,0]},"id":1}
-```
-
-
 ---

 ### getBalance
@@ -161,7 +125,7 @@ None

 ##### Results:
 The result field will be an array of JSON objects, each with the following sub fields:
-* `pubkey` - Node public key, as base-58 encoded string
+* `id` - Node identifier, as base-58 encoded string
 * `gossip` - Gossip network address for the node
 * `tpu` - TPU network address for the node
 * `rpc` - JSON RPC network address for the node, or `null` if the JSON RPC service is not enabled
@@ -172,97 +136,33 @@ The result field will be an array of JSON objects, each with the following sub f
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getClusterNodes"}' http://localhost:8899

 // Result
-{"jsonrpc":"2.0","result":[{"gossip":"10.239.6.48:8001","pubkey":"9QzsJf7LPLj8GkXbYT3LFDKqsj2hHG7TA3xinJHu8epQ","rpc":"10.239.6.48:8899","tpu":"10.239.6.48:8856"}],"id":1}
+{"jsonrpc":"2.0","result":[{"gossip":"10.239.6.48:8001","id":"9QzsJf7LPLj8GkXbYT3LFDKqsj2hHG7TA3xinJHu8epQ","rpc":"10.239.6.48:8899","tpu":"10.239.6.48:8856"}],"id":1}
 ```

 ---

-### getEpochInfo
-Returns information about the current epoch
+### getAccountInfo
+Returns all information associated with the account of provided Pubkey

 ##### Parameters:
-None
+* `string` - Pubkey of account to query, as base-58 encoded string

 ##### Results:
-The result field will be an object with the following fields:
-* `epoch`, the current epoch
-* `slotIndex`, the current slot relative to the start of the current epoch
-* `slotsInEpoch`, the number of slots in this epoch
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getEpochInfo"}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":{"epoch":3,"slotIndex":126,"slotsInEpoch":256},"id":1}
-```
-
---
-### getGenesisBlockhash
-Returns the genesis block hash
-
-##### Parameters:
-None
-
-##### Results:
-* `string` - a Hash as base-58 encoded string
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getGenesisBlockhash"}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":"GH7ome3EiwEr7tu9JuTh2dpYWBJK3z69Xm1ZE3MEE6JC","id":1}
-```
-
---
-
-### getLeaderSchedule
-Returns the leader schedule for the current epoch
-
-##### Parameters:
-None
-
-##### Results:
-The result field will be an array of leader public keys (as base-58 encoded
-strings) for each slot in the current epoch
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getLeaderSchedule"}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":[...],"id":1}
-```
-
---
-
-### getProgramAccounts
-Returns all accounts owned by the provided program Pubkey
-
-##### Parameters:
-* `string` - Pubkey of program, as base-58 encoded string
-
-##### Results:
-The result field will be an array of arrays. Each sub array will contain:
-* `string` - the account Pubkey as base-58 encoded string
-and a JSON object, with the following sub fields:
+The result field will be a JSON object with the following sub fields:

 * `lamports`, number of lamports assigned to this account, as a signed 64-bit integer
 * `owner`, array of 32 bytes representing the program this account has been assigned to
 * `data`, array of bytes representing any data associated with the account
 * `executable`, boolean indicating if the account contains a program (and is strictly read-only)
+* `loader`, array of 32 bytes representing the loader for this program (if `executable`), otherwise all

 ##### Example:
 ```bash
 // Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getProgramAccounts", "params":["8nQwAgzN2yyUzrukXsCa3JELBYqDQrqJ3UyHiWazWxHR"]}' http://localhost:8899
+curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getAccountInfo", "params":["2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST"]}' http://localhost:8899

 // Result
-{"jsonrpc":"2.0","result":[["BqGKYtAKu69ZdWEBtZHh4xgJY1BYa2YBiBReQE3pe383", {"executable":false,"owner":[50,28,250,90,221,24,94,136,147,165,253,136,1,62,196,215,225,34,222,212,99,84,202,223,245,13,149,99,149,231,91,96],"lamports":1,"data":[]], ["4Nd1mBQtrMJVYVfKf2PJy9NZUZdTAsp7D4xWLs4gDB4T", {"executable":false,"owner":[50,28,250,90,221,24,94,136,147,165,253,136,1,62,196,215,225,34,222,212,99,84,202,223,245,13,149,99,149,231,91,96],"lamports":10,"data":[]]]},"id":1}
+{"jsonrpc":"2.0","result":{"executable":false,"loader":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"owner":[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"lamports":1,"data":[3,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,50,48,53,48,45,48,49,45,48,49,84,48,48,58,48,48,58,48,48,90,252,10,7,28,246,140,88,177,98,82,10,227,89,81,18,30,194,101,199,16,11,73,133,20,246,62,114,39,20,113,189,32,50,0,0,0,0,0,0,0,247,15,36,102,167,83,225,42,133,127,82,34,36,224,207,130,109,230,224,188,163,33,213,13,5,117,211,251,65,159,197,51,0,0,0,0,0,0]},"id":1}
 ```

 ---
@@ -315,25 +215,6 @@ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "

 -----

-### getSlot
-Returns the current slot the node is processing
-
-##### Parameters:
-None
-
-##### Results:
-* `u64` - Current slot
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getSlot"}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":"1234","id":1}
-```
-----
-
 ### getSlotLeader
 Returns the current slot leader

@@ -352,67 +233,7 @@ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "m
 {"jsonrpc":"2.0","result":"ENvAW7JScgYq6o4zKZwewtkzzJgDzuJAFxYasvmEQdpS","id":1}
 ```

----
-
-### getSlotsPerSegment
-Returns the current storage segment size in terms of slots
-
-##### Parameters:
-None
-
-##### Results:
-* `u64` - Number of slots in a storage segment
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getSlotsPerSegment"}' http://localhost:8899
-// Result
-{"jsonrpc":"2.0","result":"1024","id":1}
-```
-
----
-
-### getStorageTurn
-Returns the current storage turn's blockhash and slot
-
-##### Parameters:
-None
-
-##### Results:
-An array consisting of
-* `string` - a Hash as base-58 encoded string indicating the blockhash of the turn slot
-* `u64` - the current storage turn slot
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getStorageTurn"}' http://localhost:8899
- // Result
-{"jsonrpc":"2.0","result":["GH7ome3EiwEr7tu9JuTh2dpYWBJK3z69Xm1ZE3MEE6JC", "2048"],"id":1}
-```
-
----
-
-### getStorageTurnRate
-Returns the current storage turn rate in terms of slots per turn
-
-##### Parameters:
-None
-
-##### Results:
-* `u64` - Number of slots in storage turn
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getStorageTurnRate"}' http://localhost:8899
- // Result
-{"jsonrpc":"2.0","result":"1024","id":1}
-
-```
-
----
+-----

 ### getNumBlocksSinceSignatureConfirmation
 Returns the current number of blocks since signature has been confirmed.
@@ -454,72 +275,38 @@ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "m

 ---

-### getTotalSupply
-Returns the current total supply in Lamports
+### getEpochVoteAccounts
+Returns the account info and associated stake for all the voting accounts in the current epoch.

 ##### Parameters:
 None

 ##### Results:
-* `integer` - Total supply, as unsigned 64-bit integer
+An array consisting of vote accounts:
+* `string` - the vote account's Pubkey as base-58 encoded string
+* `integer` - the stake, in lamports, delegated to this vote account
+* `VoteState` - the vote account's state
+
+Each VoteState will be a JSON object with the following sub fields:
+
+* `votes`, array of most recent vote lockouts
+* `node_pubkey`, the pubkey of the node that votes using this account
+* `authorized_voter_pubkey`, the pubkey of the authorized vote signer for this account
+* `commission`, a 32-bit integer used as a fraction (commission/MAX_U32) for rewards payout
+* `root_slot`, the most recent slot this account has achieved maximum lockout
+* `credits`, credits accrued by this account for reaching lockouts

 ##### Example:
 ```bash
 // Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getTotalSupply"}' http://localhost:8899
+curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getEpochVoteAccounts"}' http://localhost:8899

 // Result
-{"jsonrpc":"2.0","result":10126,"id":1}
+{"jsonrpc":"2.0","result":[[[84,115,89,23,41,83,221,72,58,23,53,245,195,188,140,161,242,189,200,164,139,214,12,180,84,161,28,151,24,243,159,125],10000000,{"authorized_voter_pubkey":[84,115,89,23,41,83,221,72,58,23,53,245,195,188,140,161,242,189,200,164,139,214,12,180,84,161,28,151,24,243,159,125],"commission":0,"credits":0,"node_pubkey":[49,139,227,211,47,39,69,86,131,244,160,144,228,169,84,143,142,253,83,81,212,110,254,12,242,71,219,135,30,60,157,213],"root_slot":null,"votes":[{"confirmation_count":1,"slot":0}]}]],"id":1}
 ```

 ---

-### getVersion
-Returns the current solana versions running on the node
-
-##### Parameters:
-None
-
-##### Results:
-The result field will be a JSON object with the following sub fields:
-* `solana-core`, software version of solana-core
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVersion"}' http://localhost:8899
-// Result
-{"jsonrpc":"2.0","result":{"solana-core": "0.17.2"},"id":1}
-```
-
---
-
-### getVoteAccounts
-Returns the account info and associated stake for all the voting accounts in the current bank.
-
-##### Parameters:
-None
-
-##### Results:
-The result field will be a JSON object of `current` and `delinquent` accounts,
-each containing an array of JSON objects with the following sub fields:
-* `votePubkey` - Vote account public key, as base-58 encoded string
-* `nodePubkey` - Node public key, as base-58 encoded string
-* `activatedStake` - the stake, in lamports, delegated to this vote account and active in this epoch
-* `epochVoteAccount` - bool, whether the vote account is staked for this epoch
-* `commission`, an 8-bit integer used as a fraction (commission/MAX_U8) for rewards payout
-* `lastVote` - Most recent slot voted on by this vote account
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVoteAccounts"}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":{"current":[{"commission":0,"epochVoteAccount":true,"nodePubkey":"B97CCUW3AEZFGy6uUg6zUdnNYvnVq5VG8PUtb2HayTDD","lastVote":147,"activatedStake":42,"votePubkey":"3ZT31jkAGhUaw8jsy4bTknwBMP8i4Eueh52By4zXcsVw"}],"delinquent":[{"commission":127,"epochVoteAccount":false,"nodePubkey":"6ZPxeQaDo4bkZLRsdNrCzchNQr5LN9QMc9sipXv9Kw8f","lastVote":0,"activatedStake":0,"votePubkey":"CmgCk4aMS7KW1SHX3s9K5tBJ6Yng2LBaC8MFov4wx9sm"}]},"id":1}
-```
-
---

 ### requestAirdrop
 Requests an airdrop of lamports to a Pubkey
@@ -602,7 +389,7 @@ for a given account public key changes

 ##### Notification Format:
 ```bash
-{"jsonrpc": "2.0","method": "accountNotification", "params": {"result": {"executable":false,"owner":[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"lamports":1,"data":[3,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,50,48,53,48,45,48,49,45,48,49,84,48,48,58,48,48,58,48,48,90,252,10,7,28,246,140,88,177,98,82,10,227,89,81,18,30,194,101,199,16,11,73,133,20,246,62,114,39,20,113,189,32,50,0,0,0,0,0,0,0,247,15,36,102,167,83,225,42,133,127,82,34,36,224,207,130,109,230,224,188,163,33,213,13,5,117,211,251,65,159,197,51,0,0,0,0,0,0]},"subscription":0}}
+{"jsonrpc": "2.0","method": "accountNotification", "params": {"result": {"executable":false,"loader":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"owner":[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"lamports":1,"data":[3,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,50,48,53,48,45,48,49,45,48,49,84,48,48,58,48,48,58,48,48,90,252,10,7,28,246,140,88,177,98,82,10,227,89,81,18,30,194,101,199,16,11,73,133,20,246,62,114,39,20,113,189,32,50,0,0,0,0,0,0,0,247,15,36,102,167,83,225,42,133,127,82,34,36,224,207,130,109,230,224,188,163,33,213,13,5,117,211,251,65,159,197,51,0,0,0,0,0,0]},"subscription":0}}
 ```

 ---
--- a/book/src/leader-leader-transition.md
+++ b/book/src/leader-leader-transition.md
@@ -45,7 +45,7 @@ The upsides compared to guards:
 * The timeout is not fixed.

 * The timeout is local to the leader, and therefore can be clever.  The leader's
-heuristic can take into account turbine performance.
+heuristic can take into account avalanche performance.

 * This design doesn't require a ledger hard fork to update.

--- a/book/src/leader-rotation.md
+++ b/book/src/leader-rotation.md
@@ -96,7 +96,7 @@ ends up scheduled for the first two epochs because the leader schedule is also
 generated at slot 0 for the next epoch.  The length of the first two epochs can
 be specified in the genesis block as well.  The minimum length of the first
 epochs must be greater than or equal to the maximum rollback depth as defined in
-[Tower BFT](tower-bft.md).
+[fork selection](fork-selection.md).

 ## Leader Schedule Generation Algorithm

--- a/book/src/ledger-replication-to-implement.md
+++ b/book/src/ledger-replication-to-implement.md
@@ -74,7 +74,7 @@ The program should have a list of slots which are valid storage mining slots.
 This list should be maintained by keeping track of slots which are rooted slots in which a significant
 portion of the network has voted on with a high lockout value, maybe 32-votes old. Every SLOTS\_PER\_SEGMENT
 number of slots would be added to this set. The program should check that the slot is in this set. The set can
-be maintained by receiving a AdvertiseStorageRecentBlockHash and checking with its bank/Tower BFT state.
+be maintained by receiving a AdvertiseStorageRecentBlockHash and checking with its bank/locktower state.

 The program should do a signature verify check on the signature, public key from the transaction submitter and the message of
 the previous storage epoch PoH value.
--- a/book/src/ledger-replication.md
+++ b/book/src/ledger-replication.md
@@ -1,18 +1,19 @@
 # Ledger Replication

 At full capacity on a 1gbps network solana will generate 4 petabytes of data
-per year.  To prevent the network from centralizing around validators that have
+per year.  To prevent the network from centralizing around full nodes that have
 to store the full data set this protocol proposes a way for mining nodes to
-provide storage capacity for pieces of the data.
+provide storage capacity for pieces of the network.

 The basic idea to Proof of Replication is encrypting a dataset with a public
 symmetric key using CBC encryption, then hash the encrypted dataset. The main
 problem with the naive approach is that a dishonest storage node can stream the
-encryption and delete the data as it's hashed. The simple solution is to periodically
-regenerate the hash based on a signed PoH value. This ensures that all the data is present
-during the generation of the proof and it also requires validators to have the
-entirety of the encrypted data present for verification of every proof of every identity.
-So the space required to validate is `number_of_proofs * data_size`
+encryption and delete the data as its hashed. The simple solution is to force
+the hash to be done on the reverse of the encryption, or perhaps with a random
+order. This ensures that all the data is present during the generation of the
+proof and it also requires the validator to have the entirety of the encrypted
+data present for verification of every proof of every identity. So the space
+required to validate is `number_of_proofs * data_size`

 ## Optimization with PoH

@@ -28,12 +29,13 @@ core. The total space required for verification is `1_ledger_segment +
 ## Network

 Validators for PoRep are the same validators that are verifying transactions.
-If a replicator can prove that a validator verified a fake PoRep, then the
-validator will not receive a reward for that storage epoch.
+They have some stake that they have put up as collateral that ensures that
+their work is honest. If you can prove that a validator verified a fake PoRep,
+then the validator will not receive a reward for that storage epoch.

-Replicators are specialized *light clients*. They download a part of the
-ledger (a.k.a Segment) and store it, and provide PoReps of storing the ledger.
-For each verified PoRep replicators earn a reward of sol from the mining pool.
+Replicators are specialized *light clients*. They download a part of the ledger
+and store it, and provide PoReps of storing the ledger. For each verified PoRep
+replicators earn a reward of sol from the mining pool.

 ## Constraints

@@ -53,8 +55,9 @@ changes to determine what rate it can validate storage proofs.

 1. SLOTS\_PER\_SEGMENT: Number of slots in a segment of ledger data. The
 unit of storage for a replicator.
-2. NUM\_KEY\_ROTATION\_SEGMENTS: Number of segments after which replicators
-regenerate their encryption keys and select a new dataset to store.
+2. NUM\_KEY\_ROTATION\_TICKS: Number of ticks to save a PoH value and cause a
+key generation for the section of ledger just generated and the rotation of
+another key in the set.
 3. NUM\_STORAGE\_PROOFS: Number of storage proofs required for a storage proof
 claim to be successfully rewarded.
 4. RATIO\_OF\_FAKE\_PROOFS: Ratio of fake proofs to real proofs that a storage
@@ -63,40 +66,36 @@ mining proof claim has to contain to be valid for a reward.
 proof.
 6. NUM\_CHACHA\_ROUNDS: Number of encryption rounds performed to generate
 encrypted state.
-7. NUM\_SLOTS\_PER\_TURN: Number of slots that define a single storage epoch or
-a "turn" of the PoRep game.

 ### Validator behavior

-1. Validators join the network and begin looking for replicator accounts at each
-storage epoch/turn boundary.
-2. Every turn, Validators sign the PoH value at the boundary and use that signature
-to randomly pick proofs to verify from each storage account found in the turn boundary.
-This signed value is also submitted to the validator's storage account and will be used by
-replicators at a later stage to cross-verify.
-3. Every `NUM_SLOTS_PER_TURN` slots the validator advertises the PoH value. This is value
-is also served to Replicators via RPC interfaces.
-4. For a given turn N, all validations get locked out until turn N+3 (a gap of 2 turn/epoch).
-At which point all validations during that turn are available for reward collection.
-5. Any incorrect validations will be marked during the turn in between.
-
+1. Validator joins the network and submits a storage validation capacity
+transaction which tells the network how many proofs it can process in a given
+period defined by NUM\_KEY\_ROTATION\_TICKS.
+2. Every NUM\_KEY\_ROTATION\_TICKS the validator stores the PoH value at that
+height.
+3. Validator generates a storage proof confirmation transaction.
+4. The storage proof confirmation transaction is integrated into the ledger.
+6. Validator responds to RPC interfaces for what the last storage epoch PoH
+value is and its slot.

 ### Replicator behavior

 1. Since a replicator is somewhat of a light client and not downloading all the
-ledger data, they have to rely on other validators and replicators for information.
-Any given validator may or may not be malicious and give incorrect information, although
-there are not any obvious attack vectors that this could accomplish besides having the
-replicator do extra wasted work.  For many of the operations there are a number of options
-depending on how paranoid a replicator is:
+ledger data, they have to rely on other full nodes (validators) for
+information. Any given validator may or may not be malicious and give incorrect
+information, although there are not any obvious attack vectors that this could
+accomplish besides having the replicator do extra wasted work.  For many of the
+operations there are a number of options depending on how paranoid a replicator
+is:
    - (a) replicator can ask a validator
    - (b) replicator can ask multiple validators
-    - (c) replicator can ask other replicators
-    - (d) replicator can subscribe to the full transaction stream and generate
-      the information itself (assuming the slot is recent enough)
-    - (e) replicator can subscribe to an abbreviated transaction stream to
-      generate the information itself (assuming the slot is recent enough)
-2. A replicator obtains the PoH hash corresponding to the last turn with its slot.
+    - (c) replicator can subscribe to the full transaction stream and generate
+      the information itself
+    - (d) replicator can subscribe to an abbreviated transaction stream to
+      generate the information itself
+2. A replicator obtains the PoH hash corresponding to the last key rotation
+along with its slot.
 3. The replicator signs the PoH hash with its keypair. That signature is the
 seed used to pick the segment to replicate and also the encryption key. The
 replicator mods the signature with the slot to get which segment to
@@ -104,67 +103,38 @@ replicate.
 4. The replicator retrives the ledger by asking peer validators and
 replicators. See 6.5.
 5. The replicator then encrypts that segment with the key with chacha algorithm
-in CBC mode with `NUM_CHACHA_ROUNDS` of encryption.
-6. The replicator initializes a chacha rng with the a signed recent PoH value as
+in CBC mode with NUM\_CHACHA\_ROUNDS of encryption.
+6. The replicator initializes a chacha rng with the signature from step 2 as
 the seed.
-7. The replicator generates `NUM_STORAGE_SAMPLES` samples in the range of the
+7. The replicator generates NUM\_STORAGE\_SAMPLES samples in the range of the
 entry size and samples the encrypted segment with sha256 for 32-bytes at each
 offset value. Sampling the state should be faster than generating the encrypted
 segment.
 8. The replicator sends a PoRep proof transaction which contains its sha state
 at the end of the sampling operation, its seed and the samples it used to the
 current leader and it is put onto the ledger.
-9. During a given turn the replicator should submit many proofs for the same segment
-and based on the `RATIO_OF_FAKE_PROOFS` some of those proofs must be fake.
-10. As the PoRep game enters the next turn, the replicator must submit a
-transaction with the mask of which proofs were fake during the last turn. This
-transaction will define the rewards for both replicators and validators.
-11. Finally for a turn N, as the PoRep game enters turn N + 3, replicator's proofs for
-turn N will be counted towards their rewards.


-### The PoRep Game
-
-The Proof of Replication game has 4 primary stages. For each "turn" multiple PoRep
-games can be in progress but each in a different stage.
-
-The 4 stages of the PoRep Game are as follows:
-
-1. Proof submission stage
-    - Replicators: submit as many proofs as possible during this stage
-    - Validators: No-op
-2. Proof verification stage
-    - Replicators: No-op
-    - Validators: Select replicators and verify their proofs from the previous turn
-3. Proof challenge stage
-    - Replicators: Submit the proof mask with justifications (for fake proofs submitted 2 turns ago)
-    - Validators: No-op
-4. Reward collection stage
-    - Replicators: Collect rewards for 3 turns ago
-    - Validators:  Collect rewards for 3 turns ago
-
-
-For each turn of the PoRep game, both Validators and Replicators evaluate each
-stage. The stages are run as separate transactions on the storage program.
-
 ### Finding who has a given block of ledger

-1. Validators monitor the turns in the PoRep game and look at the rooted bank
-at turn boundaries for any proofs.
-2. Validators maintain a map of ledger segments and corresponding replicator public keys.
-The map is updated when a Validator processes a replicator's proofs for a segment.
-The validator provides an RPC interface to access the this map. Using this API, clients
-can map a segment to a replicator's network address (correlating it via cluster_info table).
-The clients can then send repair requests to the replicator to retrieve segments.
-3. Validators would need to invalidate this list every N turns.
+1. Validators monitor the transaction stream for storage mining proofs, and
+keep a mapping of ledger segments by slot to public keys. When it sees
+a storage mining proof it updates this mapping and provides an RPC interface
+which takes a slot and hands back a list of public keys.  The client
+then looks up in their cluster\_info table to see which network address that
+corresponds to and sends a repair request to retrieve the necessary blocks of
+ledger.
+2. Validators would need to prune this list which it could do by periodically
+looking at the oldest entries in its mappings and doing a network query to see
+if the storage host is still serving the first entry.

 ## Sybil attacks

 For any random seed, we force everyone to use a signature that is derived from
-a PoH hash at the turn boundary. Everyone uses the same count, so the same PoH
-hash is signed by every participant. The signatures are then each cryptographically
-tied to the keypair, which prevents a leader from grinding on the resulting
-value for more than 1 identity.
+a PoH hash. Everyone must use the same count, so the same PoH hash is signed by
+every participant. The signatures are then each cryptographically tied to the
+keypair, which prevents a leader from grinding on the resulting value for more
+than 1 identity.

 Since there are many more client identities then encryption identities, we need
 to split the reward for multiple clients, and prevent Sybil attacks from
@@ -185,7 +155,8 @@ the network can reward long lived client identities more than new ones.
  showing the initial state for the hash.
 - If a validator marks real proofs as fake, no on-chain computation can be done
  to distinguish who is correct. Rewards would have to rely on the results from
-  multiple validators to catch bad actors and replicators from being denied rewards.
+multiple validators in a stake-weighted fashion to catch bad actors and
+replicators from being locked out of the network.
 - Validator stealing mining proof results for itself. The proofs are derived
  from a signature from a replicator, since the validator does not know the
 private key used to generate the encryption key, it cannot be the generator of
--- a/book/src/passive-stake-delegation-and-rewards.md
+++ b/book/src/passive-stake-delegation-and-rewards.md
@@ -76,24 +76,21 @@ this field can only modified by this entity

 ### StakeState

-A StakeState takes one of two forms, StakeState::Stake and StakeState::MiningPool.
+A StakeState takes one of two forms, StakeState::Delegate and StakeState::MiningPool.

-### StakeState::Stake
+### StakeState::Delegate

-Stake is the current delegation preference of the **staker**. Stake
+StakeState is the current delegation preference of the **staker**. StakeState
 contains the following state information:

+* Account::lamports - The staked lamports.
+
 * `voter_pubkey` - The pubkey of the VoteState instance the lamports are
 delegated to.

 * `credits_observed` - The total credits claimed over the lifetime of the
 program.

-* `stake` - The actual activated stake.
-
-* Account::lamports - Lamports available for staking, including any earned as rewards.
-
-
 ### StakeState::MiningPool

 There are two approaches to the mining pool.  The bank could allow the
@@ -108,12 +105,11 @@ tokens stored as `Account::lamports`.
 The stakes and the MiningPool are accounts that are owned by the same `Stake`
 program.

-### StakeInstruction::DelegateStake(stake)
+### StakeInstruction::Initialize

-* `account[0]` - RW - The StakeState::Stake instance.
-  `StakeState::Stake::credits_observed` is initialized to `VoteState::credits`.
-  `StakeState::Stake::voter_pubkey` is initialized to `account[1]`
-  `StakeState::Stake::stake` is initialized to `stake`, as long as it's less than account[0].lamports
+* `account[0]` - RW - The StakeState::Delegate instance.
+  `StakeState::Delegate::credits_observed` is initialized to `VoteState::credits`.
+  `StakeState::Delegate::voter_pubkey` is initialized to `account[1]`

 * `account[1]` - R - The VoteState instance.

@@ -128,7 +124,7 @@ deposited into the StakeState and as validator commission is proportional to

 * `account[0]` - RW - The StakeState::MiningPool instance that will fulfill the
 reward.
-* `account[1]` - RW - The StakeState::Stake instance that is redeeming votes
+* `account[1]` - RW - The StakeState::Delegate instance that is redeeming votes
 credits.
 * `account[2]` - R - The VoteState instance, must be the same as
 `StakeState::voter_pubkey`
@@ -136,7 +132,7 @@ credits.
 Reward is payed out for the difference between `VoteState::credits` to
 `StakeState::Delgate.credits_observed`, and `credits_observed` is updated to
 `VoteState::credits`.  The commission is deposited into the `VoteState` token
-balance, and the reward is deposited to the `StakeState::Stake` token balance.  The
+balance, and the reward is deposited to the `StakeState::Delegate` token balance.  The
 reward and the commission is weighted by the `StakeState::lamports` divided by total lamports staked.

 The Staker or the owner of the Stake program sends a transaction with this
@@ -150,7 +146,7 @@ stake_state.credits_observed = vote_state.credits;
 ```

 `credits_to_claim` is used to compute the reward and commission, and
-`StakeState::Stake::credits_observed` is updated to the latest
+`StakeState::Delegate::credits_observed` is updated to the latest
 `VoteState::credits` value.

 ### Collecting network fees into the MiningPool
@@ -179,13 +175,13 @@ many rewards to be claimed concurrently.

 ## Passive Delegation

-Any number of instances of StakeState::Stake programs can delegate to a single
+Any number of instances of StakeState::Delegate programs can delegate to a single
 VoteState program without an interactive action from the identity controlling
 the VoteState program or submitting votes to the program.

 The total stake allocated to a VoteState program can be calculated by the sum of
 all the StakeState programs that have the VoteState pubkey as the
-`StakeState::Stake::voter_pubkey`.
+`StakeState::Delegate::voter_pubkey`.

 ## Example Callflow

--- a/book/src/performance-metrics.md
+++ b/book/src/performance-metrics.md
@@ -7,16 +7,14 @@ confirmed by super majority of the cluster (Confirmation Time).
 Each cluster node maintains various counters that are incremented on certain events.
 These counters are periodically uploaded to a cloud based database. Solana's metrics
 dashboard fetches these counters, and computes the performance metrics and displays
-it on the dashboard.
+it on the dashboard. 

 ## TPS

-Each node's bank runtime maintains a count of transactions that it has processed.
-The dashboard first calculates the median count of transactions across all metrics
-enabled nodes in the cluster. The median cluster transaction count is then averaged
-over a 2 second period and displayed in the TPS time series graph. The dashboard also
-shows the Mean TPS, Max TPS and Total Transaction Count stats which are all calculated from
-the median transaction count.
+The leader node's banking stage maintains a count of transactions that it recorded.
+The dashboard displays the count averaged over 2 second period in the TPS time series
+graph. The dashboard also shows per second mean, maximum and total TPS as a running
+counter.

 ## Confirmation Time

@@ -28,4 +26,4 @@ super majority vote, and when one of its children forks is frozen.
 The node assigns a timestamp to every new fork, and computes the time it took to confirm
 the fork. This time is reflected as validator confirmation time in performance metrics.
 The performance dashboard displays the average of each validator node's confirmation time
-as a time series graph.
+as a time series graph. 
--- a/book/src/persistent-account-storage.md
+++ b/book/src/persistent-account-storage.md
@@ -60,7 +60,7 @@ The read is satisfied by pointing to a memory-mapped location in the

 ## Root Forks

-[Tower BFT](tower-bft.md) eventually selects a fork as a
+The [fork selection algorithm](fork-selection.md) eventually selects a fork as a
 root fork and the fork is squashed.  A squashed/root fork cannot be rolled back.

 When a fork is squashed, all accounts in its parents not already present in the
--- a/book/src/repair-service.md
+++ b/book/src/repair-service.md
@@ -34,10 +34,10 @@ The different protocol strategies to address the above challenges:
    On receiving the responses `p`, where `p` is some blob in a parent slot, validators will:
        * Insert an empty `SlotMeta` in blocktree for `p.slot` if it doesn't already exist.
        * If `p.slot` does exist, update the parent of `p` based on `parents`
+    
+        Note: that once these empty slots are added to blocktree, the `Blob Repair` protocol should attempt to fill those slots.

-    Note: that once these empty slots are added to blocktree, the `Blob Repair` protocol should attempt to fill those slots.
-
-    Note: Validators will only accept responses containing blobs within the current verifiable epoch (epoch the validator has a leader schedule for).
+        Note: Validators will only accept responses containing blobs within the current verifiable epoch (epoch the validator has a leader schedule for).

 3. Repairmen (Addresses Challenge #3):
    This part of the repair protocol is the primary mechanism by which new nodes joining the cluster catch up after loading a snapshot. This protocol works in a "forward" fashion, so validators can verify every blob that they receive against a known leader schedule.
@@ -45,7 +45,7 @@ The different protocol strategies to address the above challenges:
    Each validator advertises in gossip:
        * Current root
        * The set of all completed slots in the confirmed epochs (an epoch that was calculated based on a bank <= current root) past the current root
-
+    
    Observers of this gossip message with higher epochs (repairmen) send blobs to catch the lagging node up with the rest of the cluster. The repairmen are responsible for sending the slots within the epochs that are confrimed by the advertised `root` in gossip. The repairmen divide the responsibility of sending each of the missing slots in these epochs based on a random seed (simple blob.index iteration by N, seeded with the repairman's node_pubkey). Ideally, each repairman in an N node cluster (N nodes whose epochs are higher than that of the repairee) sends 1/N of the missing blobs. Both data and coding blobs for missing slots are sent. Repairmen do not send blobs again to the same validator until they see the message in gossip updated, at which point they perform another iteration of this protocol.

-    Gossip messages are updated every time a validator receives a complete slot within the epoch. Completed slots are detected by blocktree and sent over a channel to RepairService. It is important to note that we know that by the time a slot X is complete, the epoch schedule must exist for the epoch that contains slot X because WindowService will reject blobs for unconfirmed epochs. When a newly completed slot is detected, we also update the current root if it has changed since the last update. The root is made available to RepairService through Blocktree, which holds the latest root.
+    Gossip messages are updated every time a validator receives a complete slot within the epoch. Completed slots are detected by blocktree and sent over a channel to RepairService. It is important to note that we know that by the time a slot X is complete, the epoch schedule must exist for the epoch that contains slot X because WindowService will reject blobs for unconfirmed epochs. When a newly completed slot is detected, we also update the current root if it has changed since the last update. The root is made available to RepairService through Blocktree, which holds the latest root.
--- a/book/src/running-replicator.md
+++ b/book/src/running-replicator.md
@@ -1,153 +0,0 @@
-## Running a Replicator
-This document describes how to setup a replicator in the testnet
-
-Please note some of the information and instructions described here may change
-in future releases.
-
-### Overview
-Replicators are specialized light clients. They download a part of the
-ledger (a.k.a Segment) and store it. They earn rewards for storing segments.
-
-The testnet features a validator running at testnet.solana.com, which
-serves as the entrypoint to the cluster for your replicator node.
-
-Additionally there is a blockexplorer available at
-[http://testnet.solana.com/](http://testnet.solana.com/).
-
-The testnet is configured to reset the ledger daily, or sooner
-should the hourly automated cluster sanity test fail.
-
-### Machine Requirements
-Replicators don't need specialized hardware. Anything with more than
-128GB of disk space will be able to participate in the cluster as a replicator node.
-
-Currently the disk space requirements are very low but we expect them to change
-in the future.
-
-Prebuilt binaries are available for Linux x86_64 (Ubuntu 18.04 recommended),
-macOS, and Windows.
-
-#### Confirm The Testnet Is Reachable
-Before starting a replicator node, sanity check that the cluster is accessible
-to your machine by running some simple commands.  If any of the commands fail,
-please retry 5-10 minutes later to confirm the testnet is not just restarting
-itself before debugging further.
-
-Fetch the current transaction count over JSON RPC:
-```bash
-$ curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1, "method":"getTransactionCount"}' http://testnet.solana.com:8899
-```
-
-Inspect the blockexplorer at [http://testnet.solana.com/](http://testnet.solana.com/) for activity.
-
-View the [metrics dashboard](
-https://metrics.solana.com:3000/d/testnet-beta/testnet-monitor-beta?var-testnet=testnet)
-for more detail on cluster activity.
-
-### Replicator Setup
-##### Obtaining The Software
-##### Bootstrap with `solana-install`
-
-The `solana-install` tool can be used to easily install and upgrade the cluster
-software.
-
-##### Linux and mac OS
-```bash
-$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.18.0/install/solana-install-init.sh | sh -s
-```
-
-Alternatively build the `solana-install` program from source and run the
-following command to obtain the same result:
-```bash
-$ solana-install init
-```
-
-##### Windows
-Download and install **solana-install-init** from
-[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest)
-
-After a successful install, `solana-install update` may be used to
-easily update the software to a newer version at any time.
-
-##### Download Prebuilt Binaries
-If you would rather not use `solana-install` to manage the install, you can manually download and install the binaries.
-
-##### Linux
-Download the binaries by navigating to
-[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-download **solana-release-x86_64-unknown-linux-gnu.tar.bz2**, then extract the
-archive:
-```bash
-$ tar jxf solana-release-x86_64-unknown-linux-gnu.tar.bz2
-$ cd solana-release/
-$ export PATH=$PWD/bin:$PATH
-```
-##### mac OS
-Download the binaries by navigating to
-[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-download **solana-release-x86_64-apple-darwin.tar.bz2**, then extract the
-archive:
-```bash
-$ tar jxf solana-release-x86_64-apple-darwin.tar.bz2
-$ cd solana-release/
-$ export PATH=$PWD/bin:$PATH
-```
-##### Windows
-Download the binaries by navigating to
-[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-download **solana-release-x86_64-pc-windows-msvc.tar.bz2**, then extract it into a folder.
-It is a good idea to add this extracted folder to your windows PATH.
-
-### Starting The Replicator
-Try running following command to join the gossip network and view all the other nodes in the cluster:
-```bash
-$ solana-gossip --entrypoint testnet.solana.com:8001 spy
-# Press ^C to exit
-```
-
-Now configure the keypairs for your replicator by running:
-
-Navigate to the solana install location and open a cmd prompt
-```bash
-$ solana-keygen new -o replicator-keypair.json
-$ solana-keygen new -o storage-keypair.json
-```
-
-Use solana-keygen to show the public keys for each of the keypairs,
-they will be needed in the next step:
- Windows
-```bash
-# The replicator's identity
-$ solana-keygen pubkey replicator-keypair.json
-$ solana-keygen pubkey storage-keypair.json
-```
- Linux and mac OS
-```bash
-$ export REPLICATOR_IDENTITY=$(solana-keygen pubkey replicator-keypair.json)
-$ export STORAGE_IDENTITY=$(solana-keygen pubkey storage-keypair.json)
-
-```
-Then set up the storage accounts for your replicator by running:
-```bash
-$ solana --keypair replicator-keypair.json airdrop 100000
-$ solana --keypair replicator-keypair.json create-replicator-storage-account $REPLICATOR_IDENTITY $STORAGE_IDENTITY
-```
-Note: Every time the testnet restarts, run the steps to setup the replicator accounts again.
-
-To start the replicator:
-```bash
-$ solana-replicator --entrypoint testnet.solana.com:8001 --identity replicator-keypair.json --storage-keypair storage-keypair.json --ledger replicator-ledger
-```
-
-### Verify Replicator Setup
-From another console, confirm the IP address and **identity pubkey** of your replicator is visible in the
-gossip network by running:
-```bash
-$ solana-gossip --entrypoint testnet.solana.com:8001 spy
-```
-
-Provide the **storage account pubkey** to the `solana show-storage-account` command to view
-the recent mining activity from your replicator:
-```bash
-$ solana --keypair storage-keypair.json show-storage-account $STORAGE_IDENTITY
-```
--- a/book/src/running-validator.md
+++ b/book/src/running-validator.md
@@ -1,35 +0,0 @@
-# Running a Validator
-This document describes how to participate in the Solana testnet as a
-validator node.
-
-Please note some of the information and instructions described here may change
-in future releases, and documentation will be updated for mainnet participation.
-
-## Overview
-Solana currently maintains several testnets, each featuring a validator that can
-serve as the entrypoint to the cluster for your validator.
-
-Current testnet entrypoints:
- Stable, testnet.solana.com
- Beta, beta.testnet.solana.com
- Edge, edge.testnet.solana.com
-
-Solana may launch special testnets for validator participation; we will provide
-you with a specific entrypoint URL to use.
-
-Prior to mainnet, the testnets may be running different versions of solana
-software, which may feature breaking changes. For information on choosing a
-testnet and finding software version info, jump to
-[Choosing a Testnet](validator-testnet.md).
-
-The testnets are configured to reset the ledger daily, or sooner,
-should the hourly automated cluster sanity test fail.
-
-There is a network explorer that shows the status of solana testnets available
-at [http://explorer.solana.com/](https://explorer.solana.com/).
-
-There is a **#validator-support** Discord channel available to reach other
-testnet participants, [https://discord.gg/pquxPsq](https://discord.gg/pquxPsq).
-
-Also we'd love it if you choose to register your validator node with us at
-[https://forms.gle/LfFscZqJELbuUP139](https://forms.gle/LfFscZqJELbuUP139).
--- a/book/src/simple-payment-and-state-verification.md
+++ b/book/src/simple-payment-and-state-verification.md
@@ -1,172 +0,0 @@
-# Simple Payment and State Verification
-
-It is often useful to allow low resourced clients to participate in a Solana
-cluster. Be this participation economic or contract execution, verification
-that a client's activity has been accepted by the network is typically
-expensive. This proposal lays out a mechanism for such clients to confirm that
-their actions have been committed to the ledger state with minimal resource
-expenditure and third-party trust.
-
-## A Naive Approach
-
-Validators store the signatures of recently confirmed transactions for a short
-period of time to ensure that they are not processed more than once. Validators
-provide a JSON RPC endpoint, which clients can use to query the cluster if a
-transaction has been recently processed. Validators also provide a PubSub
-notification, whereby a client registers to be notified when a given signature
-is observed by the validator. While these two mechanisms allow a client to
-verify a payment, they are not a proof and rely on completely trusting a
-fullnode.
-
-We will describe a way to minimize this trust using Merkle Proofs to anchor the
-fullnode's response in the ledger, allowing the client to confirm on their own
-that a sufficient number of their preferred validators have confirmed a
-transaction. Requiring multiple validator attestations further reduces trust in
-the fullnode, as it increases both the technical and economic difficulty of
-compromising several other network participants.
-
-## Light Clients
-
-A 'light client' is a cluster participant that does not itself run a fullnode.
-This light client would provide a level of security greater than trusting a
-remote fullnode, without requiring the light client to spend a lot of resources
-verifying the ledger.
-
-Rather than providing transaction signatures directly to a light client, the
-fullnode instead generates a Merkle Proof from the transaction of interest to
-the root of a Merkle Tree of all transactions in the including block. This Merkle
-Root is stored in a ledger entry which is voted on by validators, providing it
-consensus legitimacy. The additional level of security for a light client depends
-on an initial canonical set of validators the light client considers to be the
-stakeholders of the cluster. As that set is changed, the client can update its
-internal set of known validators with [receipts](#receipts). This may become
-challenging with a large number of delegated stakes.
-
-Fullnodes themselves may want to use light client APIs for performance reasons.
-For example, during the initial launch of a fullnode, the fullnode may use a
-cluster provided checkpoint of the state and verify it with a receipt.
-
-## Receipts
-
-A receipt is a minimal proof that; a transaction has been included in a block,
-that the block has been voted on by the client's preferred set of validators and
-that the votes have reached the desired confirmation depth.
-
-The receipts for both state and payments start with a Merkle Path from the
-value into a Bank-Merkle that has been voted on and included in the ledger. A
-chain of PoH Entries containing subsequent validator votes, deriving from the
-Bank-Merkle, is the confirmation proof.
-
-Clients can examine this ledger data and compute the finality using Solana's fork
-selection rules.
-
-### Payment Merkle Path
-
-A payment receipt is a data structure that contains a Merkle Path from a
-transaction to the required set of validator votes.
-
-An Entry-Merkle is a Merkle Root including all transactions in the entry, sorted
-by signature.
-
-<img alt="Block Merkle Diagram" src="img/spv-block-merkle.svg" class="center"/>
-
-A Block-Merkle is a Merkle root of all the Entry-Merkles sequenced in the block.
-Transaction status is necessary for the receipt because the state receipt is
-constructed for the block. Two transactions over the same state can appear in
-the block, and therefore, there is no way to infer from just the state whether a
-transaction that is committed to the ledger has succeeded or failed in modifying
-the intended state. It may not be necessary to encode the full status code, but
-a single status bit to indicate the transaction's success.
-
-### State Merkle Path
-
-A state receipt provides a confirmation that a specific state is committed at the
-end of the block. Inter-block state transitions do not generate a receipt.
-
-For example:
-
-* A sends 5 Lamports to B
-* B spends 5 Lamports
-* C sends 5 Lamports to A
-
-At the end of the block, A and B are in the exact same starting state, and any
-state receipt would point to the same value for A or B.
-
-The Bank-Merkle is computed from the Merkle Tree of the new state changes, along
-with the Previous Bank-Merkle, and the Block-Merkle.
-
-<img alt="Bank Merkle Diagram" src="img/spv-bank-merkle.svg" class="center"/>
-
-A state receipt contains only the state changes occurring in the block. A direct
-Merkle Path to the current Bank-Merkle guarantees the state value at that bank
-hash, but it cannot be used to generate a “current” receipt to the latest state
-if the state modification occurred in some previous block. There is no guarantee
-that the path provided by the validator is the latest one available out of all
-the previous Bank-Merkles.
-
-Clients that want to query the chain for a receipt of the "latest" state would
-need to create a transaction that would update the Merkle Path for that account,
-such as a credit of 0 Lamports.
-
-###  Validator Votes
-
-Leaders should coalesce the validator votes by stake weight into a single entry.
-This will reduce the number of entries necessary to create a receipt.
-
-###  Chain of Entries
-
-A receipt has a PoH link from the payment or state Merkle Path root to a list of
-consecutive validation votes.
-
-It contains the following:
-* State -> Bank-Merkle
-or
-* Transaction -> Entry-Merkle -> Block-Merkle -> Bank-Merkle
-
-And a vector of PoH entries:
-
-* Validator vote entries
-* Ticks
-* Light entries
-
-
-```rust,ignore
-/// This Entry definition skips over the transactions and only contains the
-/// hash of the transactions used to modify PoH.
-LightEntry {
-    /// The number of hashes since the previous Entry ID.
-    pub num_hashes: u64,
-    /// The SHA-256 hash `num_hashes` after the previous Entry ID.
-    hash: Hash,
-    /// The Merkle Root of the transactions encoded into the Entry.
-    entry_hash: Hash,
-}
-```
-
-The light entries are reconstructed from Entries and simply show the entry Merkle
-Root that was mixed in to the PoH hash, instead of the full transaction set.
-
-Clients do not need the starting vote state. The [fork selection](book/src/fork-selection.md) algorithm is
-defined such that only votes that appear after the transaction provide finality
-for the transaction, and finality is independent of the starting state.
-
-###  Verification
-
-A light client that is aware of the supermajority set validators can verify a
-receipt by following the Merkle Path to the PoH chain. The Bank-Merkle is the
-Merkle Root and will appear in votes included in an Entry. The light client can
-simulate [fork selection](book/src/fork-selection.md) for the consecutive votes
-and verify that the receipt is confirmed at the desired lockout threshold.
-
-### Synthetic State
-
-Synthetic state should be computed into the Bank-Merkle along with the bank
-generated state.
-
-For example:
-
-* Epoch validator accounts and their stakes and weights.
-* Computed fee rates
-
-These values should have an entry in the Bank-Merkle. They should live under
-known accounts, and therefore have an exact address in the Merkle Path.
--- a/book/src/stake-delegation-and-rewards.md
+++ b/book/src/stake-delegation-and-rewards.md
@@ -11,7 +11,7 @@ of getting its stake slashed.  The economics are covered in [staking
 rewards](staking-rewards.md).  This chapter, on the other hand, describes the
 underlying mechanics of its implementation.

-## Basic Design
+## Basic Besign

 The general idea is that the validator owns a Vote account. The Vote account
 tracks validator votes, counts validator generated credits, and provides any
@@ -20,7 +20,7 @@ stakes delegated to it and has no staking weight.

 A separate Stake account (created by a staker) names a Vote account to which the
 stake is delegated.  Rewards generated are proportional to the amount of
-lamports staked.  The Stake account is owned by the staker only.  Some portion of the lamports
+lamports staked.  The Stake account is owned by the staker only.  Lamports
 stored in this account are the stake.

 ## Passive Delegation
@@ -31,7 +31,7 @@ the Vote account or submitting votes to the account.

 The total stake allocated to a Vote account can be calculated by the sum of
 all the Stake accounts that have the Vote account pubkey as the
-`StakeState::Stake::voter_pubkey`.
+`StakeState::Delegate::voter_pubkey`.

 ## Vote and Stake accounts

@@ -46,15 +46,15 @@ program that its delegate has participated in validating the ledger.
 VoteState is the current state of all the votes the validator has submitted to
 the network. VoteState contains the following state information:

-* `votes` - The submitted votes data structure.
+* votes - The submitted votes data structure.

-* `credits` - The total number of rewards this vote program has generated over its
+* credits - The total number of rewards this vote program has generated over its
 lifetime.

-* `root_slot` - The last slot to reach the full lockout commitment necessary for
+* root\_slot - The last slot to reach the full lockout commitment necessary for
 rewards.

-* `commission` - The commission taken by this VoteState for any rewards claimed by
+* commission - The commission taken by this VoteState for any rewards claimed by
 staker's Stake accounts.  This is the percentage ceiling of the reward.

 * Account::lamports - The accumulated lamports from the commission.  These do not
@@ -71,17 +71,13 @@ count as stakes.
 ### VoteInstruction::AuthorizeVoteSigner(Pubkey)

 * `account[0]` - RW - The VoteState
-  `VoteState::authorized_vote_signer` is set to to `Pubkey`, the transaction must by
-   signed by the Vote account's current `authorized_vote_signer`.  <br>
-   `VoteInstruction::AuthorizeVoter` allows a staker to choose a signing service
-for its votes. That service is responsible for ensuring the vote won't cause
-the staker to be slashed.
-
+  `VoteState::authorized_vote_signer` is set to to `Pubkey`, instruction must by
+   signed by Pubkey

 ### VoteInstruction::Vote(Vec<Vote>)

 * `account[0]` - RW - The VoteState
-  `VoteState::lockouts` and `VoteState::credits` are updated according to voting lockout rules see [Tower BFT](tower-bft.md)
+  `VoteState::lockouts` and `VoteState::credits` are updated according to voting lockout rules see [Fork Selection](fork-selection.md)


 * `account[1]` - RO - A list of some N most recent slots and their hashes for the vote to be verified against.
@@ -89,16 +85,14 @@ the staker to be slashed.

 ### StakeState

-A StakeState takes one of three forms, StakeState::Uninitialized, StakeState::Stake and StakeState::RewardsPool.
+A StakeState takes one of two forms, StakeState::Delegate and StakeState::MiningPool.

-### StakeState::Stake
+### StakeState::Delegate

-StakeState::Stake is the current delegation preference of the **staker** and
+StakeState is the current delegation preference of the **staker**. StakeState
 contains the following state information:

-* Account::lamports - The lamports available for staking.
-
-* `stake` - the staked amount (subject to warm up and cool down) for generating rewards, always less than or equal to Account::lamports
+* Account::lamports - The staked lamports.

 * `voter_pubkey` - The pubkey of the VoteState instance the lamports are
 delegated to.
@@ -106,56 +100,56 @@ delegated to.
 * `credits_observed` - The total credits claimed over the lifetime of the
 program.

-* `activated` - the epoch at which this stake was activated/delegated. The full stake will be counted after warm up.
+### StakeState::MiningPool

-* `deactivated` - the epoch at which this stake will be completely de-activated, which is `cool down` epochs after StakeInstruction::Deactivate is issued.
+There are two approaches to the mining pool.  The bank could allow the
+StakeState program to bypass the token balance check, or a program representing
+the mining pool could run on the network.  To avoid a single network wide lock,
+the pool can be split into several mining pools.  This design focuses on using
+StakeState::MiningPool instances as the cluster wide mining pools.

-### StakeState::RewardsPool
+* 256 StakeState::MiningPool are initialized, each with 1/256 number of mining pool
+tokens stored as `Account::lamports`.

-To avoid a single network wide lock or contention in redemption, 256 RewardsPools are part of genesis under pre-determined keys, each with std::u64::MAX credits to be able to satisfy redemptions according to point value.
+The stakes and the MiningPool are accounts that are owned by the same `Stake`
+program.

-The Stakes and the RewardsPool are accounts that are owned by the same `Stake` program.
+### StakeInstruction::Initialize

-### StakeInstruction::DelegateStake(u64)
-
-The Stake account is moved from Uninitialized to StakeState::Stake form.  This is
-how stakers choose their initial delegate validator node and activate their
-stake account lamports.
-
-* `account[0]` - RW - The StakeState::Stake instance. <br>
-      `StakeState::Stake::credits_observed` is initialized to `VoteState::credits`,<br>
-      `StakeState::Stake::voter_pubkey` is initialized to `account[1]`,<br>
-      `StakeState::Stake::stake` is initialized to the u64 passed as an argument above,<br>
-      `StakeState::Stake::activated` is initialized to current Bank epoch, and<br>
-      `StakeState::Stake::deactivated` is initialized to std::u64::MAX
+* `account[0]` - RW - The StakeState::Delegate instance.
+  `StakeState::Delegate::credits_observed` is initialized to `VoteState::credits`.
+  `StakeState::Delegate::voter_pubkey` is initialized to `account[1]`

 * `account[1]` - R - The VoteState instance.

-* `account[2]` - R - sysvar::current account, carries information about current Bank epoch
-
-* `account[3]` - R - stake_api::Config accoount, carries warmup, cooldown, and slashing configuration
-
 ### StakeInstruction::RedeemVoteCredits

-The staker or the owner of the Stake account sends a transaction with this
+The Staker or the owner of the Stake account sends a transaction with this
 instruction to claim rewards.

-The Vote account and the Stake account pair maintain a lifetime counter of total
-rewards generated and claimed.  Rewards are paid according to a point value
-supplied by the Bank from inflation.  A `point` is one credit * one staked
-lamport, rewards paid are proportional to the number of lamports staked.
+The Vote account and the Stake account pair maintain a lifetime counter
+of total rewards generated and claimed.  When claiming rewards, the total lamports
+deposited into the Stake account and as validator commission is proportional to
+`VoteState::credits - StakeState::credits_observed`.

-* `account[0]` - RW - The StakeState::Stake instance that is redeeming rewards.
-* `account[1]` - R - The VoteState instance, must be the same as `StakeState::voter_pubkey`
-* `account[2]` - RW - The StakeState::RewardsPool instance that will fulfill the request (picked at random).
-* `account[3]` - R - sysvar::rewards account from the Bank that carries point value.
-* `account[4]` - R - sysvar::stake_history account from the Bank that carries stake warmup/cooldown history
+
+* `account[0]` - RW - The StakeState::MiningPool instance that will fulfill the
+reward.
+* `account[1]` - RW - The StakeState::Delegate instance that is redeeming votes
+credits.
+* `account[2]` - R - The VoteState instance, must be the same as
+`StakeState::voter_pubkey`

 Reward is paid out for the difference between `VoteState::credits` to
-`StakeState::Stake::credits_observed`, multiplied by `sysvar::rewards::Rewards::validator_point_value`.
-`StakeState::Stake::credits_observed` is updated to`VoteState::credits`.  The commission is deposited into the Vote account token
+`StakeState::Delgate.credits_observed`, and `credits_observed` is updated to
+`VoteState::credits`.  The commission is deposited into the Vote account token
 balance, and the reward is deposited to the Stake account token balance.

+The total lamports paid is a percentage-rate of the lamports staked muiltplied by
+the ratio of rewards being redeemed to rewards that could have been generated
+during the rate period.
+
+Any random MiningPool can be used to redeem the credits.

 ```rust,ignore
 let credits_to_claim = vote_state.credits - stake_state.credits_observed;
@@ -163,28 +157,24 @@ stake_state.credits_observed = vote_state.credits;
 ```

 `credits_to_claim` is used to compute the reward and commission, and
-`StakeState::Stake::credits_observed` is updated to the latest
+`StakeState::Delegate::credits_observed` is updated to the latest
 `VoteState::credits` value.

-### StakeInstruction::Deactivate
-A staker may wish to withdraw from the network.  To do so he must first deactivate his stake, and wait for cool down.
+## Collecting network fees into the MiningPool

-* `account[0]` - RW - The StakeState::Stake instance that is deactivating, the transaction must be signed by this key.
-* `account[1]` - R - The VoteState instance to which this stake is delegated, required in case of slashing
-* `account[2]` - R - sysvar::current account from the Bank that carries current epoch
+At the end of the block, before the bank is frozen, but after it processed all
+the transactions for the block, a virtual instruction is executed to collect
+the transaction fees.

-StakeState::Stake::deactivated is set to the current epoch + cool down.  The account's stake will ramp down to zero by
-that epoch, and Account::lamports will be available for withdrawal.
+* A portion of the fees are deposited into the leader's account.
+* A portion of the fees are deposited into the smallest StakeState::MiningPool
+account.

+## Authorizing a Vote Signer

-### StakeInstruction::Withdraw(u64)
-Lamports build up over time in a Stake account and any excess over activated stake can be withdrawn.
-
-* `account[0]` - RW - The StakeState::Stake from which to withdraw, the transaction must be signed by this key.
-* `account[1]` - RW - Account that should be credited with the withdrawn lamports.
-* `account[2]` - R - sysvar::current account from the Bank that carries current epoch, to calculate stake.
-* `account[3]` - R - sysvar::stake_history account from the Bank that carries stake warmup/cooldown history
-
+`VoteInstruction::AuthorizeVoter` allows a staker to choose a signing service
+for its votes. That service is responsible for ensuring the vote won't cause
+the staker to be slashed.

 ## Benefits of the design

@@ -197,109 +187,9 @@ Lamports build up over time in a Stake account and any excess over activated sta
 * Commission for the work is deposited when a reward is claimed by the delegated
 stake.

+This proposal would benefit from the `read-only` accounts proposal to allow for
+many rewards to be claimed concurrently.
+
 ## Example Callflow

 <img alt="Passive Staking Callflow" src="img/passive-staking-callflow.svg" class="center"/>
-
-## Staking Rewards
-
-The specific mechanics and rules of the validator rewards regime is outlined
-here.  Rewards are earned by delegating stake to a validator that is voting
-correctly.  Voting incorrectly exposes that validator's stakes to
-[slashing](staking-and-rewards.md).
-
-### Basics
-
-The network pays rewards from a portion of network [inflation](inflation.md).
-The number of lamports available to pay rewards for an epoch is fixed and
-must be evenly divided among all staked nodes according to their relative stake
-weight and participation.  The weighting unit is called a
-[point](terminology.md#point).
-
-Rewards for an epoch are not available until the end of that epoch.
-
-At the end of each epoch, the total number of points earned during the epoch is
-summed and used to divide the rewards portion of epoch inflation to arrive at a
-point value.  This value is recorded in the bank in a
-[sysvar](terminology.md#sysvar) that maps epochs to point values.
-
-During redemption, the stake program counts the points earned by the stake for
-each epoch, multiplies that by the epoch's point value, and transfers lamports in
-that amount from a rewards account into the stake and vote accounts according to
-the vote account's commission setting.
-
-### Economics
-
-Point value for an epoch depends on aggregate network participation.  If participation
-in an epoch drops off, point values are higher for those that do participate.
-
-### Earning credits
-
-Validators earn one vote credit for every correct vote that exceeds maximum
-lockout, i.e. every time the validator's vote account retires a slot from its
-lockout list, making that vote a root for the node.
-
-Stakers who have delegated to that validator earn points in proportion to their
-stake.  Points earned is the product of vote credits and stake.
-
-### Stake warmup, cooldown, withdrawal
-
-Stakes, once delegated, do not become effective immediately.  They must first
-pass through a warm up period.  During this period some portion of the stake is
-considered "effective", the rest is considered "activating". Changes occur on
-epoch boundaries.
-
-The stake program limits the rate of change to total network stake, reflected
-in the stake program's `config::warmup_rate` (typically 15% per epoch).
-
-The amount of stake that can be warmed up each epoch is a function of the
-previous epoch's total effective stake, total activating stake, and the stake
-program's configured warmup rate.
-
-Cooldown works the same way.  Once a stake is deactivated, some part of it
-is considered "effective", and also "deactivating".  As the stake cools
-down, it continues to earn rewards and be exposed to slashing, but it also
-becomes available for withdrawal.
-
-Bootstrap stakes are not subject to warmup.
-
-Rewards are paid against the "effective" portion of the stake for that epoch.
-
-#### Warmup example
-
-Consider the situation of a single stake of 1,000 activated at epoch N, with
-network warmup rate of 20%, and a quiescent total network stake at epoch N of 2,000.
-
-At epoch N+1, the amount available to be activated for the network is 400 (20%
-of 200), and at epoch N, this example stake is the only stake activating, and so
-is entitled to all of the warmup room available.
-
-
-|epoch | effective | activating | total effective | total activating|
-|------|----------:|-----------:|----------------:|----------------:|
-|N-1   |           |            |  2,000          |  0              |
-|N     |  0        | 1,000      |  2,000          |  1,000          |
-|N+1   |  400      | 600        |  2,400          |  600            |
-|N+2   |  880      | 120        |  2,880          |  120            |
-|N+3   |  1000     | 0          |  3,000          |  0              |
-
-
-Were 2 stakes (X and Y) to activate at epoch N, they would be awarded a portion of the 20%
-in proportion to their stakes.  At each epoch effective and activating for each stake is
-a function of the previous epoch's state.
-
-|epoch | X eff     | X act      | Y eff     | Y act      | total effective | total activating|
-|------|----------:|-----------:|----------:|-----------:|----------------:|----------------:|
-|N-1   |           |            |           |            |  2,000          |  0              |
-|N     |  0        | 1,000      |  0        | 200        |  2,000          |  1,200          |
-|N+1   |  320      | 680        |  80       | 120        |  2,400          |    800          |
-|N+2   |  728      | 272        |  152      | 48         |  2,880          |    320          |
-|N+3   |  1000     | 0          |  200      | 0          |  3,200          |      0          |
-
-
-### Withdrawal
-
-As rewards are earned lamports can be withdrawn from a stake account.  Only
-lamports in excess of effective+activating stake may be withdrawn at any time.
-This means that during warmup, effectively no stake can be withdrawn.  During
-cooldown, any tokens in excess of effective stake may be withdrawn (activating == 0);
--- a/book/src/staking-rewards.md
+++ b/book/src/staking-rewards.md
@@ -48,7 +48,7 @@ specific parameters will be necessary:

 Solana's trustless sense of time and ordering provided by its PoH data
 structure, along with its
-[turbine](https://www.youtube.com/watch?v=qt_gDRXHrHQ&t=1s) data broadcast
+[avalanche](https://www.youtube.com/watch?v=qt_gDRXHrHQ&t=1s) data broadcast
 and transmission design, should provide sub-second transaction confirmation times that scale
 with the log of the number of nodes in the cluster. This means we shouldn't
 have to restrict the number of validating nodes with a prohibitive 'minimum
--- a/book/src/terminology.md
+++ b/book/src/terminology.md
@@ -58,17 +58,6 @@ with a ledger interpretation that matches the leader's.

 A gossip network connecting all [nodes](#node) of a [cluster](#cluster).

-#### cooldown period
-
-Some number of epochs after stake has been deactivated while it progressively
-becomes available for withdrawal. During this period, the stake is considered to
-be "deactivating". More info about:
-[warmup and cooldown](stake-delegation-and-rewards.md#stake-warmup-cooldown-withdrawal)
-
-#### credit
-
-See [vote credit](#vote-credit).
-
 #### data plane

 A multicast network used to efficiently validate [entries](#entry) and gain
@@ -102,10 +91,6 @@ History](#proof-of-history).
 The time, i.e. number of [slots](#slot), for which a [leader
 schedule](#leader-schedule) is valid.

-#### finality
-
-When nodes representing 2/3rd of the stake have a common [root](#root).
-
 #### fork

 A [ledger](#ledger) derived from common entries but then diverged.
@@ -204,10 +189,6 @@ The number of [fullnodes](#fullnode) participating in a [cluster](#cluster).

 See [Proof of History](#proof-of-history).

-#### point
-
-A weighted [credit](#credit) in a rewards regime.  In the validator [rewards regime](staking-rewards.md), the number of points owed to a stake during redemption is the product of the [vote credits](#vote-credit) earned and the number of lamports staked.
-
 #### program

 The code that interprets [instructions](#instruction).
@@ -232,15 +213,6 @@ The public key of a [keypair](#keypair).
 Storage mining client, stores some part of the ledger enumerated in blocks and
 submits storage proofs to the chain. Not a full-node.

-#### root
-
-A [block](#block) or [slot](#slot) that has reached maximum [lockout](#lockout)
-on a validator.  The root is the highest block that is an ancestor of all active
-forks on a validator.  All ancestor blocks of a root are also transitively a
-root.  Blocks that are not an ancestor and not a descendant of the root are
-excluded from consideration for consensus and can be discarded.
-
-
 #### runtime

 The component of a [fullnode](#fullnode) responsible for [program](#program)
@@ -291,11 +263,6 @@ hash values and a bit which says if this hash is valid or fake.

 The number of keys and samples that a validator can verify each storage epoch.

-#### sysvar
-
-A synthetic [account](#account) provided by the runtime to allow programs to
-access network state such as current tick height, rewards [points](#point) values, etc.
-
 #### thin client

 A type of [client](#client) that trusts it is communicating with a valid
@@ -343,15 +310,3 @@ that it ran, which can then be verified in less time than it took to produce.
 #### vote

 See [ledger vote](#ledger-vote).
-
-#### vote credit
-
-A reward tally for validators.  A vote credit is awarded to a validator in its
-vote account when the validator reaches a [root](#root).
-
-#### warmup period
-
-Some number of epochs after stake has been delegated while it progressively
-becomes effective. During this period, the stake is considered to be
-"activating". More info about:
-[warmup and cooldown](stake-delegation-and-rewards.md#stake-warmup-cooldown-withdrawal)
--- a/book/src/testnet-participation.md
+++ b/book/src/testnet-participation.md
@@ -1,5 +1,199 @@
 ## Testnet Participation
+This document describes how to participate in the testnet as a
+validator node.

-Participate in our testnet:
-  * [Running a Validator](running-validator.md)
-  * [Running a Replicator](running-replicator.md)
+Please note some of the information and instructions described here may change
+in future releases.
+
+### Overview
+The testnet features a validator running at testnet.solana.com, which
+serves as the entrypoint to the cluster for your validator.
+
+Additionally there is a blockexplorer available at
+[http://testnet.solana.com/](http://testnet.solana.com/).
+
+The testnet is configured to reset the ledger daily, or sooner
+should the hourly automated cluster sanity test fail.
+
+There is a **#validator-support** Discord channel available to reach other
+testnet participants, [https://discord.gg/pquxPsq](https://discord.gg/pquxPsq).
+
+Also we'd love it if you choose to register your validator node with us at
+[https://forms.gle/LfFscZqJELbuUP139](https://forms.gle/LfFscZqJELbuUP139).
+
+### Machine Requirements
+Since the testnet is not intended for stress testing of max transaction
+throughput, a higher-end machine with a GPU is not necessary to participate.
+
+However ensure the machine used is not behind a residential NAT to avoid NAT
+traversal issues.  A cloud-hosted machine works best.  **Ensure that IP ports
+8000 through 10000 are not blocked for Internet inbound and outbound traffic.**
+
+Prebuilt binaries are available for Linux x86_64 (Ubuntu 18.04 recommended).
+MacOS or WSL users may build from source.
+
+For a performance testnet with many transactions we have some preliminary recommended setups:
+
+| | Low end | Medium end | High end | Notes |
+| --- | ---------|------------|----------| -- |
+| CPU | AMD Threadripper 1900x | AMD Threadripper 2920x | AMD Threadripper 2950x | Consider a 10Gb-capable motherboard with as many PCIe lanes and m.2 slots as possible. |
+| RAM | 16GB | 32GB | 64GB | |
+| OS Drive | Samsung 860 Evo 2TB | Samsung 860 Evo 4TB | Samsung 860 Evo 4TB | Or equivalent SSD |
+| Accounts Drive(s) | None | Samsung 970 Pro 1TB | 2x Samsung 970 Pro 1TB | |
+| GPU | 4x Nvidia 1070 or 2x Nvidia 1080 Ti or 2x Nvidia 2070 | 2x Nvidia 2080 Ti | 4x Nvidia 2080 Ti | Any number of cuda-capable GPUs are supported on Linux platforms. |
+
+#### Confirm The Testnet Is Reachable
+Before attaching a validator node, sanity check that the cluster is accessible
+to your machine by running some simple commands.  If any of the commands fail,
+please retry 5-10 minutes later to confirm the testnet is not just restarting
+itself before debugging further.
+
+Fetch the current transaction count over JSON RPC:
+```bash
+$ curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1, "method":"getTransactionCount"}' http://testnet.solana.com:8899
+```
+
+Inspect the blockexplorer at [http://testnet.solana.com/](http://testnet.solana.com/) for activity.
+
+View the [metrics dashboard](
+https://metrics.solana.com:3000/d/testnet-beta/testnet-monitor-beta?var-testnet=testnet)
+for more detail on cluster activity.
+
+### Validator Setup
+#### Obtaining The Software
+##### Bootstrap with `solana-install`
+
+The `solana-install` tool can be used to easily install and upgrade the cluster
+software on Linux x86_64 systems.
+
+```bash
+$ export SOLANA_RELEASE=v0.15.0  # skip this line to install the latest release
+$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.14.0/install/solana-install-init.sh | sh -s
+```
+
+Alternatively build the `solana-install` program from source and run the
+following command to obtain the same result:
+```bash
+$ solana-install init
+```
+
+After a successful install, `solana-install update` may be used to easily update the cluster
+software to a newer version.
+
+##### Download Prebuilt Binaries
+Binaries are available for Linux x86_64 systems.
+
+Download the binaries by navigating to
+[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
+download **solana-release-x86_64-unknown-linux-gnu.tar.bz2**, then extract the
+archive:
+```bash
+$ tar jxf solana-release-x86_64-unknown-linux-gnu.tar.bz2
+$ cd solana-release/
+$ export PATH=$PWD/bin:$PATH
+```
+##### Build From Source
+If you are unable to use the prebuilt binaries or prefer to build it yourself
+from source, navigate to
+[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
+and download the **Source Code** archive.  Extract the code and build the
+binaries with:
+```bash
+$ ./scripts/cargo-install-all.sh .
+$ export PATH=$PWD/bin:$PATH
+```
+
+### Starting The Validator
+Sanity check that you are able to interact with the cluster by receiving a small
+airdrop of lamports from the testnet drone:
+```bash
+$ solana-wallet airdrop 123
+$ solana-wallet balance
+```
+
+Also try running following command to join the gossip network and view all the other nodes in the cluster:
+```bash
+$ solana-gossip --entrypoint testnet.solana.com:8001 spy
+# Press ^C to exit
+```
+
+Now configure a key pair for your validator by running:
+```bash
+$ solana-keygen -o validator-keypair.json
+```
+
+Then use one of the following commands, depending on your installation
+choice, to start the node:
+
+If this is a `solana-install`-installation:
+```bash
+$ clear-config.sh
+$ validator.sh --identity validator-keypair.json --poll-for-new-genesis-block testnet.solana.com
+```
+
+Alternatively, the `solana-install run` command can be used to run the validator
+node while periodically checking for and applying software updates:
+```bash
+$ clear-config.sh
+$ solana-install run validator.sh -- --identity validator-keypair.json --poll-for-new-genesis-block testnet.solana.com
+```
+
+If you built from source:
+```bash
+$ USE_INSTALL=1 ./multinode-demo/clear-config.sh
+$ USE_INSTALL=1 ./multinode-demo/validator.sh --identity validator-keypair.json --poll-for-new-genesis-block testnet.solana.com
+```
+
+#### Controlling local network port allocation
+By default the validator will dynamically select available network ports in the
+8000-10000 range, and may be overridden with `--dynamic-port-range`.  For
+example, `validator.sh --dynamic-port-range 11000-11010 ...` will restrict the
+validator to ports 11000-11011.
+
+### Validator Monitoring
+When `validator.sh` starts, it will output a validator configuration that looks
+similar to:
+```bash
+======================[ validator configuration ]======================
+identity pubkey: 4ceWXsL3UJvn7NYZiRkw7NsryMpviaKBDYr8GK7J61Dm
+vote pubkey: 2ozWvfaXQd1X6uKh8jERoRGApDqSqcEy6fF1oN13LL2G
+ledger: ...
+accounts: ...
+======================================================================
+```
+
+The **identity pubkey** for your validator can also be found by running:
+```bash
+$ solana-keygen pubkey validator-keypair.json
+```
+
+From another console, confirm the IP address and **identity pubkey** of your validator is visible in the
+gossip network by running:
+```bash
+$ solana-gossip --entrypoint testnet.solana.com:8001 spy
+```
+
+Provide the **vote pubkey** to the `solana-wallet show-vote-account` command to view
+the recent voting activity from your validator:
+```bash
+$ solana-wallet show-vote-account 2ozWvfaXQd1X6uKh8jERoRGApDqSqcEy6fF1oN13LL2G
+```
+
+The vote pubkey for the validator can also be found by running:
+```bash
+# If this is a `solana-install`-installation run:
+$ solana-keygen pubkey ~/.local/share/solana/install/active_release/config-local/validator-vote-keypair.json
+# Otherwise run:
+$ solana-keygen pubkey ./config-local/validator-vote-keypair.json
+```
+
+### Sharing Metrics From Your Validator
+If you have obtained a metrics username/password from the Solana maintainers to
+help us monitor the health of the testnet, please perform the following steps
+before starting the validator to activate metrics reporting:
+```bash
+export u="username obtained from the Solana maintainers"
+export p="password obtained from the Solana maintainers"
+export SOLANA_METRICS_CONFIG="db=testnet,u=${u:?},p=${p:?}"
+source scripts/configure-metrics.sh
+```
--- a/book/src/transaction-api.md
+++ b/book/src/transaction-api.md
@@ -1,48 +0,0 @@
-# The Transaction
-
-### Components of a `Transaction`
-
-* **Transaction:**
-  * **message:** Defines the transaction
-    * **header:** Details the account types of and signatures required by
-      the transaction
-      *  **num_required_signatures:** The total number of signatures
-         required to make the transaction valid.
-      *  **num_credit_only_signed_accounts:** The last
-         `num_credit_only_signed_accounts` signatures refer to signing
-         credit only accounts. Credit only accounts can be used concurrently
-         by multiple parallel transactions, but their balance may only be
-         increased, and their account data is read-only.
-      *  **num_credit_only_unsigned_accounts:** The last
-         `num_credit_only_unsigned_accounts` pubkeys in `account_keys` refer
-         to non-signing credit only accounts
-    * **account_keys:** List of pubkeys used by the transaction, including
-      by the instructions and for signatures. The first
-      `num_required_signatures` pubkeys must sign the transaction.
-    * **recent_blockhash:** The ID of a recent ledger entry. Validators will
-      reject transactions with a `recent_blockhash` that is too old.
-    * **instructions:** A list of [instructions](instruction.md) that are
-      run sequentially and committed in one atomic transaction if all
-      succeed.
-  * **signatures:** A list of signatures applied to the transaction. The
-    list is always of length `num_required_signatures`, and the signature
-    at index `i` corresponds to the pubkey at index `i` in `account_keys`.
-    The list is initialized with empty signatures (i.e. zeros), and
-    populated as signatures are added.
-  
-### Transaction Signing
-
-A `Transaction` is signed by using an ed25519 keypair to sign the
-serialization of the `message`. The resulting signature is placed at the
-index of `signatures` matching the index of the keypair's pubkey in
-`account_keys`.
-
-### Transaction Serialization
-
-`Transaction`s (and their `message`s) are serialized and deserialized
-using the [bincode](https://crates.io/crates/bincode) crate with a
-non-standard vector serialization that uses only one byte for the length
-if it can be encoded in 7 bits, 2 bytes if it fits in 14 bits, or 3
-bytes if it requires 15 or 16 bits. The vector serialization is defined
-by Solana's
-[short-vec](https://github.com/solana-labs/solana/blob/master/sdk/src/short_vec.rs).
--- a/book/src/transaction-fees.md
+++ b/book/src/transaction-fees.md
@@ -8,14 +8,17 @@ client won't know how much was collected until the transaction is confirmed by
 the cluster and the remaining balance is checked. It smells of exactly what we
 dislike about Ethereum's "gas", non-determinism.

+## Implementation Status
+
+This design is not yet implemented, but is written as though it has been.  Once
+implemented, delete this comment.
+
 ### Congestion-driven fees

 Each validator uses *signatures per slot* (SPS) to estimate network congestion
 and *SPS target* to estimate the desired processing capacity of the cluster.
 The validator learns the SPS target from the genesis block, whereas it
-calculates SPS from recently processed transactions.  The genesis block also
-defines a target `lamports_per_signature`, which is the fee to charge per
-signature when the cluster is operating at *SPS target*.
+calculates SPS from the ledger data in the previous epoch.

 ### Calculating fees

@@ -34,11 +37,8 @@ lamports as returned by the fee calculator.
 In the first implementation of this design, the only fee parameter is
 `lamports_per_signature`. The more signatures the cluster needs to verify, the
 higher the fee. The exact number of lamports is determined by the ratio of SPS
-to the SPS target. At the end of each slot, the cluster lowers
-`lamports_per_signature` when SPS is below the target and raises it when above
-the target.  The minimum value for `lamports_per_signature` is 50% of the target
-`lamports_per_signature` and the maximum value is 10x the target
-`lamports_per_signature'
+to the SPS target. The cluster lowers `lamports_per_signature` when SPS is
+below the target and raises it when at or above the target.

 Future parameters might include:

--- a/book/src/transaction.md
+++ b/book/src/transaction.md
@@ -1,43 +0,0 @@
-# Anatomy of a Transaction
-
-Transactions encode lists of instructions that are executed
-sequentially, and only committed if all the instructions complete
-successfully. All account states are reverted upon the failure of a
-transaction. Each Transaction details the accounts used, including which
-must sign and which are credit only, a recent blockhash, the
-instructions, and any signatures.
-
-## Accounts and Signatures
-
-Each transaction explicitly lists all accounts that it needs access to.
-This includes accounts that are transferring tokens, accounts whose user
-data is being modified, and the program accounts that are being called
-by the instructions. Each account that is not an executable program can
-be marked as a requiring a signature and/or as credit only. All accounts
-marked as signers must have a valid signature in the transaction's list
-of signatures before the transaction is considered valid. Any accounts
-marked as credit only may only have their token value increased, and
-their user data is read only. Accounts are locked by the runtime,
-ensuring that they are not modified by a concurrent program while the
-transaction is running. Credit only accounts can safely be shared, so
-the runtime will allow multiple concurrent credit only locks on an
-account.
-
-## Recent Blockhash
-
-A Transaction includes a recent blockhash to prevent duplication and to
-give transactions lifetimes. Any transaction that is completely
-identical to a previous one is rejected, so adding a newer blockhash
-allows multiple transactions to repeat the exact same action.
-Transactions also have lifetimes that are defined by the blockhash, as
-any transaction whose blockhash is too old will be rejected.
-
-## Instructions
-
-Each instruction specifies a single program account (which must be
-marked executable), a subset of the transaction's accounts that should
-be passed to the program, and a data byte array instruction that is
-passed to the program. The program interprets the data array and
-operates on the accounts specified by the instructions. The program can
-return successfully, or with an error code. An error return causes the
-entire transaction to fail immediately.
--- a/book/src/validator-faq.md
+++ b/book/src/validator-faq.md
@@ -1,2 +0,0 @@
-# Validator FAQ
-Coming soon...
--- a/book/src/validator-hardware.md
+++ b/book/src/validator-hardware.md
@@ -1,28 +0,0 @@
-# Validator Hardware Requirements
-Since the testnet is not intended for stress testing of max transaction
-throughput, a higher-end machine with a GPU is not necessary to participate.
-
-However ensure the machine used is not behind a residential NAT to avoid NAT
-traversal issues.  A cloud-hosted machine works best.  **Ensure that IP ports
-8000 through 10000 are not blocked for Internet inbound and outbound traffic.**
-
-Prebuilt binaries are available for Linux x86_64 (Ubuntu 18.04 recommended).
-MacOS or WSL users may build from source.
-
-## Recommended Setups
-For a performance testnet with many transactions we have some preliminary recommended setups:
-
-| | Low end | Medium end | High end | Notes |
-| --- | ---------|------------|----------| -- |
-| CPU | AMD Threadripper 1900x | AMD Threadripper 2920x | AMD Threadripper 2950x | Consider a 10Gb-capable motherboard with as many PCIe lanes and m.2 slots as possible. |
-| RAM | 16GB | 32GB | 64GB | |
-| OS Drive | Samsung 860 Evo 2TB | Samsung 860 Evo 4TB | Samsung 860 Evo 4TB | Or equivalent SSD |
-| Accounts Drive(s) | None | Samsung 970 Pro 1TB | 2x Samsung 970 Pro 1TB | |
-| GPU | 4x Nvidia 1070 or 2x Nvidia 1080 Ti or 2x Nvidia 2070 | 2x Nvidia 2080 Ti | 4x Nvidia 2080 Ti | Any number of cuda-capable GPUs are supported on Linux platforms. |
-
-## GPU Requirements
-CUDA is required to make use of the GPU on your system.  The provided Solana
-release binaries are built on Ubuntu 18.04 with <a
-href="https://developer.nvidia.com/cuda-toolkit-archive">CUDA Toolkit 10.1
-update 1"</a>.  If your machine is using a different CUDA version then you will
-need to rebuild from source.
--- a/book/src/validator-info.md
+++ b/book/src/validator-info.md
@@ -1,31 +0,0 @@
-# Publishing Validator Info
-
-You can publish your validator information to the chain to be publicly visible
-to other users.
-
-## Run solana-validator-info
-Run the solana-validator-info CLI to populate a validator-info account:
-```bash
-$ solana-validator-info publish ~/validator-keypair.json <VALIDATOR_NAME> <VALIDATOR_INFO_ARGS>
-```
-Optional fields for VALIDATOR_INFO_ARGS:
-* Website
-* Keybase Username
-* Details
-
-## Keybase
-
-Including a Keybase username allows client applications (like the Solana Network
-Explorer) to automatically pull in your validator public profile, including
-cryptographic proofs, brand identity, etc. To connect your validator pubkey with
-Keybase:
-
-1. Join https://keybase.io/ and complete the profile for your validator
-2. Add your validator **identity pubkey** to Keybase:
-  * Create an empty file on your local computer called `validator-<PUBKEY>`
-  * In Keybase, navigate to the Files section, and upload your pubkey file to
-  a `solana` subdirectory in your public folder: `/keybase/public/<KEYBASE_USERNAME>/solana`
-  * To check your pubkey, ensure you can successfully browse to
-  `https://keybase.pub/<KEYBASE_USERNAME>/solana/validator-<PUBKEY>`
-3. Add or update your `solana-validator-info` with your Keybase username. The
-CLI will verify the `validator-<PUBKEY>` file
--- a/book/src/validator-monitor.md
+++ b/book/src/validator-monitor.md
@@ -1,106 +0,0 @@
-# Validator Monitoring
-When `validator.sh` starts, it will output a validator configuration that looks
-similar to:
-```bash
-======================[ validator configuration ]======================
-identity pubkey: 4ceWXsL3UJvn7NYZiRkw7NsryMpviaKBDYr8GK7J61Dm
-vote pubkey: 2ozWvfaXQd1X6uKh8jERoRGApDqSqcEy6fF1oN13LL2G
-ledger: ...
-accounts: ...
-======================================================================
-```
-
-## Check Gossip
-The **identity pubkey** for your validator can also be found by running:
-```bash
-$ solana-keygen pubkey ~/validator-keypair.json
-```
-
-From another console, confirm the IP address and **identity pubkey** of your
-validator is visible in the gossip network by running:
-```bash
-$ solana-gossip --entrypoint testnet.solana.com:8001 spy
-```
-
-## Check Vote Activity
-The vote pubkey for the validator can be found by running:
-```bash
-$ solana-keygen pubkey ~/validator-vote-keypair.json
-```
-
-Provide the **vote pubkey** to the `solana show-vote-account` command to view
-the recent voting activity from your validator:
-```bash
-$ solana show-vote-account 2ozWvfaXQd1X6uKh8jERoRGApDqSqcEy6fF1oN13LL2G
-```
-
-## Check Your Balance
-Your lamport balance should decrease by the transaction fee amount as your
-validator submits votes, and increase after serving as the leader:
-```bash
-$ solana balance
-```
-
-## Check Slot Number
-After your validator boots, it may take some time to catch up with the cluster.
-Use the `get-slot` command to view the current slot that the cluster is
-processing:
-```bash
-$ solana get-slot
-```
-
-The current slot that your validator is processing can then been seen with:
-```bash
-$ solana --url http://127.0.0.1:8899 get-slot
-```
-
-Until your validator has caught up, it will not be able to vote successfully and
-stake cannot be delegated to it.
-
-Also if you find the cluster's slot advancing faster than yours, you will likely
-never catch up.  This typically implies some kind of networking issue between
-your validator and the rest of the cluster.
-
-## Get Cluster Info
-There are several useful JSON-RPC endpoints for monitoring your validator on the
-cluster, as well as the health of the cluster:
-
-```bash
-# Similar to solana-gossip, you should see your validator in the list of cluster nodes
-$ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getClusterNodes"}' http://testnet.solana.com:8899
-# If your validator is properly voting, it should appear in the list of `current` vote accounts. If staked, `stake` should be > 0
-$ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getVoteAccounts"}' http://testnet.solana.com:8899
-# Returns the current leader schedule
-$ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getLeaderSchedule"}' http://testnet.solana.com:8899
-# Returns info about the current epoch. slotIndex should progress on subsequent calls.
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getEpochInfo"}' http://testnet.solana.com:8899
-```
-
-## Validator Metrics
-Metrics are available for local monitoring of your validator.
-
-Docker must be installed and the current user added to the docker group.  Then
-download `solana-metrics.tar.bz2` from the Github Release and run
-```bash
-$ tar jxf solana-metrics.tar.bz2
-$ cd solana-metrics/
-$ ./start.sh
-```
-
-A local InfluxDB and Grafana instance is now running on your machine.  Define
-`SOLANA_METRICS_CONFIG` in your environment as described at the end of the
-`start.sh` output and restart your validator.
-
-Metrics should now be streaming and visible from your local Grafana dashboard.
-
-## Timezone For Log Messages
-Log messages emitted by your validator include a timestamp.  When sharing logs
-with others to help triage issues, that timestamp can cause confusion as it does
-not contain timezone information.
-
-To make it easier to compare logs between different sources we request that
-everybody use Pacific Time on their validator nodes.  In Linux this can be
-accomplished by running:
-```bash
-$ sudo ln -sf /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
-```
--- a/book/src/validator-software.md
+++ b/book/src/validator-software.md
@@ -1,63 +0,0 @@
-# Installing the Validator Software
-
-## Bootstrap with `solana-install`
-
-The `solana-install` tool can be used to easily install and upgrade the validator
-software on Linux x86_64 and mac OS systems.
-
-```bash
-$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.18.0/install/solana-install-init.sh | sh -s
-```
-
-Alternatively build the `solana-install` program from source and run the
-following command to obtain the same result:
-```bash
-$ solana-install init
-```
-
-After a successful install, `solana-install update` may be used to easily update the cluster
-software to a newer version at any time.
-
-## Download Prebuilt Binaries
-If you would rather not use `solana-install` to manage the install, you can manually download and install the binaries.
-
-### Linux
-Download the binaries by navigating to
-[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-download **solana-release-x86_64-unknown-linux-gnu.tar.bz2**, then extract the
-archive:
-```bash
-$ tar jxf solana-release-x86_64-unknown-linux-gnu.tar.bz2
-$ cd solana-release/
-$ export PATH=$PWD/bin:$PATH
-```
-### mac OS
-Download the binaries by navigating to
-[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-download **solana-release-x86_64-apple-darwin.tar.bz2**, then extract the
-archive:
-```bash
-$ tar jxf solana-release-x86_64-apple-darwin.tar.bz2
-$ cd solana-release/
-$ export PATH=$PWD/bin:$PATH
-```
-
-## Build From Source
-If you are unable to use the prebuilt binaries or prefer to build it yourself
-from source, navigate to
-[https://github.com/solana-labs/solana/releases/latest](https://github.com/solana-labs/solana/releases/latest),
-and download the **Source Code** archive.  Extract the code and build the
-binaries with:
-```bash
-$ ./scripts/cargo-install-all.sh .
-$ export PATH=$PWD/bin:$PATH
-```
-
-If building for CUDA (Linux only), fetch the perf-libs first then include the
-`cuda` feature flag when building:
-```bash
-$ ./fetch-perf-libs.sh
-$ source target/perf-libs/env.sh
-$ ./scripts/cargo-install-all.sh . cuda
-$ export PATH=$PWD/bin:$PATH
-```
--- a/book/src/validator-stake.md
+++ b/book/src/validator-stake.md
@@ -1,41 +0,0 @@
-## Staking a Validator
-When your validator starts, it will have no stake, which means it will be
-ineligible to become leader.
-
-Adding stake can be accomplished by using the `solana` CLI
-
-First create a stake account keypair with `solana-keygen`:
-```bash
-$ solana-keygen new -o ~/validator-config/stake-keypair.json
-```
-and use the cli's `delegate-stake` command to stake your validator with 42 lamports:
-```bash
-$ solana delegate-stake ~/validator-config/stake-keypair.json ~/validator-vote-keypair.json 42
-```
-
-Note that stakes need to warm up, and warmup increments are applied at Epoch boundaries, so it can take an hour
-or more for the change to fully take effect.
-
-Assuming your node is voting, now you're up and running and generating validator rewards.  You'll want
-to periodically redeem/claim your rewards:
-
-```bash
-$ solana-wallet redeem-vote-credits ~/validator-config/stake-keypair.json ~/validator-vote-keypair.json
-```
-
-The rewards lamports earned are split between your stake account and the vote account according to the
-commission rate set in the vote account.
-
-Stake can be deactivated by running:
-```bash
-$ solana deactivate-stake ~/validator-config/stake-keypair.json ~/validator-vote-keypair.json
-```
-
-The stake will cool down, deactivate over time.  While cooling down, your stake will continue to earn
-rewards.
-
-Note that a stake account may only be used once, so after deactivation, use the
-cli's `withdraw-stake` command to recover the previously staked lamports.
-
-Be sure and redeem your credits before withdrawing all your lamports.
-Once the account is fully withdrawn, the account is destroyed.
--- a/book/src/validator-start.md
+++ b/book/src/validator-start.md
@@ -1,112 +0,0 @@
-# Starting a Validator
-
-## Confirm The Testnet Is Reachable
-Before attaching a validator node, sanity check that the cluster is accessible
-to your machine by running some simple commands.  If any of the commands fail,
-please retry 5-10 minutes later to confirm the testnet is not just restarting
-itself before debugging further.
-
-Fetch the current transaction count over JSON RPC:
-```bash
-$ curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1, "method":"getTransactionCount"}' http://testnet.solana.com:8899
-```
-
-Inspect the network explorer at
-[https://explorer.solana.com/](https://explorer.solana.com/) for activity.
-
-View the [metrics dashboard](
-https://metrics.solana.com:3000/d/testnet-beta/testnet-monitor-beta?var-testnet=testnet)
-for more detail on cluster activity.
-
-## Confirm your Installation
-Sanity check that you are able to interact with the cluster by receiving a small
-airdrop of lamports from the testnet drone:
-```bash
-$ solana set --url http://testnet.solana.com:8899
-$ solana get
-$ solana airdrop 123
-$ solana balance
-```
-
-Also try running following command to join the gossip network and view all the
-other nodes in the cluster:
-```bash
-$ solana-gossip --entrypoint testnet.solana.com:8001 spy
-# Press ^C to exit
-```
-
-## Start your Validator
-Create an identity keypair for your validator by running:
-```bash
-$ solana-keygen new -o ~/validator-keypair.json
-```
-
-### Wallet Configuration
-You can set solana configuration to use your validator keypair for all
-following commands:
-```bash
-$ solana set --keypair ~/validator-keypair.json
-```
-
-**All following solana commands assume you have set `--keypair` config to
-**your validator identity keypair.**
-If you haven't, you will need to add the `--keypair` argument to each command, like:
-```bash
-$ solana --keypair ~/validator-keypair.json airdrop 1000
-```
-(You can always override the set configuration by explicitly passing the
-`--keypair` argument with a command.)
-
-### Validator Start
-Airdrop yourself some lamports to get started:
-```bash
-$ solana airdrop 1000
-```
-
-Your validator will need a vote account.  Create it now with the following
-commands:
-```bash
-$ solana-keygen new -o ~/validator-vote-keypair.json
-$ solana create-vote-account ~/validator-vote-keypair.json ~/validator-keypair.json 1
-```
-
-Then use one of the following commands, depending on your installation
-choice, to start the node:
-
-If this is a `solana-install`-installation:
-```bash
-$ validator.sh --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --ledger ~/validator-config --rpc-port 8899 --poll-for-new-genesis-block --entrypoint testnet.solana.com
-```
-
-Alternatively, the `solana-install run` command can be used to run the validator
-node while periodically checking for and applying software updates:
-```bash
-$ solana-install run validator.sh -- --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --ledger ~/validator-config --rpc-port 8899 --poll-for-new-genesis-block --entrypoint testnet.solana.com
-```
-
-If you built from source:
-```bash
-$ NDEBUG=1 USE_INSTALL=1 ./multinode-demo/validator.sh --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --rpc-port 8899 --poll-for-new-genesis-block --entrypoint testnet.solana.com
-```
-
-### Enabling CUDA
-By default CUDA is disabled.  If your machine has a GPU with CUDA installed,
-define the SOLANA_CUDA flag in your environment *before* running any of the
-previusly mentioned commands
-```bash
-$ export SOLANA_CUDA=1
-```
-
-When your validator is started look for the following log message to indicate that CUDA is enabled:
-`"[<timestamp> solana::validator] CUDA is enabled"`
-
-### Controlling local network port allocation
-By default the validator will dynamically select available network ports in the
-8000-10000 range, and may be overridden with `--dynamic-port-range`.  For
-example, `validator.sh --dynamic-port-range 11000-11010 ...` will restrict the
-validator to ports 11000-11011.
-
-### Limiting ledger size to conserve disk space
-By default the validator will retain the full ledger.  To conserve disk space
-start the validator with the `--limit-ledger-size`, which will instruct the
-validator to only retain the last couple hours of ledger.
--- a/book/src/validator-testnet.md
+++ b/book/src/validator-testnet.md
@@ -1,72 +0,0 @@
-# Choosing a Testnet
-As noted in the overview, solana currently maintains several testnets, each featuring a validator that can serve as the entrypoint to the cluster for your validator.
-
-Current testnet entrypoints:
- Stable, testnet.solana.com
- Beta, beta.testnet.solana.com
- Edge, edge.testnet.solana.com
-
-Prior to mainnet, the testnets may be running different versions of solana
-software, which may feature breaking changes. Generally, the edge testnet tracks
-the tip of master, beta tracks the latest tagged minor release, and stable
-tracks the most stable tagged release.
-
-### Get Testnet Version
-You can submit a JSON-RPC request to see the specific version of the cluster.
-```bash
-$ curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1, "method":"getVersion"}' edge.testnet.solana.com:8899
-{"jsonrpc":"2.0","result":{"solana-core":"0.18.0-pre1"},"id":1}
-```
-
-## Using a Different Testnet
-This guide is written in the context of testnet.solana.com, our most stable
-cluster. To participate in another testnet, you will need to modify some of the
-commands in the following pages.
-
-### Downloading Software
-If you are bootstrapping with `solana-install`, you can specify the release tag or named channel to install to match your desired testnet.
-
-```bash
-$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.18.0/install/solana-install-init.sh | sh -s - 0.18.0
-```
-
-```bash
-$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.18.0/install/solana-install-init.sh | sh -s - beta
-```
-
-Similarly, you can add this argument to the `solana-install` command if you've built the program from source:
-```bash
-$ solana-install init 0.18.0
-```
-
-If you are downloading pre-compiled binaries or building from source, simply choose the release matching your desired testnet.
-
-### Validator Commands
-Solana CLI tools like solana and solana-validator-info point at
-testnet.solana.com by default. Include a `--url` argument to point at a
-different testnet. For instance:
-```bash
-$ solana --url http://beta.testnet.solana.com:8899 balance
-```
-
-The solana cli includes `get` and `set` configuration commands to automatically
-set the `--url` argument for future wallet commands.
-For example:
-```bash
-$ solana set --url http://beta.testnet.solana.com:8899
-$ solana balance # Same result as command above
-```
-(You can always override the set configuration by explicitly passing the `--url`
-argument with a command.)
-
-Solana-gossip and solana-validator commands already require an explicit
-`--entrypoint` argument. Simply replace testnet.solana.com in the examples with
-an alternate url to interact with a different testnet. For example:
-```bash
-$ validator.sh --identity ~/validator-keypair.json --voting-keypair ~/validator-vote-keypair.json --ledger ~/validator-config --rpc-port 8899 --poll-for-new-genesis-block beta.testnet.solana.com
-```
-
-You can also submit JSON-RPC requests to a different testnet, like:
-```bash
-$ curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1, "method":"getTransactionCount"}' http://beta.testnet.solana.com:8899
-```
--- a/book/src/validator-troubleshoot.md
+++ b/book/src/validator-troubleshoot.md
@@ -1,2 +0,0 @@
-# Troubleshooting Validator Issues
-Coming soon...
--- a/book/src/wallet.md
+++ b/book/src/wallet.md
@@ -1,6 +1,6 @@
-## solana CLI
+## solana-wallet CLI

-The [solana-cli crate](https://crates.io/crates/solana-cli) provides a command-line interface tool for Solana
+The [solana crate](https://crates.io/crates/solana) is distributed with a command-line interface tool

 ### Examples

@@ -8,7 +8,7 @@ The [solana-cli crate](https://crates.io/crates/solana-cli) provides a command-l

 ```sh
 // Command
-$ solana address
+$ solana-wallet address

 // Return
 <PUBKEY>
@@ -18,7 +18,7 @@ $ solana address

 ```sh
 // Command
-$ solana airdrop 123
+$ solana-wallet airdrop 123

 // Return
 "Your balance is: 123"
@@ -28,7 +28,7 @@ $ solana airdrop 123

 ```sh
 // Command
-$ solana balance
+$ solana-wallet balance

 // Return
 "Your balance is: 123"
@@ -38,7 +38,7 @@ $ solana balance

 ```sh
 // Command
-$ solana confirm <TX_SIGNATURE>
+$ solana-wallet confirm <TX_SIGNATURE>

 // Return
 "Confirmed" / "Not found" / "Transaction failed with error <ERR>"
@@ -48,7 +48,7 @@ $ solana confirm <TX_SIGNATURE>

 ```sh
 // Command
-$ solana deploy <PATH>
+$ solana-wallet deploy <PATH>

 // Return
 <PROGRAM_ID>
@@ -58,7 +58,7 @@ $ solana deploy <PATH>

 ```sh
 // Command
-$ solana pay <PUBKEY> 123
+$ solana-wallet pay <PUBKEY> 123

 // Return
 <TX_SIGNATURE>
@@ -68,7 +68,7 @@ $ solana pay <PUBKEY> 123

 ```sh
 // Command
-$ solana pay <PUBKEY> 123 \
+$ solana-wallet pay <PUBKEY> 123 \
    --after 2018-12-24T23:59:00 --require-timestamp-from <PUBKEY>

 // Return
@@ -81,7 +81,7 @@ $ solana pay <PUBKEY> 123 \
 A third party must send a signature to unlock the lamports.
 ```sh
 // Command
-$ solana pay <PUBKEY> 123 \
+$ solana-wallet pay <PUBKEY> 123 \
    --require-signature-from <PUBKEY>

 // Return
@@ -92,7 +92,7 @@ $ solana pay <PUBKEY> 123 \

 ```sh
 // Command
-$ solana pay <PUBKEY> 123 \
+$ solana-wallet pay <PUBKEY> 123 \
    --after 2018-12-24T23:59 --require-timestamp-from <PUBKEY> \
    --require-signature-from <PUBKEY>

@@ -104,7 +104,7 @@ $ solana pay <PUBKEY> 123 \

 ```sh
 // Command
-$ solana pay <PUBKEY> 123 \
+$ solana-wallet pay <PUBKEY> 123 \
    --require-signature-from <PUBKEY> \
    --require-signature-from <PUBKEY>

@@ -116,7 +116,7 @@ $ solana pay <PUBKEY> 123 \

 ```sh
 // Command
-$ solana pay <PUBKEY> 123 \
+$ solana-wallet pay <PUBKEY> 123 \
    --require-signature-from <PUBKEY> \
    --cancelable

@@ -128,7 +128,7 @@ $ solana pay <PUBKEY> 123 \

 ```sh
 // Command
-$ solana cancel <PROCESS_ID>
+$ solana-wallet cancel <PROCESS_ID>

 // Return
 <TX_SIGNATURE>
@@ -138,7 +138,7 @@ $ solana cancel <PROCESS_ID>

 ```sh
 // Command
-$ solana send-signature <PUBKEY> <PROCESS_ID>
+$ solana-wallet send-signature <PUBKEY> <PROCESS_ID>

 // Return
 <TX_SIGNATURE>
@@ -149,7 +149,7 @@ $ solana send-signature <PUBKEY> <PROCESS_ID>
 Use the current system time:
 ```sh
 // Command
-$ solana send-timestamp <PUBKEY> <PROCESS_ID>
+$ solana-wallet send-timestamp <PUBKEY> <PROCESS_ID>

 // Return
 <TX_SIGNATURE>
@@ -159,7 +159,7 @@ Or specify some other arbitrary timestamp:

 ```sh
 // Command
-$ solana send-timestamp <PUBKEY> <PROCESS_ID> --date 2018-12-24T23:59:00
+$ solana-wallet send-timestamp <PUBKEY> <PROCESS_ID> --date 2018-12-24T23:59:00

 // Return
 <TX_SIGNATURE>
@@ -168,10 +168,10 @@ $ solana send-timestamp <PUBKEY> <PROCESS_ID> --date 2018-12-24T23:59:00
 ### Usage

 ```manpage
-solana 0.12.0
+solana-wallet 0.12.0

 USAGE:
-    solana [FLAGS] [OPTIONS] [SUBCOMMAND]
+    solana-wallet [FLAGS] [OPTIONS] [SUBCOMMAND]

 FLAGS:
    -h, --help       Prints help information
@@ -201,11 +201,11 @@ SUBCOMMANDS:
 ```

 ```manpage
-solana-address
+solana-wallet-address
 Get your public key

 USAGE:
-    solana address
+    solana-wallet address

 FLAGS:
    -h, --help       Prints help information
@@ -213,11 +213,11 @@ FLAGS:
 ```

 ```manpage
-solana-airdrop
+solana-wallet-airdrop
 Request a batch of lamports

 USAGE:
-    solana airdrop <NUM>
+    solana-wallet airdrop <NUM>

 FLAGS:
    -h, --help       Prints help information
@@ -228,11 +228,11 @@ ARGS:
 ```

 ```manpage
-solana-balance
+solana-wallet-balance
 Get your balance

 USAGE:
-    solana balance
+    solana-wallet balance

 FLAGS:
    -h, --help       Prints help information
@@ -240,11 +240,11 @@ FLAGS:
 ```

 ```manpage
-solana-cancel
+solana-wallet-cancel
 Cancel a transfer

 USAGE:
-    solana cancel <PROCESS_ID>
+    solana-wallet cancel <PROCESS_ID>

 FLAGS:
    -h, --help       Prints help information
@@ -255,11 +255,11 @@ ARGS:
 ```

 ```manpage
-solana-confirm
+solana-wallet-confirm
 Confirm transaction by signature

 USAGE:
-    solana confirm <SIGNATURE>
+    solana-wallet confirm <SIGNATURE>

 FLAGS:
    -h, --help       Prints help information
@@ -270,11 +270,11 @@ ARGS:
 ```

 ```manpage
-solana-deploy
+solana-wallet-deploy
 Deploy a program

 USAGE:
-    solana deploy <PATH>
+    solana-wallet deploy <PATH>

 FLAGS:
    -h, --help       Prints help information
@@ -285,23 +285,11 @@ ARGS:
 ```

 ```manpage
-solana-fees
-Display current cluster fees
-
-USAGE:
-    solana fees
-
-FLAGS:
-    -h, --help       Prints help information
-    -V, --version    Prints version information
-```
-
-```manpage
-solana-get-transaction-count
+solana-wallet-get-transaction-count
 Get current transaction count

 USAGE:
-    solana get-transaction-count
+    solana-wallet get-transaction-count

 FLAGS:
    -h, --help       Prints help information
@@ -309,11 +297,11 @@ FLAGS:
 ```

 ```manpage
-solana-pay
+solana-wallet-pay
 Send a payment

 USAGE:
-    solana pay [FLAGS] [OPTIONS] <PUBKEY> <NUM>
+    solana-wallet pay [FLAGS] [OPTIONS] <PUBKEY> <NUM>

 FLAGS:
        --cancelable
@@ -331,11 +319,11 @@ ARGS:
 ```

 ```manpage
-solana-send-signature
+solana-wallet-send-signature
 Send a signature to authorize a transfer

 USAGE:
-    solana send-signature <PUBKEY> <PROCESS_ID>
+    solana-wallet send-signature <PUBKEY> <PROCESS_ID>

 FLAGS:
    -h, --help       Prints help information
@@ -347,11 +335,11 @@ ARGS:
 ```

 ```manpage
-solana-send-timestamp
+solana-wallet-send-timestamp
 Send a timestamp to unlock a transfer

 USAGE:
-    solana send-timestamp [OPTIONS] <PUBKEY> <PROCESS_ID>
+    solana-wallet send-timestamp [OPTIONS] <PUBKEY> <PROCESS_ID>

 FLAGS:
    -h, --help       Prints help information
--- a/book/theme/css/chrome.css
+++ b/book/theme/css/chrome.css
@@ -521,4 +521,4 @@ ul#searchresults span.teaser em {
 }
 .content pre {
    padding: 0 28px;
-}
+}
--- a/book/theme/css/general.css
+++ b/book/theme/css/general.css
@@ -152,4 +152,4 @@ blockquote {
 *:active,
 *:hover {
  outline: none;
-}
+}
--- a/book/theme/highlight.js
+++ b/book/theme/highlight.js
--- a/build-perf-libs.sh
+++ b/build-perf-libs.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# Builds perf-libs from the upstream source and installs them into the correct
+# location in the tree
+#
+set -e
+cd "$(dirname "$0")"
+
+if [[ -d target/perf-libs ]]; then
+  echo "target/perf-libs/ already exists, to continue run:"
+  echo "$ rm -rf target/perf-libs"
+  exit 1
+fi
+
+(
+  set -x
+  git clone git@github.com:solana-labs/solana-perf-libs.git target/perf-libs
+  cd target/perf-libs
+  make -j"$(nproc)"
+  make DESTDIR=. install
+)
+
+./fetch-perf-libs.sh
--- a/chacha-sys/Cargo.toml
+++ b/chacha-sys/Cargo.toml
@@ -1,12 +0,0 @@
-[package]
-name = "solana-chacha-sys"
-version = "0.18.0"
-description = "Solana chacha-sys"
-authors = ["Solana Maintainers <maintainers@solana.com>"]
-repository = "https://github.com/solana-labs/solana"
-homepage = "https://solana.com/"
-license = "Apache-2.0"
-edition = "2018"
-
-[build-dependencies]
-cc = "1.0.40"
--- a/chacha-sys/build.rs
+++ b/chacha-sys/build.rs
@@ -1,8 +0,0 @@
-extern crate cc;
-
-fn main() {
-    cc::Build::new()
-        .file("cpu-crypt/chacha20_core.c")
-        .file("cpu-crypt/chacha_cbc.c")
-        .compile("libcpu-crypt");
-}
--- a/chacha-sys/cpu-crypt/.gitignore
+++ b/chacha-sys/cpu-crypt/.gitignore
@@ -1 +0,0 @@
-release/
--- a/chacha-sys/cpu-crypt/Makefile
+++ b/chacha-sys/cpu-crypt/Makefile
@@ -1,25 +0,0 @@
-V:=debug
-
-LIB:=cpu-crypt
-
-CFLAGS_common:=-Wall -Werror -pedantic -fPIC
-CFLAGS_release:=-march=native -O3 $(CFLAGS_common)
-CFLAGS_debug:=-g $(CFLAGS_common)
-CFLAGS:=$(CFLAGS_$V)
-
-all: $V/lib$(LIB).a
-
-$V/chacha20_core.o: chacha20_core.c chacha.h
-	@mkdir -p $(@D)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$V/chacha_cbc.o: chacha_cbc.c chacha.h
-	@mkdir -p $(@D)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$V/lib$(LIB).a: $V/chacha20_core.o $V/chacha_cbc.o
-	$(AR) rcs $@ $^
-
-.PHONY:clean
-clean:
-	rm -rf $V
--- a/chacha-sys/cpu-crypt/chacha.h
+++ b/chacha-sys/cpu-crypt/chacha.h
@@ -1,35 +0,0 @@
-#ifndef HEADER_CHACHA_H
-# define HEADER_CHACHA_H
-
-#include <string.h>
-#include <inttypes.h>
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-typedef unsigned int u32;
-
-#define CHACHA_KEY_SIZE 32
-#define CHACHA_NONCE_SIZE 12
-#define CHACHA_BLOCK_SIZE 64
-#define CHACHA_ROUNDS 500
-
-void chacha20_encrypt(const u32 input[16],
-                      unsigned char output[64],
-                      int num_rounds);
-
-void chacha20_encrypt_ctr(const uint8_t *in, uint8_t *out, size_t in_len,
-                          const uint8_t key[CHACHA_KEY_SIZE], const uint8_t nonce[CHACHA_NONCE_SIZE],
-                          uint32_t counter);
-
-void chacha20_cbc128_encrypt(const unsigned char* in, unsigned char* out,
-                             uint32_t len, const uint8_t* key,
-                             unsigned char* ivec);
-
-
-# ifdef  __cplusplus
-}
-# endif
-
-#endif
--- a/chacha-sys/cpu-crypt/chacha20_core.c
+++ b/chacha-sys/cpu-crypt/chacha20_core.c
@@ -1,102 +0,0 @@
-#include "chacha.h"
-
-#define ROTL32(v, n) (((v) << (n)) | ((v) >> (32 - (n))))
-
-#define ROTATE(v, c) ROTL32((v), (c))
-
-#define XOR(v, w) ((v) ^ (w))
-
-#define PLUS(x, y) ((x) + (y))
-
-#define U32TO8_LITTLE(p, v) \
-{ (p)[0] = ((v)      ) & 0xff; (p)[1] = ((v) >>  8) & 0xff; \
-  (p)[2] = ((v) >> 16) & 0xff; (p)[3] = ((v) >> 24) & 0xff; }
-
-#define U8TO32_LITTLE(p)   \
-     (((u32)((p)[0])      ) | ((u32)((p)[1]) <<  8) | \
-      ((u32)((p)[2]) << 16) | ((u32)((p)[3]) << 24)   )
-
-#define QUARTERROUND(a,b,c,d) \
-  x[a] = PLUS(x[a],x[b]); x[d] = ROTATE(XOR(x[d],x[a]),16); \
-  x[c] = PLUS(x[c],x[d]); x[b] = ROTATE(XOR(x[b],x[c]),12); \
-  x[a] = PLUS(x[a],x[b]); x[d] = ROTATE(XOR(x[d],x[a]), 8); \
-  x[c] = PLUS(x[c],x[d]); x[b] = ROTATE(XOR(x[b],x[c]), 7);
-
-// sigma contains the ChaCha constants, which happen to be an ASCII string.
-static const uint8_t sigma[16] = { 'e', 'x', 'p', 'a', 'n', 'd', ' ', '3',
-                                   '2', '-', 'b', 'y', 't', 'e', ' ', 'k' };
-
-void chacha20_encrypt(const u32 input[16],
-                      unsigned char output[64],
-                      int num_rounds)
-{
-    u32 x[16];
-    int i;
-    memcpy(x, input, sizeof(u32) * 16);
-    for (i = num_rounds; i > 0; i -= 2) {
-        QUARTERROUND( 0, 4, 8,12)
-        QUARTERROUND( 1, 5, 9,13)
-        QUARTERROUND( 2, 6,10,14)
-        QUARTERROUND( 3, 7,11,15)
-        QUARTERROUND( 0, 5,10,15)
-        QUARTERROUND( 1, 6,11,12)
-        QUARTERROUND( 2, 7, 8,13)
-        QUARTERROUND( 3, 4, 9,14)
-    }
-    for (i = 0; i < 16; ++i) {
-        x[i] = PLUS(x[i], input[i]);
-    }
-    for (i = 0; i < 16; ++i) {
-        U32TO8_LITTLE(output + 4 * i, x[i]);
-    }
-}
-
-void chacha20_encrypt_ctr(const uint8_t *in, uint8_t *out, size_t in_len,
-                          const uint8_t key[CHACHA_KEY_SIZE],
-                          const uint8_t nonce[CHACHA_NONCE_SIZE],
-                          uint32_t counter)
-{
-  uint32_t input[16];
-  uint8_t buf[64];
-  size_t todo, i;
-
-  input[0] = U8TO32_LITTLE(sigma + 0);
-  input[1] = U8TO32_LITTLE(sigma + 4);
-  input[2] = U8TO32_LITTLE(sigma + 8);
-  input[3] = U8TO32_LITTLE(sigma + 12);
-
-  input[4] = U8TO32_LITTLE(key + 0);
-  input[5] = U8TO32_LITTLE(key + 4);
-  input[6] = U8TO32_LITTLE(key + 8);
-  input[7] = U8TO32_LITTLE(key + 12);
-
-  input[8] = U8TO32_LITTLE(key + 16);
-  input[9] = U8TO32_LITTLE(key + 20);
-  input[10] = U8TO32_LITTLE(key + 24);
-  input[11] = U8TO32_LITTLE(key + 28);
-
-  input[12] = counter;
-  input[13] = U8TO32_LITTLE(nonce + 0);
-  input[14] = U8TO32_LITTLE(nonce + 4);
-  input[15] = U8TO32_LITTLE(nonce + 8);
-
-  while (in_len > 0) {
-    todo = sizeof(buf);
-    if (in_len < todo) {
-      todo = in_len;
-    }
-
-    chacha20_encrypt(input, buf, 20);
-    for (i = 0; i < todo; i++) {
-      out[i] = in[i] ^ buf[i];
-    }
-
-    out += todo;
-    in += todo;
-    in_len -= todo;
-
-    input[12]++;
-  }
-}
-
-
--- a/chacha-sys/cpu-crypt/chacha_cbc.c
+++ b/chacha-sys/cpu-crypt/chacha_cbc.c
@@ -1,72 +0,0 @@
-#include "chacha.h"
-
-#if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC)
-# define STRICT_ALIGNMENT 0
-#endif
-
-void chacha20_cbc128_encrypt(const unsigned char* in, unsigned char* out,
-                             uint32_t len, const uint8_t* key,
-                             unsigned char* ivec)
-{
-    size_t n;
-    unsigned char *iv = ivec;
-    (void)key;
-
-    if (len == 0) {
-        return;
-    }
-
-#if !defined(OPENSSL_SMALL_FOOTPRINT)
-    if (STRICT_ALIGNMENT &&
-        ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
-        while (len >= CHACHA_BLOCK_SIZE) {
-            for (n = 0; n < CHACHA_BLOCK_SIZE; ++n) {
-                out[n] = in[n] ^ iv[n];
-                //printf("%x ", out[n]);
-            }
-            chacha20_encrypt((const u32*)out, out, CHACHA_ROUNDS);
-            iv = out;
-            len -= CHACHA_BLOCK_SIZE;
-            in += CHACHA_BLOCK_SIZE;
-            out += CHACHA_BLOCK_SIZE;
-        }
-    } else {
-        while (len >= CHACHA_BLOCK_SIZE) {
-            for (n = 0; n < CHACHA_BLOCK_SIZE; n += sizeof(size_t)) {
-                *(size_t *)(out + n) =
-                    *(size_t *)(in + n) ^ *(size_t *)(iv + n);
-                //printf("%zu ", *(size_t *)(iv + n));
-            }
-            chacha20_encrypt((const u32*)out, out, CHACHA_ROUNDS);
-            iv = out;
-            len -= CHACHA_BLOCK_SIZE;
-            in += CHACHA_BLOCK_SIZE;
-            out += CHACHA_BLOCK_SIZE;
-        }
-    }
-#endif
-    while (len) {
-        for (n = 0; n < CHACHA_BLOCK_SIZE && n < len; ++n) {
-            out[n] = in[n] ^ iv[n];
-        }
-        for (; n < CHACHA_BLOCK_SIZE; ++n) {
-            out[n] = iv[n];
-        }
-        chacha20_encrypt((const u32*)out, out, CHACHA_ROUNDS);
-        iv = out;
-        if (len <= CHACHA_BLOCK_SIZE) {
-            break;
-        }
-        len -= CHACHA_BLOCK_SIZE;
-        in += CHACHA_BLOCK_SIZE;
-        out += CHACHA_BLOCK_SIZE;
-    }
-    memcpy(ivec, iv, CHACHA_BLOCK_SIZE);
-
-}
-
-void chacha20_cbc_encrypt(const uint8_t *in, uint8_t *out, size_t in_len,
-                          const uint8_t key[CHACHA_KEY_SIZE], uint8_t* ivec)
-{
-    chacha20_cbc128_encrypt(in, out, in_len, key, ivec);
-}
--- a/chacha-sys/src/lib.rs
+++ b/chacha-sys/src/lib.rs
@@ -1,21 +0,0 @@
-extern "C" {
-    fn chacha20_cbc_encrypt(
-        input: *const u8,
-        output: *mut u8,
-        in_len: usize,
-        key: *const u8,
-        ivec: *mut u8,
-    );
-}
-
-pub fn chacha_cbc_encrypt(input: &[u8], output: &mut [u8], key: &[u8], ivec: &mut [u8]) {
-    unsafe {
-        chacha20_cbc_encrypt(
-            input.as_ptr(),
-            output.as_mut_ptr(),
-            input.len(),
-            key.as_ptr(),
-            ivec.as_mut_ptr(),
-        );
-    }
-}
--- a/ci/affects-files.sh
+++ b/ci/affects-files.sh
@@ -12,7 +12,7 @@
 set -e
 cd "$(dirname "$0")"/..

-if [[ -n $CI_PULL_REQUEST ]]; then
+if ci/is-pr.sh; then
  affectedFiles="$(buildkite-agent meta-data get affected_files)"
  echo "Affected files in this PR: $affectedFiles"

--- a/ci/buildkite-release.yml
+++ b/ci/buildkite-release.yml
@@ -1,15 +0,0 @@
-# Build steps that run on a release tag
-#
-# All the steps in `buildkite.yml` are skipped and we jump directly to the
-# secondary build steps since it's assumed the commit that was tagged is known
-# to be good so there's no need to rebuild and retest it.
-steps:
-  - trigger: "solana-secondary"
-    branches: "!pull/*"
-    async: true
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-      env:
-        TRIGGERED_BUILDKITE_TAG: "${BUILDKITE_TAG}"
--- a/ci/buildkite-secondary.yml
+++ b/ci/buildkite-secondary.yml
@@ -1,19 +1,16 @@
-#
-# Build steps that run after the primary pipeline on pushes and tags.
-# Pull requests to not run these steps.
 steps:
  - command: "sdk/docker-solana/build.sh"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 20
    name: "publish docker"
  - command: "ci/publish-crate.sh"
-    timeout_in_minutes: 120
+    timeout_in_minutes: 40
    name: "publish crate"
    branches: "!master"
  - command: "ci/publish-bpf-sdk.sh"
    timeout_in_minutes: 5
    name: "publish bpf sdk"
  - command: "ci/publish-tarball.sh"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 25
    name: "publish tarball"
  - command: "ci/publish-book.sh"
    timeout_in_minutes: 15
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -1,17 +1,14 @@
-# Build steps that run on pushes and pull requests.
-#
-# Release tags use buildkite-release.yml instead
 steps:
  - command: "ci/shellcheck.sh"
    name: "shellcheck"
    timeout_in_minutes: 5
-  - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh"
+  - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-checks.sh"
    name: "checks"
-    timeout_in_minutes: 35
+    timeout_in_minutes: 15
  - wait
  - command: "ci/test-stable-perf.sh"
    name: "stable-perf"
-    timeout_in_minutes: 30
+    timeout_in_minutes: 20
    artifact_paths: "log-*.txt"
    agents:
      - "queue=cuda"
@@ -24,7 +21,7 @@ steps:
    artifact_paths: "log-*.txt"
  - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-coverage.sh"
    name: "coverage"
-    timeout_in_minutes: 40
+    timeout_in_minutes: 20
  # TODO: Fix and re-enable test-large-network.sh
  # - command: "ci/test-large-network.sh || true"
  #   name: "large-network [ignored]"
--- a/ci/channel-info.sh
+++ b/ci/channel-info.sh
@@ -89,11 +89,11 @@ BETA_CHANNEL_LATEST_TAG=${beta_tag:+v$beta_tag}
 STABLE_CHANNEL_LATEST_TAG=${stable_tag:+v$stable_tag}


-if [[ $CI_BRANCH = "$STABLE_CHANNEL" ]]; then
+if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
  CHANNEL=stable
-elif [[ $CI_BRANCH = "$EDGE_CHANNEL" ]]; then
+elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
  CHANNEL=edge
-elif [[ $CI_BRANCH = "$BETA_CHANNEL" ]]; then
+elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
  CHANNEL=beta
 fi

--- a/ci/docker-run.sh
+++ b/ci/docker-run.sh
@@ -64,14 +64,11 @@ fi
 ARGS+=(
  --env BUILDKITE
  --env BUILDKITE_AGENT_ACCESS_TOKEN
+  --env BUILDKITE_BRANCH
+  --env BUILDKITE_COMMIT
  --env BUILDKITE_JOB_ID
+  --env BUILDKITE_TAG
  --env CI
-  --env CI_BRANCH
-  --env CI_BUILD_ID
-  --env CI_COMMIT
-  --env CI_JOB_ID
-  --env CI_PULL_REQUEST
-  --env CI_REPO_SLUG
  --env CODECOV_TOKEN
  --env CRATES_IO_TOKEN
 )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Vines	dc60c72c2d	Disable \|solana-install\| check for edge/beta testnets (#4565 ) The release tarball URL changes for these testnets, which causes the normal \|solana-install\| check to fail and the testnet is unnecessarily rebooted.	2019-06-05 15:31:33 -07:00
Michael Vines	e59c74562f	Be explicit about return status	2019-06-05 14:11:03 -07:00
Michael Vines	eb4ce8e3b2	shift	2019-06-05 12:07:34 -07:00
Michael Vines	e2a050f77d	Avoid sudo in tune-system.sh unless requested by the user (#4556 ) (#4557 ) automerge	2019-06-05 09:38:43 -07:00
Michael Vines	74b97166a9	Sanity check that runs on the blockstreamer node now checks that node instead of the bootstrap leader	2019-06-05 07:53:04 -07:00
Michael Vines	b13d5c3264	Wait for crate to be locatable on crates.io after uploading (#4526 ) (#4550 ) automerge	2019-06-04 21:27:36 -07:00
Dan Albert	72a44c58d9	Increment cargo tomls and lock to 0.15.2 (#4499 )	2019-05-31 12:04:01 -06:00
Michael Vines	f6e804b0a1	minor update	2019-05-31 07:37:19 -07:00
Michael Vines	827e794b6f	Fix clear-config.sh	2019-05-30 15:30:35 -07:00
Michael Vines	d916ffeba5	publish-crate fixups	2019-05-30 15:14:33 -07:00
Michael Vines	dd1ed323e7	v0.15: cherrypick crates.io-related fixes from master (#4486 ) * Remove runtime dependency on storage (#4480) * Break noop_program -> runtime dependency (#4481) * Clean up crates.io publishing (#4478) * Clean up crates.io publishing * Cargo.lock	2019-05-30 13:40:42 -07:00
Dan Albert	491f82bbcd	Fix stable metrics dashboard for current channel use (#4483 ) (#4485 )	2019-05-30 13:21:07 -06:00
Dan Albert	c486d1af8c	Update cargo.toml and testnet participation doc for 0.15.0 (#4465 )	2019-05-28 21:58:28 -06:00
Rob Walker	b4adb1c266	Cherry pick fix for freeze (#4459 ) * check freeze before updating slot_hashes (#4448) * check freeze before updating slot_hashes * fixup * add more information to dropped vote warning (#4449) * add more information to dropped vote warning * fixup	2019-05-28 20:35:54 -06:00
Rob Walker	b9b541441b	update book with passive staking (#4451 ) (#4455 ) * update book with passive staking (#4451) * undelete votestate etc	2019-05-28 16:01:53 -07:00
Michael Vines	e510d4e272	Drop influxcloud (#4461 )	2019-05-28 15:34:36 -07:00
Michael Vines	9341e64ec7	Lock down blockexplorer version (#4462 )	2019-05-28 15:26:53 -07:00
Tyera Eulberg	d934f94e05	Add commented correct future test lines	2019-05-28 09:59:07 -06:00
Tyera Eulberg	59dc123fa8	Add test indicating need for credit-only account handling	2019-05-28 09:58:57 -06:00
Michael Vines	0faea87c84	Revert --retry-on-http-error usage, Travis CI's wget doesn't recognize it	2019-05-27 19:34:46 -07:00
carllin	19137ce3f4	Bump logging level of validator procsesing errors (#4444 ) automerge	2019-05-27 15:36:35 -07:00
Michael Vines	8bdeb2d1ed	Use nohup and sleep a little to improve stability when launching a node	2019-05-27 14:00:24 -07:00
Michael Vines	d29a45266b	data_dir -> data-dir	2019-05-27 07:32:29 -07:00