propagate TESTNET_DB_HOST env variable to next step in buildkite

* observed_locktower_stats

* fixup! observed_locktower_stats

.buildkite/env/secrets.ejson

@@ -1,12 +1,12 @@
 {
     "_public_key": "ae29f4f7ad2fc92de70d470e411c8426d5d48db8817c9e3dae574b122192335f",
     "environment": {
-      "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]"
+      "CODECOV_TOKEN": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:rHBSqXK7uSnveA4qwUxARZjTNZcA0hXU:ko8lLGwPECpVm19znWBRxKEpMF7xpTHBCEzVOxRar2wDThw4lNDAKqTS61vtkJLtdkHtug==]",
+      "CRATES_IO_TOKEN": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:NzN6y0ooXJBYvxB589khepthSxhKFkLB:ZTTFZh2A/kB2SAgjJJAMbwAfanRlzxOCNMVcA2MXBCpQHJeeZGULg+0MLACYswfS]",
+      "GITHUB_TOKEN": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:iy0Fnxeo0aslTCvgXc5Ddj2ly6ZsQ8gK:GNOOj/kZUJ2rYKxTbLyVKtajWNoGQ3PcChwfEB4HdN18qDHlB96Z7gx01Pcf0qeIHODOWRtxlH4=]",
+      "INFLUX_DATABASE": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:Ly/TpIRF0oCxmiBWv225S3mX8s6pfQR+:+tXGB2c9rRCVDcgNO1IDOo89]",
+      "INFLUX_PASSWORD": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:ycrq1uQLoSfI932czD+krUOaJeLWpeq6:2iS7ukp/C7wVD3IT0GvQVcwccWGyLr4UocStF/XiDi0OB/N3YKIKN8SQU4ob1b6StAPZ/XOHmag=]",
+      "INFLUX_USERNAME": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:35hBKofakZ4Db/u0TOW53RXoNWzJTIcl:HWREcMTrgZ8DGB0ZupgSzNWr/tVyE06P]",
+      "SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu": "EJ[1:+7nLVR8NlnN48zgaJPPXF9JOZDXVNHDZLeARlCFHyRk=:kRz8CyJYKAg/AiwgLrcRNDJAmlRX2zvX:uV1XV6y2Fb+dN4Z9BIMPBRiNS3n+NL8GlJXyu1i7meIsph1DzfLg4Thcp5Mj9nUsFNLgqQgjnsa5C4XNY/h5AgMSzRrJxVj7RhVTRmDJ5/Vjq6v7wCMRfBOvF3rITsV4zTwWSV8yafFmS+ZQ+QJTRgtYsuoYAUNZ06IEebfDHcuNwws72hEGoD9w43hOLSpyEOmXbtZ9h1lIRxrgsrhYDpBlU5LkhDeTXAX5M5dwYxyquJFRwd5quGDV5DYsCh9bAkbjAyjWYymVJ78U9YJIQHT9izzQqTDlMQN49EbLo7MDIaC7O7HVtb7unDJs+DRejbHacoyWVulqVVwu3GRiZezu8zdjwzGHphMMxOtKQaidnqYgflNp/O01I8wZRgR1alsGcmIhEhI8YV/IvQ==]"
     }
 }

.gitignore

@@ -1,13 +1,10 @@
+/target/
+/ledger-tool/target/
+/wallet/target/
+/core/target/
 /book/html/
 /book/src/img/
 /book/src/tests.ok
-/core/target/
-/farf/
-/ledger-tool/target/
-/solana-release/
-solana-release.tar.bz2
-/target/
-/wallet/target/
 
 **/*.rs.bk
 .cargo

CONTRIBUTING.md

@@ -46,17 +46,10 @@ and longer descriptions detailing what problem it solves and how it solves it.
 Draft Pull Requests
 ---
 
-If you want early feedback on your PR, use GitHub's "Draft Pull Request"
-mechanism. Draft PRs are a convenient way to collaborate with the Solana
-maintainers without triggering notifications as you make changes. When you feel
-your PR is ready for a broader audience, you can transition your draft PR to a
-standard PR with the click of a button.
-
-Do not add reviewers to draft PRs.  GitHub doesn't automatically clear approvals
-when you click "Ready for Review", so a review that meant "I approve of the
-direction" suddenly has the appearance of "I approve of these changes." Instead,
-add a comment that mentions the usernames that you would like a review from. Ask
-explicitly what you would like feedback on.
+If you want early feedback on your PR, use GitHub's "Draft Pull Request" mechanism. Draft
+PRs are a convenient way to collaborate with the Solana maintainers without triggering
+notifications as you make changes. When you feel your PR is ready for a broader audience,
+you can transition your draft PR to a standard PR with the click of a button.
 
 Rust coding conventions
 ---
@@ -96,23 +89,24 @@ understood. Avoid introducing new 3-letter terms, which can be confused with 3-l
 [Terms currently in use](book/src/terminology.md)
 
 
-Design Proposals
+Proposing architectural changes
 ---
 
 Solana's architecture is described by a book generated from markdown files in
 the `book/src/` directory, maintained by an *editor* (currently @garious). To
-add a design proposal, you'll need to at least propose a change the content
-under the [Accepted Design
-Proposals](https://solana-labs.github.io/book-edge/proposals.html) chapter.
-Here's the full process:
+change the architecture, you'll need to at least propose a change the content
+under the [Proposed
+Changes](https://solana-labs.github.io/book-edge/proposals.html) chapter. Here's
+the full process:
 
-1. Propose a design by creating a PR that adds a markdown document to the
-   directory `book/src/` and references it from the [table of
-   contents](book/src/SUMMARY.md). Add any relevant *maintainers* to the PR review.
+1. Propose to a change to the architecture by creating a PR that adds a
+   markdown document to the directory `book/src/` and references it from the
+   [table of contents](book/src/SUMMARY.md). Add the editor and any relevant
+   *maintainers* to the PR review.
 2. The PR being merged indicates your proposed change was accepted and that the
-   maintainers support your plan of attack.
+   editor and maintainers support your plan of attack.
 3. Submit PRs that implement the proposal. When the implementation reveals the
-   need for tweaks to the proposal, be sure to update the proposal and have
+   need for tweaks to the architecture, be sure to update the proposal and have
    that change reviewed by the same people as in step 1.
-4. Once the implementation is complete, submit a PR that moves the link from
-   the Accepted Proposals to the Implemented Proposals section.
+4. Once the implementation is complete, the editor will then work to integrate
+   the document into the book.

Cargo.toml

@@ -1,37 +1,88 @@
+[package]
+name = "solana-workspace"
+description = "Blockchain, Rebuilt for Scale"
+version = "0.12.2"
+documentation = "https://docs.rs/solana"
+homepage = "https://solana.com/"
+readme = "README.md"
+repository = "https://github.com/solana-labs/solana"
+authors = ["Solana Maintainers <maintainers@solana.com>"]
+license = "Apache-2.0"
+edition = "2018"
+
+[badges]
+codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
+
+[features]
+chacha = ["solana/chacha"]
+cuda = ["solana/cuda"]
+erasure = ["solana/erasure"]
+
+[dev-dependencies]
+bincode = "1.1.2"
+bs58 = "0.2.0"
+hashbrown = "0.1.8"
+log = "0.4.2"
+rand = "0.6.5"
+rayon = "1.0.0"
+reqwest = "0.9.11"
+serde_json = "1.0.39"
+solana = { path = "core", version = "0.12.2" }
+solana-budget-program = { path = "programs/budget", version = "0.12.2" }
+solana-client = { path = "client", version = "0.12.2" }
+solana-logger = { path = "logger", version = "0.12.2" }
+solana-netutil = { path = "netutil", version = "0.12.2" }
+solana-runtime = { path = "runtime", version = "0.12.2" }
+solana-sdk = { path = "sdk", version = "0.12.2" }
+solana-vote-api = { path = "programs/vote_api", version = "0.12.2" }
+sys-info = "0.5.6"
+
+[[bench]]
+name = "banking_stage"
+
+[[bench]]
+name = "blocktree"
+
+[[bench]]
+name = "ledger"
+
+[[bench]]
+name = "gen_keys"
+
+[[bench]]
+name = "sigverify"
+
+[[bench]]
+required-features = ["chacha"]
+name = "chacha"
+
 [workspace]
 members = [
     ".",
-    "bench-exchange",
     "bench-streamer",
     "bench-tps",
+    "core",
     "drone",
     "fullnode",
     "genesis",
-    "gossip",
-    "install",
     "keygen",
-    "kvstore",
     "ledger-tool",
     "logger",
     "metrics",
     "programs/bpf",
     "programs/bpf_loader",
+    "programs/budget",
     "programs/budget_api",
-    "programs/budget_program",
-    "programs/config_api",
-    "programs/config_program",
-    "programs/exchange_api",
-    "programs/exchange_program",
+    "programs/token",
     "programs/token_api",
-    "programs/token_program",
-    "programs/failure_program",
-    "programs/noop_program",
-    "programs/stake_api",
-    "programs/stake_program",
+    "programs/failure",
+    "programs/noop",
+    "programs/rewards",
+    "programs/rewards_api",
+    "programs/storage",
     "programs/storage_api",
-    "programs/storage_program",
+    "programs/vote",
     "programs/vote_api",
-    "programs/vote_program",
     "replicator",
     "sdk",
     "upload-perf",

README.md

@@ -44,7 +44,7 @@ $ source $HOME/.cargo/env
 $ rustup component add rustfmt-preview
 ```
 
-If your rustc version is lower than 1.34.0, please update it:
+If your rustc version is lower than 1.31.0, please update it:
 
 ```bash
 $ rustup update
@@ -83,6 +83,12 @@ Run the test suite:
 $ cargo test --all
 ```
 
+To emulate all the tests that will run on a Pull Request, run:
+
+```bash
+$ ./ci/run-local.sh
+```
+
 Local Testnet
 ---
 
@@ -125,47 +131,6 @@ can run your own testnet using the scripts in the `net/` directory.
 Edit `ci/testnet-manager.sh`
 
 
-## Metrics Server Maintenance
-Sometimes the dashboard becomes unresponsive. This happens due to glitch in the metrics server.
-The current solution is to reset the metrics server. Use the following steps.
-
-1. The server is hosted in a GCP VM instance. Check if the VM instance is down by trying to SSH
- into it from the GCP console. The name of the VM is ```metrics-solana-com```.
-2. If the VM is inaccessible, reset it from the GCP console.
-3. Once VM is up (or, was already up), the metrics services can be restarted from build automation.
-    1. Navigate to https://buildkite.com/solana-labs/metrics-dot-solana-dot-com in your web browser
-    2. Click on ```New Build```
-    3. This will show a pop up dialog. Click on ```options``` drop down.
-    4. Type in ```FORCE_START=true``` in ```Environment Variables``` text box.
-    5. Click ```Create Build```
-    6. This will restart the metrics services, and the dashboards should be accessible afterwards.
-
-## Debugging Testnet
-Testnet may exhibit different symptoms of failures. Primary statistics to check are
-1. Rise in Confirmation Time
-2. Nodes are not voting
-3. Panics, and OOM notifications
-
-Check the following if there are any signs of failure.
-1. Did testnet deployment fail?
-    1. View buildkite logs for the last deployment: https://buildkite.com/solana-labs/testnet-management
-    2. Use the relevant branch
-    3. If the deployment failed, look at the build logs. The build artifacts for each remote node is uploaded.
-       It's a good first step to triage from these logs.
-2. You may have to log into remote node if the deployment succeeded, but something failed during runtime.
-    1. Get the private key for the testnet deployment from ```metrics-solana-com``` GCP instance.
-    2. SSH into ```metrics-solana-com``` using GCP console and do the following.
-    ```bash
-    sudo bash
-    cd ~buildkite-agent/.ssh
-    ls
-    ```
-    3. Copy the relevant private key to your local machine
-    4. Find the public IP address of the AWS instance for the remote node using AWS console
-    5. ```ssh -i <private key file> ubuntu@<ip address of remote node>```
-    6. The logs are in ```~solana\solana``` folder
-
-
 Benchmarking
 ---
 

RELEASE.md

@@ -61,97 +61,45 @@ There are three release channels that map to branches as follows:
 
 ## Release Steps
 
-### Advance the Channels
+### Changing channels
+
+When cutting a new channel branch these pre-steps are required:
 
-#### Create the new branch
 1. Pick your branch point for release on master.
 1. Create the branch.  The name should be "v" + the first 2 "version" fields
    from Cargo.toml.  For example, a Cargo.toml with version = "0.9.0" implies
    the next branch name is "v0.9".
-    1.  Note the Cargo.toml in the repo root directory does not contain a version.  Look at any other Cargo.toml file.
-1. Create a new branch and push this branch to the solana repository.
-    1. `git checkout -b <branchname>`
-    1. `git push -u origin <branchname>`
-
-#### Update master with the next version
-
-1. After the new branch has been created and pushed, update Cargo.toml on **master** to the next semantic version (e.g. 0.9.0 -> 0.10.0)
-   by running `./scripts/increment-cargo-version.sh`, then rebuild with
-   `cargo build` to cause a refresh of `Cargo.lock`.
+1. Push the new branch to the solana repository
+1. Update Cargo.toml on master to the next semantic version (e.g. 0.9.0 -> 0.10.0)
+   by running `./scripts/increment-cargo-version.sh`, then rebuild with a
+   `cargo build --all` to cause a refresh of `Cargo.lock`.
 1. Push your Cargo.toml change and the autogenerated Cargo.lock changes to the
    master branch
 
-At this point, `ci/channel-info.sh` should show your freshly cut release branch as
+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".
 
-### Make the Release
+### Updating channels (i.e. "making a release")
 
 We use [github's Releases UI](https://github.com/solana-labs/solana/releases) for tagging a release.
 
 1. Go [there ;)](https://github.com/solana-labs/solana/releases).
 1. Click "Draft new release".  The release tag must exactly match the `version`
    field in `/Cargo.toml` prefixed by `v` (ie, `<branchname>.X`).
-   1.  If the Cargo.toml verion field is **0.12.3**, then the release tag must be **v0.12.3**
-1. If this is the first release on the branch (e.g. v0.13.**0**), paste in [this
+1. If the first major release on the branch (e.g. v0.8.0), paste in [this
    template](https://raw.githubusercontent.com/solana-labs/solana/master/.github/RELEASE_TEMPLATE.md)
    and fill it in.
 1. Test the release by generating a tag using semver's rules.  First try at a
    release should be `<branchname>.X-rc.0`.
 1. Verify release automation:
    1. [Crates.io](https://crates.io/crates/solana) should have an updated Solana version.
-1. Once the release has been made, update Cargo.toml on the release branch to the next
+   1. ...
+1. After testnet deployment, verify that testnets are running correct software.
+   http://metrics.solana.com should show testnet running on a hash from your
+   newly created branch.
+1. Once the release has been made, update Cargo.toml on release to the next
    semantic version (e.g. 0.9.0 -> 0.9.1) by running
-   `./scripts/increment-cargo-version.sh patch`, then rebuild with `cargo
-   build` to cause a refresh of `Cargo.lock`.
+   `./scripts/increment-cargo-version.sh patch`, then rebuild with a `cargo
+   build --all` to cause a refresh of `Cargo.lock`.
 1. Push your Cargo.toml change and the autogenerated Cargo.lock changes to the
-   release branch.
-
-### Update software on testnet.solana.com
-
-The testnet running on testnet.solana.com is set to use a fixed release tag
-which is set in the Buildkite testnet-management pipeline.
-This tag needs to be updated and the testnet restarted after a new release
-tag is created.
-
-#### Update testnet schedules
-
-Go to https://buildkite.com/solana-labs and click through: Pipelines ->
-testnet-management -> Pipeline Settings -> Schedules
-Or just click here:
-https://buildkite.com/solana-labs/testnet-management/settings/schedules
-
-There are two scheduled jobs for testnet: a daily restart and an hourly sanity-or-restart. \
-https://buildkite.com/solana-labs/testnet-management/settings/schedules/0efd7856-7143-4713-8817-47e6bdb05387
-https://buildkite.com/solana-labs/testnet-management/settings/schedules/2a926646-d972-42b5-aeb9-bb6759592a53
-
-On each schedule:
-1.  Set TESTNET_TAG environment variable to the desired release tag.
-    1. Example, TESTNET_TAG=v0.13.2
-1.  Set the Build Branch to the branch that TESTNET_TAG is from.
-    1. Example: v0.13
-
-#### Restart the testnet
-
-Trigger a TESTNET_OP=create-and-start to refresh the cluster with the new version
-
-1.  Go to https://buildkite.com/solana-labs/testnet-management
-2.  Click "New Build" and use the following settings, then click "Create Build"
-    1.  Commit: HEAD
-    1.  Branch: [channel branch as set in the schedules]
-    1.  Environment Variables:
-```
-TESTNET=testnet
-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
-testnet.solana.com is available
+   release branch

bench-exchange/.gitignore

@@ -1,3 +0,0 @@
-/target/
-/config/
-/config-local/

bench-exchange/Cargo.toml

@@ -1,39 +0,0 @@
-[package]
-authors = ["Solana Maintainers <maintainers@solana.com>"]
-edition = "2018"
-name = "solana-bench-exchange"
-version = "0.14.2"
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-
-[dependencies]
-bs58 = "0.2.0"
-clap = "2.32.0"
-bincode = "1.1.2"
-env_logger = "0.6.0"
-itertools = "0.8.0"
-log = "0.4.6"
-num-traits = "0.2"
-num-derive = "0.2"
-rayon = "1.0.3"
-serde = "1.0.87"
-serde_derive = "1.0.87"
-serde_json = "1.0.38"
-# solana-runtime = { path = "../solana/runtime"}
-solana = { path = "../core", version = "0.14.2"   }
-solana-client = { path = "../client", version = "0.14.2"   }
-solana-drone = { path = "../drone", version = "0.14.2"   }
-solana-exchange-api = { path = "../programs/exchange_api", version = "0.14.2"   }
-solana-exchange-program = { path = "../programs/exchange_program", version = "0.14.2"   }
-solana-logger = { path = "../logger", version = "0.14.2"   }
-solana-metrics = { path = "../metrics", version = "0.14.2"   }
-solana-netutil = { path = "../netutil", version = "0.14.2"   }
-solana-runtime = { path = "../runtime", version = "0.14.2"   }
-solana-sdk = { path = "../sdk", version = "0.14.2"   }
-ws = "0.8.0"
-untrusted = "0.6.2"
-
-[features]
-cuda = ["solana/cuda"]
-erasure = []

bench-exchange/README.md

@@ -1,483 +0,0 @@
-# token-exchange
-Solana Token Exchange Bench
-
-If you can't wait; jump to [Running the exchange](#Running-the-exchange) to
-learn how to start and interact with the exchange.
-
-### Table of Contents
-[Overview](#Overview)<br>
-[Premiss](#Premiss)<br>
-[Exchange startup](#Exchange-startup)<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>
-[Investor strategies](#Investor-strategies)<br>
-[Running the exchange](#Running-the-exchange)<br>
-
-## Overview
-
-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 trade requests to
-the exchange.  A broker monitors the exchange and posts swap requests for
-matching trade orders.  All the transactions can execute concurrently.
-
-## Premise
-
-- Exchange
-  -  An exchange is a marketplace where one asset can be traded for another.
-     The exchange in this demo is the on-chain program that implements the
-     tokens and the policies for trading those tokens.
-- Token
-  - A virtual asset that can be owned, traded, and holds virtual intrinsic value
-    compared to other assets.  There are four types of tokens in this demo, A,
-    B, C, D.  Each one may be traded for another.
-- Token account
-  - An account owned by the exchange that holds a quantity of one type of token.
-- Account request
-  - A request to create a token account
-- Token request
-  - A request to deposit tokens of a particular type into a token account.
-- 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.  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)
-- 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 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 trade request.
-- Price spread
-  - The difference between the two matching trade orders. The spread is the
-    profit of the broker initiating the swap request.
-- Swap requirements
-  - Policies that result in a successful trade swap.
-- 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 broker'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 trade requests.  Investors post
-    transactions to the exchange in order to request tokens and post or cancel
-    trade requests.
-- Broker
-  - An agent who facilitates trading between investors.  Brokers operate as
-    Solana thin clients who monitor all the trade orders looking for a trade
-    match.  Once found, the broker issues a swap request to the exchange.
-    Brokers are the engine of the exchange and are rewarded for their efforts by
-    accumulating the price spreads of the swaps they initiate.  Brokers 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 Brokers.
-
-## Exchange startup
-
-The exchange is up and running when it reaches a state where it can take
-investor's trades and broker's swap requests.  To achieve this state the
-following must occur in order:
-
-- Start the Solana blockchain
-- Start the broker thin-client
-- The broker 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 broker starts responding to queries for bid/ask price and OHLCV
-
-The broker 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 broker could come and go without missing a trade.  One way to achieve
-this is for the broker 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.  Brokers as well will
-request accounts to hold the tokens they earn by initiating trade swaps.
-
-```rust
-/// Supported token types
-pub enum Token {
-    A,
-    B,
-    C,
-    D,
-}
-
-/// Supported token pairs
-pub enum TokenPair {
-    AB,
-    AC,
-    AD,
-    BC,
-    BD,
-    CD,
-}
-
-pub enum ExchangeInstruction {
-    /// New token account
-    /// key 0 - Signer
-    /// key 1 - New token account
-    AccountRequest,
-}
-
-/// Token accounts are populated with this structure
-pub struct TokenAccountInfo {
-    /// Investor who owns this account
-    pub owner: Pubkey,
-    /// Current number of tokens this account holds
-    pub tokens: Tokens,
-}
-```
-
-For this demo investors or brokers 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.
-
-To request tokens, investors submit transfer requests:
-
-```rust
-pub enum ExchangeInstruction {
-    /// Transfer tokens between two accounts
-    /// key 0 - Account to transfer tokens to
-    /// key 1 - Account to transfer tokens from.  This can be the exchange program itself,
-    ///         the exchange has a limitless number of tokens it can transfer.
-    TransferRequest(Token, u64),
-}
-```
-
-## Trade requests
-
-When an investor decides to exchange a token of one type for another, they
-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.  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 trade orders, so trade order
-accounts are refilled rather than accumulating -->
-
-```rust
-/// Direction of the exchange between two tokens in a pair
-pub enum Direction {
-    /// Trade first token type (primary) in the pair 'To' the second
-    To,
-    /// Trade first token type in the pair 'From' the second (secondary)
-    From,
-}
-
-pub struct TradeRequestInfo {
-    /// Direction of trade
-    pub direction: Direction,
-
-    /// Token pair to trade
-    pub pair: TokenPair,
-
-    /// Number of tokens to exchange; refers to the primary or the secondary depending on the direction
-    pub tokens: u64,
-
-    /// The price ratio the primary price over the secondary price.  The primary price is fixed
-    /// and equal to the variable `SCALER`.
-    pub price: u64,
-
-    /// Token account to deposit tokens on successful swap
-    pub dst_account: Pubkey,
-}
-
-pub enum ExchangeInstruction {
-    /// Trade request
-    /// key 0 - Signer
-    /// key 1 - Account in which to record the swap
-    /// key 2 - Token account associated with this trade
-    TradeRequest(TradeRequestInfo),
-}
-
-/// Trade accounts are populated with this structure
-pub struct TradeOrderInfo {
-    /// Owner of the trade order
-    pub owner: Pubkey,
-    /// Direction of the exchange
-    pub direction: Direction,
-    /// Token pair indicating two tokens to exchange, first is primary
-    pub pair: TokenPair,
-    /// Number of tokens to exchange; primary or secondary depending on direction
-    pub tokens: u64,
-    /// Scaled price of the secondary token given the primary is equal to the scale value
-    /// If scale is 1 and price is 2 then ratio is 1:2 or 1 primary token for 2 secondary tokens
-    pub price: u64,
-    /// account which the tokens were source from.  The trade account holds the tokens in escrow
-    /// until either one or more part of a swap or the trade is canceled.
-    pub src_account: Pubkey,
-    /// account which the tokens the tokens will be deposited into on a successful trade
-    pub dst_account: Pubkey,
-}
-```
-
-## 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
-account from which they came.
-
-```rust
-pub enum ExchangeInstruction {
-    /// Trade cancellation
-    /// key 0 - Signer
-    /// key 1 -Trade order to cancel
-    TradeCancellation,
-}
-```
-
-## Trade swaps
-
-The broker 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
-broker 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 trade order valid for further swap requests in
-the future.
-
-Matching trade orders are defined by the following swap requirements:
-
-- Opposite polarity (one `To` and one `From`)
-- Operate on the same token pair
-- The price ratio of the `From` order is greater than or equal to the `To` order
-- There are sufficient tokens to perform the trade
-
-Orders can be written in the following format:
-
-`investor direction pair quantity price-ratio`
-
-For example:
-
-- `1 T AB 2 1`
-  - Investor 1 wishes to exchange 2 A tokens to B tokens at a ratio of 1 A to 1
-    B
-- `2 F AC 6 1.2`
-  - Investor 2 wishes to exchange A tokens from 6 B tokens at a ratio of 1 A
-    from 1.2 B
-
-An order table could look something like the following. Notice how the columns
-are sorted low to high and high to low, respectively.  Prices are dramatic and
-whole for clarity.
-
-|Row| To          | From       |
-|---|-------------|------------|
-| 1 | 1 T AB 2 4  | 2 F AB 2 8 |
-| 2 | 1 T AB 1 4  | 2 F AB 2 8 |
-| 3 | 1 T AB 6 6  | 2 F AB 2 7 |
-| 4 | 1 T AB 2 8  | 2 F AB 3 6 |
-| 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
-broker's account equal to the difference in the price ratios or the two orders.
-These tokens are considered the broker's profit for initiating the trade.
-
-The broker 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
-  - Broker takes 8 B tokens as profit
-
-Both row 1 trades are fully realized, table becomes:
-
-|Row| To          | From       |
-|---|-------------|------------|
-| 1 | 1 T AB 1 4  | 2 F AB 2 8 |
-| 2 | 1 T AB 6 6  | 2 F AB 2 7 |
-| 3 | 1 T AB 2 8  | 2 F AB 3 6 |
-| 4 | 1 T AB 2 10 | 2 F AB 1 5 |
-
-The broker 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
-  - Broker takes 4 B tokens as profit
-
-Row 1 From is not fully realized, table becomes:
-
-|Row| To          | From       |
-|---|-------------|------------|
-| 1 | 1 T AB 6 6  | 2 F AB 1 8 |
-| 2 | 1 T AB 2 8  | 2 F AB 2 7 |
-| 3 | 1 T AB 2 10 | 2 F AB 3 6 |
-| 4 |             | 2 F AB 1 5 |
-
-The broker 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
-  - Broker takes 2 B tokens as profit
-
-Row 1 To is now fully realized, table becomes:
-
-|Row| To          | From       |
-|---|-------------|------------|
-| 1 | 1 T AB 5 6  | 2 F AB 2 7 |
-| 2 | 1 T AB 2 8  | 2 F AB 3 5 |
-| 3 | 1 T AB 2 10 | 2 F AB 1 5 |
-
-The broker 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
-  - Broker takes 4 B tokens as profit
-
-Table becomes:
-
-|Row| To          | From       |
-|---|-------------|------------|
-| 1 | 1 T AB 3 6  | 2 F AB 3 5 |
-| 2 | 1 T AB 2 8  | 2 F AB 1 5 |
-| 3 | 1 T AB 2 10 |            |
-
-At this point the lowest To's price is larger than the largest From's price so
-no more swaps would be initiated until new orders came in.
-
-```rust
-pub enum ExchangeInstruction {
-    /// Trade swap request
-    /// key 0 - Signer
-    /// key 1 - Account in which to record the swap
-    /// 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 brokers profit from the swap.
-    SwapRequest,
-}
-
-/// Swap accounts are populated with this structure
-pub struct TradeSwapInfo {
-    /// Pair swapped
-    pub pair: TokenPair,
-    /// `To` trade order
-    pub to_trade_order: Pubkey,
-    /// `From` trade order
-    pub from_trade_order: Pubkey,
-    /// Number of primary tokens exchanged
-    pub primary_tokens: u64,
-    /// Price the primary tokens were exchanged for
-    pub primary_price: u64,
-    /// Number of secondary tokens exchanged
-    pub secondary_tokens: u64,
-    /// Price the secondary tokens were exchanged for
-    pub secondary_price: u64,
-}
-```
-
-## Exchange program operations
-
-Putting all the commands together from above, the following operations will be
-supported by the on-chain exchange program:
-
-```rust
-pub enum ExchangeInstruction {
-    /// New token account
-    /// key 0 - Signer
-    /// key 1 - New token account
-    AccountRequest,
-
-    /// Transfer tokens between two accounts
-    /// key 0 - Account to transfer tokens to
-    /// key 1 - Account to transfer tokens from.  This can be the exchange program itself,
-    ///         the exchange has a limitless number of tokens it can transfer.
-    TransferRequest(Token, u64),
-
-    /// Trade request
-    /// key 0 - Signer
-    /// key 1 - Account in which to record the swap
-    /// key 2 - Token account associated with this trade
-    TradeRequest(TradeRequestInfo),
-
-    /// Trade cancellation
-    /// key 0 - Signer
-    /// 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' 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 brokers profit from the swap.
-    SwapRequest,
-}
-```
-
-## Quotes and OHLCV
-
-The broker 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.
-
-## Investor strategies
-
-To make a compelling demo, the investors needs to provide interesting trade
-behavior.  Something as simple as a randomly twiddled baseline would be a
-minimum starting point.
-
-## Running the exchange
-
-The exchange bench posts trades and swaps matches as fast as it can.  
-
-You might want to bump the duration up
-to 60 seconds and the batch size to 1000 for better numbers.  You can modify those
-in client_demo/src/demo.rs::test_exchange_local_cluster.
-
-The following command runs the bench:
-
-```bash
-$ RUST_LOG=solana_bench_exchange=info cargo test --release -- --nocapture test_exchange_local_cluster
-```
-
-To also see the cluster messages:
-
-```bash
-$ RUST_LOG=solana_bench_exchange=info,solana=info cargo test --release -- --nocapture test_exchange_local_cluster
-```
-
-
-

bench-exchange/src/cli.rs

@@ -1,188 +0,0 @@
-use clap::{crate_description, crate_name, crate_version, value_t, App, Arg, ArgMatches};
-use solana::gen_keys::GenKeys;
-use solana_drone::drone::DRONE_PORT;
-use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil};
-use std::net::SocketAddr;
-use std::process::exit;
-use std::time::Duration;
-
-pub struct Config {
-    pub network_addr: SocketAddr,
-    pub drone_addr: SocketAddr,
-    pub identity: Keypair,
-    pub threads: usize,
-    pub num_nodes: usize,
-    pub duration: Duration,
-    pub transfer_delay: u64,
-    pub fund_amount: u64,
-    pub batch_size: usize,
-    pub chunk_size: usize,
-    pub account_groups: usize,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            network_addr: SocketAddr::from(([127, 0, 0, 1], 8001)),
-            drone_addr: SocketAddr::from(([127, 0, 0, 1], DRONE_PORT)),
-            identity: Keypair::new(),
-            num_nodes: 1,
-            threads: 4,
-            duration: Duration::new(u64::max_value(), 0),
-            transfer_delay: 0,
-            fund_amount: 100_000,
-            batch_size: 100,
-            chunk_size: 100,
-            account_groups: 100,
-        }
-    }
-}
-
-pub fn build_args<'a, 'b>() -> App<'a, 'b> {
-    App::new(crate_name!())
-        .about(crate_description!())
-        .version(crate_version!())
-        .arg(
-            Arg::with_name("network")
-                .short("n")
-                .long("network")
-                .value_name("HOST:PORT")
-                .takes_value(true)
-                .required(false)
-                .default_value("127.0.0.1:8001")
-                .help("Network's gossip entry point; defaults to 127.0.0.1:8001"),
-        )
-        .arg(
-            Arg::with_name("drone")
-                .short("d")
-                .long("drone")
-                .value_name("HOST:PORT")
-                .takes_value(true)
-                .required(false)
-                .default_value("127.0.0.1:9900")
-                .help("Location of the drone; defaults to 127.0.0.1:9900"),
-        )
-        .arg(
-            Arg::with_name("identity")
-                .short("i")
-                .long("identity")
-                .value_name("PATH")
-                .takes_value(true)
-                .help("File containing a client identity (keypair)"),
-        )
-        .arg(
-            Arg::with_name("threads")
-                .long("threads")
-                .value_name("<threads>")
-                .takes_value(true)
-                .required(false)
-                .default_value("1")
-                .help("Number of threads submitting transactions"),
-        )
-        .arg(
-            Arg::with_name("num-nodes")
-                .long("num-nodes")
-                .value_name("NUM")
-                .takes_value(true)
-                .required(false)
-                .default_value("1")
-                .help("Wait for NUM nodes to converge"),
-        )
-        .arg(
-            Arg::with_name("duration")
-                .long("duration")
-                .value_name("SECS")
-                .takes_value(true)
-                .default_value("60")
-                .help("Seconds to run benchmark, then exit; default is forever"),
-        )
-        .arg(
-            Arg::with_name("transfer-delay")
-                .long("transfer-delay")
-                .value_name("<delay>")
-                .takes_value(true)
-                .required(false)
-                .default_value("0")
-                .help("Delay between each chunk"),
-        )
-        .arg(
-            Arg::with_name("fund-amount")
-                .long("fund-amount")
-                .value_name("<fund>")
-                .takes_value(true)
-                .required(false)
-                .default_value("100000")
-                .help("Number of lamports to fund to each signer"),
-        )
-        .arg(
-            Arg::with_name("batch-size")
-                .long("batch-size")
-                .value_name("<batch>")
-                .takes_value(true)
-                .required(false)
-                .default_value("1000")
-                .help("Number of transactions before the signer rolls over"),
-        )
-        .arg(
-            Arg::with_name("chunk-size")
-                .long("chunk-size")
-                .value_name("<cunk>")
-                .takes_value(true)
-                .required(false)
-                .default_value("500")
-                .help("Number of transactions to generate and send at a time"),
-        )
-        .arg(
-            Arg::with_name("account-groups")
-                .long("account-groups")
-                .value_name("<groups>")
-                .takes_value(true)
-                .required(false)
-                .default_value("10")
-                .help("Number of account groups to cycle for each batch"),
-        )
-}
-
-pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
-    let mut args = Config::default();
-
-    args.network_addr = solana_netutil::parse_host_port(matches.value_of("network").unwrap())
-        .unwrap_or_else(|e| {
-            eprintln!("failed to parse network address: {}", e);
-            exit(1)
-        });
-
-    args.drone_addr = solana_netutil::parse_host_port(matches.value_of("drone").unwrap())
-        .unwrap_or_else(|e| {
-            eprintln!("failed to parse drone address: {}", e);
-            exit(1)
-        });
-
-    if matches.is_present("identity") {
-        args.identity = read_keypair(matches.value_of("identity").unwrap())
-            .expect("can't read client identity");
-    } else {
-        args.identity = {
-            let seed = [42_u8; 32];
-            let mut rnd = GenKeys::new(seed);
-            rnd.gen_keypair()
-        };
-    }
-    args.threads = value_t!(matches.value_of("threads"), usize).expect("Failed to parse threads");
-    args.num_nodes =
-        value_t!(matches.value_of("num-nodes"), usize).expect("Failed to parse num-nodes");
-    let duration = value_t!(matches.value_of("duration"), u64).expect("Failed to parse duration");
-    args.duration = Duration::from_secs(duration);
-    args.transfer_delay =
-        value_t!(matches.value_of("transfer-delay"), u64).expect("Failed to parse transfer-delay");
-    args.fund_amount =
-        value_t!(matches.value_of("fund-amount"), u64).expect("Failed to parse fund-amount");
-    args.batch_size =
-        value_t!(matches.value_of("batch-size"), usize).expect("Failed to parse batch-size");
-    args.chunk_size =
-        value_t!(matches.value_of("chunk-size"), usize).expect("Failed to parse chunk-size");
-    args.account_groups = value_t!(matches.value_of("account-groups"), usize)
-        .expect("Failed to parse account-groups");
-
-    args
-}

bench-exchange/src/main.rs

@@ -1,67 +0,0 @@
-pub mod bench;
-mod cli;
-pub mod order_book;
-
-use crate::bench::{airdrop_lamports, do_bench_exchange, get_clients, Config};
-use log::*;
-use solana::gossip_service::discover_nodes;
-use solana_sdk::signature::KeypairUtil;
-
-fn main() {
-    solana_logger::setup();
-    solana_metrics::set_panic_hook("bench-exchange");
-
-    let matches = cli::build_args().get_matches();
-    let cli_config = cli::extract_args(&matches);
-
-    let cli::Config {
-        network_addr,
-        drone_addr,
-        identity,
-        threads,
-        num_nodes,
-        duration,
-        transfer_delay,
-        fund_amount,
-        batch_size,
-        chunk_size,
-        account_groups,
-        ..
-    } = cli_config;
-
-    info!("Connecting to the cluster");
-    let nodes = discover_nodes(&network_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,
-        duration,
-        transfer_delay,
-        fund_amount,
-        batch_size,
-        chunk_size,
-        account_groups,
-    };
-
-    do_bench_exchange(clients, config);
-}

bench-exchange/src/order_book.rs

@@ -1,138 +0,0 @@
-use itertools::EitherOrBoth::{Both, Left, Right};
-use itertools::Itertools;
-use log::*;
-use solana_exchange_api::exchange_state::*;
-use solana_sdk::pubkey::Pubkey;
-use std::cmp::Ordering;
-use std::collections::BinaryHeap;
-use std::{error, fmt};
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct ToOrder {
-    pub pubkey: Pubkey,
-    pub info: TradeOrderInfo,
-}
-
-impl Ord for ToOrder {
-    fn cmp(&self, other: &Self) -> Ordering {
-        other.info.price.cmp(&self.info.price)
-    }
-}
-impl PartialOrd for ToOrder {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct FromOrder {
-    pub pubkey: Pubkey,
-    pub info: TradeOrderInfo,
-}
-
-impl Ord for FromOrder {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.info.price.cmp(&other.info.price)
-    }
-}
-impl PartialOrd for FromOrder {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-#[derive(Default)]
-pub struct OrderBook {
-    // TODO scale to x token types
-    to_ab: BinaryHeap<ToOrder>,
-    from_ab: BinaryHeap<FromOrder>,
-}
-impl fmt::Display for OrderBook {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(
-            f,
-            "+-Order Book--------------------------+-------------------------------------+"
-        )?;
-        for (i, it) in self
-            .to_ab
-            .iter()
-            .zip_longest(self.from_ab.iter())
-            .enumerate()
-        {
-            match it {
-                Both(to, from) => writeln!(
-                    f,
-                    "| T AB {:8} for {:8}/{:8} | F AB {:8} for {:8}/{:8} |{}",
-                    to.info.tokens,
-                    SCALER,
-                    to.info.price,
-                    from.info.tokens,
-                    SCALER,
-                    from.info.price,
-                    i
-                )?,
-                Left(to) => writeln!(
-                    f,
-                    "| T AB {:8} for {:8}/{:8} |                                     |{}",
-                    to.info.tokens, SCALER, to.info.price, i
-                )?,
-                Right(from) => writeln!(
-                    f,
-                    "|                                     | F AB {:8} for {:8}/{:8} |{}",
-                    from.info.tokens, SCALER, from.info.price, i
-                )?,
-            }
-        }
-        write!(
-            f,
-            "+-------------------------------------+-------------------------------------+"
-        )?;
-        Ok(())
-    }
-}
-
-impl OrderBook {
-    // TODO
-    // pub fn cancel(&mut self, pubkey: Pubkey) -> Result<(), Box<dyn error::Error>> {
-    //     Ok(())
-    // }
-    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 });
-            }
-            Direction::From => {
-                self.from_ab.push(FromOrder { pubkey, info });
-            }
-        }
-        Ok(())
-    }
-    pub fn pop(&mut self) -> Option<(ToOrder, FromOrder)> {
-        if let Some(pair) = Self::pop_pair(&mut self.to_ab, &mut self.from_ab) {
-            return Some(pair);
-        }
-        None
-    }
-    pub fn get_num_outstanding(&self) -> (usize, usize) {
-        (self.to_ab.len(), self.from_ab.len())
-    }
-
-    fn pop_pair(
-        to_ab: &mut BinaryHeap<ToOrder>,
-        from_ab: &mut BinaryHeap<FromOrder>,
-    ) -> Option<(ToOrder, FromOrder)> {
-        let to = to_ab.peek()?;
-        let from = from_ab.peek()?;
-        if from.info.price < to.info.price {
-            debug!("Trade not viable");
-            return None;
-        }
-        let to = to_ab.pop()?;
-        let from = from_ab.pop()?;
-        Some((to, from))
-    }
-}

bench-streamer/Cargo.toml

@@ -2,17 +2,16 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-streamer"
-version = "0.14.2"
+version = "0.12.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-clap = "2.33.0"
-solana = { path = "../core", version = "0.14.2"   }
-solana-logger = { path = "../logger", version = "0.14.2"   }
-solana-netutil = { path = "../netutil", version = "0.14.2"   }
+clap = "2.32.0"
+solana = { path = "../core", version = "0.12.2" }
+solana-logger = { path = "../logger", version = "0.12.2" }
+solana-netutil = { path = "../netutil", version = "0.12.2" }
 
 [features]
 cuda = ["solana/cuda"]
-erasure = []

bench-streamer/src/main.rs

@@ -1,5 +1,5 @@
-use clap::{crate_description, crate_name, crate_version, App, Arg};
-use solana::packet::{Packet, Packets, BLOB_SIZE, PACKET_DATA_SIZE};
+use clap::{App, Arg};
+use solana::packet::{Packet, SharedPackets, BLOB_SIZE, PACKET_DATA_SIZE};
 use solana::result::Result;
 use solana::streamer::{receiver, PacketReceiver};
 use std::cmp::max;
@@ -14,19 +14,19 @@ use std::time::SystemTime;
 
 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 &mut msgs.packets {
+    let msgs = SharedPackets::default();
+    let msgs_ = msgs.clone();
+    msgs.write().unwrap().packets.resize(10, Packet::default());
+    for w in &mut msgs.write().unwrap().packets {
         w.meta.size = PACKET_DATA_SIZE;
         w.meta.set_addr(&addr);
     }
-    let msgs_ = msgs.clone();
     spawn(move || loop {
         if exit.load(Ordering::Relaxed) {
             return;
         }
         let mut num = 0;
-        for p in &msgs_.packets {
+        for p in &msgs_.read().unwrap().packets {
             let a = p.meta.addr();
             assert!(p.meta.size < BLOB_SIZE);
             send.send_to(&p.data[..p.meta.size], &a).unwrap();
@@ -43,7 +43,7 @@ fn sink(exit: Arc<AtomicBool>, rvs: Arc<AtomicUsize>, r: PacketReceiver) -> Join
         }
         let timer = Duration::new(1, 0);
         if let Ok(msgs) = r.recv_timeout(timer) {
-            rvs.fetch_add(msgs.packets.len(), Ordering::Relaxed);
+            rvs.fetch_add(msgs.read().unwrap().packets.len(), Ordering::Relaxed);
         }
     })
 }
@@ -51,9 +51,7 @@ fn sink(exit: Arc<AtomicBool>, rvs: Arc<AtomicUsize>, r: PacketReceiver) -> Join
 fn main() -> Result<()> {
     let mut num_sockets = 1usize;
 
-    let matches = App::new(crate_name!())
-        .about(crate_description!())
-        .version(crate_version!())
+    let matches = App::new("solana-bench-streamer")
         .arg(
             Arg::with_name("num-recv-sockets")
                 .long("num-recv-sockets")
@@ -83,7 +81,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));
+        read_threads.push(receiver(Arc::new(read), &exit, s_reader, "bench-streamer"));
     }
 
     let t_producer1 = producer(&addr, exit.clone());

bench-tps/.gitignore

@@ -1,3 +0,0 @@
-/target/
-/config/
-/config-local/

bench-tps/Cargo.toml

@@ -2,24 +2,21 @@
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 edition = "2018"
 name = "solana-bench-tps"
-version = "0.14.2"
+version = "0.12.2"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-clap = "2.33.0"
+clap = "2.32.0"
 rayon = "1.0.3"
 serde_json = "1.0.39"
-solana = { path = "../core", version = "0.14.2"   }
-solana-client = { path = "../client", version = "0.14.2"   }
-solana-drone = { path = "../drone", version = "0.14.2"   }
-solana-logger = { path = "../logger", version = "0.14.2"   }
-solana-metrics = { path = "../metrics", version = "0.14.2"   }
-solana-netutil = { path = "../netutil", version = "0.14.2"   }
-solana-runtime = { path = "../runtime", version = "0.14.2"   }
-solana-sdk = { path = "../sdk", version = "0.14.2"   }
+solana = { path = "../core", version = "0.12.2" }
+solana-client = { path = "../client", version = "0.12.2" }
+solana-drone = { path = "../drone", version = "0.12.2" }
+solana-logger = { path = "../logger", version = "0.12.2" }
+solana-metrics = { path = "../metrics", version = "0.12.2" }
+solana-sdk = { path = "../sdk", version = "0.12.2" }
 
 [features]
 cuda = ["solana/cuda"]
-erasure = []

bench-tps/src/bench.rs

@@ -1,13 +1,16 @@
 use solana_metrics;
 
 use rayon::prelude::*;
-use solana::gen_keys::GenKeys;
+use solana::cluster_info::FULLNODE_PORT_RANGE;
+use solana::contact_info::ContactInfo;
+use solana_client::client::create_client;
+use solana_client::thin_client::ThinClient;
 use solana_drone::drone::request_airdrop_transaction;
 use solana_metrics::influxdb;
-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;
+use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::timing::timestamp;
 use solana_sdk::timing::{duration_as_ms, duration_as_s};
 use solana_sdk::transaction::Transaction;
@@ -18,7 +21,6 @@ use std::process::exit;
 use std::sync::atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering};
 use std::sync::{Arc, RwLock};
 use std::thread::sleep;
-use std::thread::Builder;
 use std::time::Duration;
 use std::time::Instant;
 
@@ -30,173 +32,10 @@ pub struct NodeStats {
 }
 
 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)>>>>;
 
-pub struct Config {
-    pub id: Keypair,
-    pub threads: usize,
-    pub thread_batch_sleep_ms: usize,
-    pub duration: Duration,
-    pub tx_count: usize,
-    pub sustained: bool,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            id: Keypair::new(),
-            threads: 4,
-            thread_batch_sleep_ms: 0,
-            duration: Duration::new(std::u64::MAX, 0),
-            tx_count: 500_000,
-            sustained: false,
-        }
-    }
-}
-
-pub fn do_bench_tps<T>(
-    clients: Vec<T>,
-    config: Config,
-    gen_keypairs: Vec<Keypair>,
-    keypair0_balance: u64,
-) where
-    T: 'static + Client + Send + Sync,
-{
-    let Config {
-        id,
-        threads,
-        thread_batch_sleep_ms,
-        duration,
-        tx_count,
-        sustained,
-    } = config;
-
-    let clients: Vec<_> = clients.into_iter().map(Arc::new).collect();
-    let client = &clients[0];
-
-    let start = gen_keypairs.len() - (tx_count * 2) as usize;
-    let keypairs = &gen_keypairs[start..];
-
-    let first_tx_count = client.get_transaction_count().expect("transaction count");
-    println!("Initial transaction count {}", first_tx_count);
-
-    let exit_signal = Arc::new(AtomicBool::new(false));
-
-    // Setup a thread per validator to sample every period
-    // collect the max transaction rate and total tx count seen
-    let maxes = Arc::new(RwLock::new(Vec::new()));
-    let sample_period = 1; // in seconds
-    println!("Sampling TPS every {} second...", sample_period);
-    let v_threads: Vec<_> = clients
-        .iter()
-        .map(|client| {
-            let exit_signal = exit_signal.clone();
-            let maxes = maxes.clone();
-            let client = client.clone();
-            Builder::new()
-                .name("solana-client-sample".to_string())
-                .spawn(move || {
-                    sample_tx_count(&exit_signal, &maxes, first_tx_count, sample_period, &client);
-                })
-                .unwrap()
-        })
-        .collect();
-
-    let shared_txs: SharedTransactions = Arc::new(RwLock::new(VecDeque::new()));
-
-    let shared_tx_active_thread_count = Arc::new(AtomicIsize::new(0));
-    let total_tx_sent_count = Arc::new(AtomicUsize::new(0));
-
-    let s_threads: Vec<_> = (0..threads)
-        .map(|_| {
-            let exit_signal = exit_signal.clone();
-            let shared_txs = shared_txs.clone();
-            let shared_tx_active_thread_count = shared_tx_active_thread_count.clone();
-            let total_tx_sent_count = total_tx_sent_count.clone();
-            let client = client.clone();
-            Builder::new()
-                .name("solana-client-sender".to_string())
-                .spawn(move || {
-                    do_tx_transfers(
-                        &exit_signal,
-                        &shared_txs,
-                        &shared_tx_active_thread_count,
-                        &total_tx_sent_count,
-                        thread_batch_sleep_ms,
-                        &client,
-                    );
-                })
-                .unwrap()
-        })
-        .collect();
-
-    // generate and send transactions for the specified duration
-    let start = Instant::now();
-    let mut reclaim_lamports_back_to_source_account = false;
-    let mut i = keypair0_balance;
-    while start.elapsed() < duration {
-        let balance = client.get_balance(&id.pubkey()).unwrap_or(0);
-        metrics_submit_lamport_balance(balance);
-
-        // ping-pong between source and destination accounts for each loop iteration
-        // this seems to be faster than trying to determine the balance of individual
-        // accounts
-        let len = tx_count as usize;
-        generate_txs(
-            &shared_txs,
-            &keypairs[..len],
-            &keypairs[len..],
-            threads,
-            reclaim_lamports_back_to_source_account,
-            &client,
-        );
-        // In sustained mode overlap the transfers with generation
-        // this has higher average performance but lower peak performance
-        // in tested environments.
-        if !sustained {
-            while shared_tx_active_thread_count.load(Ordering::Relaxed) > 0 {
-                sleep(Duration::from_millis(100));
-            }
-        }
-
-        i += 1;
-        if should_switch_directions(NUM_LAMPORTS_PER_ACCOUNT, i) {
-            reclaim_lamports_back_to_source_account = !reclaim_lamports_back_to_source_account;
-        }
-    }
-
-    // Stop the sampling threads so it will collect the stats
-    exit_signal.store(true, Ordering::Relaxed);
-
-    println!("Waiting for validator threads...");
-    for t in v_threads {
-        if let Err(err) = t.join() {
-            println!("  join() failed with: {:?}", err);
-        }
-    }
-
-    // join the tx send threads
-    println!("Waiting for transmit threads...");
-    for t in s_threads {
-        if let Err(err) = t.join() {
-            println!("  join() failed with: {:?}", err);
-        }
-    }
-
-    let balance = client.get_balance(&id.pubkey()).unwrap_or(0);
-    metrics_submit_lamport_balance(balance);
-
-    compute_and_report_stats(
-        &maxes,
-        sample_period,
-        &start.elapsed(),
-        total_tx_sent_count.load(Ordering::Relaxed),
-    );
-}
-
-fn metrics_submit_lamport_balance(lamport_balance: u64) {
+pub fn metrics_submit_lamport_balance(lamport_balance: u64) {
     println!("Token balance: {}", lamport_balance);
     solana_metrics::submit(
         influxdb::Point::new("bench-tps")
@@ -206,29 +45,29 @@ fn metrics_submit_lamport_balance(lamport_balance: u64) {
     );
 }
 
-fn sample_tx_count<T: Client>(
+pub fn sample_tx_count(
     exit_signal: &Arc<AtomicBool>,
-    maxes: &Arc<RwLock<Vec<(String, NodeStats)>>>,
+    maxes: &Arc<RwLock<Vec<(SocketAddr, NodeStats)>>>,
     first_tx_count: u64,
+    v: &ContactInfo,
     sample_period: u64,
-    client: &Arc<T>,
 ) {
+    let mut client = create_client(v.client_facing_addr(), FULLNODE_PORT_RANGE);
     let mut now = Instant::now();
-    let mut initial_tx_count = client.get_transaction_count().expect("transaction count");
+    let mut initial_tx_count = client.transaction_count();
     let mut max_tps = 0.0;
     let mut total;
 
-    let log_prefix = format!("{:21}:", client.transactions_addr());
+    let log_prefix = format!("{:21}:", v.tpu.to_string());
 
     loop {
-        let mut tx_count = client.get_transaction_count().expect("transaction count");
-        if tx_count < initial_tx_count {
-            println!(
-                "expected tx_count({}) >= initial_tx_count({})",
-                tx_count, initial_tx_count
-            );
-            tx_count = initial_tx_count;
-        }
+        let tx_count = client.transaction_count();
+        assert!(
+            tx_count >= initial_tx_count,
+            "expected tx_count({}) >= initial_tx_count({})",
+            tx_count,
+            initial_tx_count
+        );
         let duration = now.elapsed();
         now = Instant::now();
         let sample = tx_count - initial_tx_count;
@@ -256,24 +95,95 @@ fn sample_tx_count<T: Client>(
                 tps: max_tps,
                 tx: total,
             };
-            maxes
-                .write()
-                .unwrap()
-                .push((client.transactions_addr(), stats));
+            maxes.write().unwrap().push((v.tpu, stats));
             break;
         }
     }
 }
 
-fn generate_txs<T: Client>(
+/// Send loopback payment of 0 lamports and confirm the network processed it
+pub fn send_barrier_transaction(
+    barrier_client: &mut ThinClient,
+    blockhash: &mut Hash,
+    source_keypair: &Keypair,
+    dest_id: &Pubkey,
+) {
+    let transfer_start = Instant::now();
+
+    let mut poll_count = 0;
+    loop {
+        if poll_count > 0 && poll_count % 8 == 0 {
+            println!(
+                "polling for barrier transaction confirmation, attempt {}",
+                poll_count
+            );
+        }
+
+        *blockhash = barrier_client.get_recent_blockhash();
+        let signature = barrier_client
+            .transfer(0, &source_keypair, dest_id, blockhash)
+            .expect("Unable to send barrier transaction");
+
+        let confirmatiom = barrier_client.poll_for_signature(&signature);
+        let duration_ms = duration_as_ms(&transfer_start.elapsed());
+        if confirmatiom.is_ok() {
+            println!("barrier transaction confirmed in {} ms", duration_ms);
+
+            solana_metrics::submit(
+                influxdb::Point::new("bench-tps")
+                    .add_tag(
+                        "op",
+                        influxdb::Value::String("send_barrier_transaction".to_string()),
+                    )
+                    .add_field("poll_count", influxdb::Value::Integer(poll_count))
+                    .add_field("duration", influxdb::Value::Integer(duration_ms as i64))
+                    .to_owned(),
+            );
+
+            // Sanity check that the client balance is still 1
+            let balance = barrier_client
+                .poll_balance_with_timeout(
+                    &source_keypair.pubkey(),
+                    &Duration::from_millis(100),
+                    &Duration::from_secs(10),
+                )
+                .expect("Failed to get balance");
+            if balance != 1 {
+                panic!("Expected an account balance of 1 (balance: {}", balance);
+            }
+            break;
+        }
+
+        // Timeout after 3 minutes.  When running a CPU-only leader+validator+drone+bench-tps on a dev
+        // machine, some batches of transactions can take upwards of 1 minute...
+        if duration_ms > 1000 * 60 * 3 {
+            println!("Error: Couldn't confirm barrier transaction!");
+            exit(1);
+        }
+
+        let new_blockhash = barrier_client.get_recent_blockhash();
+        if new_blockhash == *blockhash {
+            if poll_count > 0 && poll_count % 8 == 0 {
+                println!("blockhash is not advancing, still at {:?}", *blockhash);
+            }
+        } else {
+            *blockhash = new_blockhash;
+        }
+
+        poll_count += 1;
+    }
+}
+
+pub fn generate_txs(
     shared_txs: &SharedTransactions,
     source: &[Keypair],
     dest: &[Keypair],
     threads: usize,
     reclaim: bool,
-    client: &Arc<T>,
+    contact_info: &ContactInfo,
 ) {
-    let blockhash = client.get_recent_blockhash().unwrap();
+    let mut client = create_client(contact_info.client_facing_addr(), FULLNODE_PORT_RANGE);
+    let blockhash = client.get_recent_blockhash();
     let tx_count = source.len();
     println!("Signing transactions... {} (reclaim={})", tx_count, reclaim);
     let signing_start = Instant::now();
@@ -287,7 +197,7 @@ fn generate_txs<T: Client>(
         .par_iter()
         .map(|(id, keypair)| {
             (
-                system_transaction::create_user_account(id, &keypair.pubkey(), 1, blockhash, 0),
+                SystemTransaction::new_account(id, &keypair.pubkey(), 1, blockhash, 0),
                 timestamp(),
             )
         })
@@ -324,14 +234,15 @@ fn generate_txs<T: Client>(
     }
 }
 
-fn do_tx_transfers<T: Client>(
+pub fn do_tx_transfers(
     exit_signal: &Arc<AtomicBool>,
     shared_txs: &SharedTransactions,
+    contact_info: &ContactInfo,
     shared_tx_thread_count: &Arc<AtomicIsize>,
     total_tx_sent_count: &Arc<AtomicUsize>,
     thread_batch_sleep_ms: usize,
-    client: &Arc<T>,
 ) {
+    let client = create_client(contact_info.client_facing_addr(), FULLNODE_PORT_RANGE);
     loop {
         if thread_batch_sleep_ms > 0 {
             sleep(Duration::from_millis(thread_batch_sleep_ms as u64));
@@ -346,7 +257,7 @@ fn do_tx_transfers<T: Client>(
             println!(
                 "Transferring 1 unit {} times... to {}",
                 txs0.len(),
-                client.as_ref().transactions_addr(),
+                contact_info.tpu
             );
             let tx_len = txs0.len();
             let transfer_start = Instant::now();
@@ -355,7 +266,7 @@ fn do_tx_transfers<T: Client>(
                 if now > tx.1 && now - tx.1 > 1000 * 30 {
                     continue;
                 }
-                client.async_send_transaction(tx.0).unwrap();
+                client.transfer_signed(&tx.0).unwrap();
             }
             shared_tx_thread_count.fetch_add(-1, Ordering::Relaxed);
             total_tx_sent_count.fetch_add(tx_len, Ordering::Relaxed);
@@ -381,8 +292,8 @@ fn do_tx_transfers<T: Client>(
     }
 }
 
-fn verify_funding_transfer<T: Client>(client: &T, tx: &Transaction, amount: u64) -> bool {
-    for a in &tx.message().account_keys[1..] {
+pub fn verify_funding_transfer(client: &mut ThinClient, tx: &Transaction, amount: u64) -> bool {
+    for a in &tx.account_keys[1..] {
         if client.get_balance(a).unwrap_or(0) >= amount {
             return true;
         }
@@ -394,7 +305,7 @@ 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], lamports: u64) {
+pub fn fund_keys(client: &mut ThinClient, 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();
@@ -438,10 +349,7 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Keypair], lam
                 .map(|(k, m)| {
                     (
                         k.clone(),
-                        Transaction::new_unsigned_instructions(system_instruction::transfer_many(
-                            &k.pubkey(),
-                            &m,
-                        )),
+                        SystemTransaction::new_move_many(k, &m, Hash::default(), 0),
                     )
                 })
                 .collect();
@@ -451,7 +359,7 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Keypair], lam
             while !to_fund_txs.is_empty() {
                 let receivers = to_fund_txs
                     .iter()
-                    .fold(0, |len, (_, tx)| len + tx.message().instructions.len());
+                    .fold(0, |len, (_, tx)| len + tx.instructions.len());
 
                 println!(
                     "{} {} to {} in {} txs",
@@ -465,7 +373,7 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Keypair], lam
                     to_fund_txs.len(),
                 );
 
-                let blockhash = client.get_recent_blockhash().unwrap();
+                let blockhash = client.get_recent_blockhash();
 
                 // re-sign retained to_fund_txes with updated blockhash
                 to_fund_txs.par_iter_mut().for_each(|(k, tx)| {
@@ -473,19 +381,13 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Keypair], lam
                 });
 
                 to_fund_txs.iter().for_each(|(_, tx)| {
-                    client.async_send_transaction(tx.clone()).expect("transfer");
+                    client.transfer_signed(&tx).expect("transfer");
                 });
 
                 // retry anything that seems to have dropped through cracks
                 //  again since these txs are all or nothing, they're fine to
                 //  retry
-                for _ in 0..10 {
-                    to_fund_txs.retain(|(_, tx)| !verify_funding_transfer(client, &tx, amount));
-                    if to_fund_txs.is_empty() {
-                        break;
-                    }
-                    sleep(Duration::from_millis(100));
-                }
+                to_fund_txs.retain(|(_, tx)| !verify_funding_transfer(client, &tx, amount));
 
                 tries += 1;
             }
@@ -496,13 +398,13 @@ pub fn fund_keys<T: Client>(client: &T, source: &Keypair, dests: &[Keypair], lam
     }
 }
 
-pub fn airdrop_lamports<T: Client>(
-    client: &T,
+pub fn airdrop_lamports(
+    client: &mut ThinClient,
     drone_addr: &SocketAddr,
     id: &Keypair,
     tx_count: u64,
 ) {
-    let starting_balance = client.get_balance(&id.pubkey()).unwrap_or(0);
+    let starting_balance = client.poll_get_balance(&id.pubkey()).unwrap_or(0);
     metrics_submit_lamport_balance(starting_balance);
     println!("starting balance {}", starting_balance);
 
@@ -515,18 +417,11 @@ pub fn airdrop_lamports<T: Client>(
             id.pubkey(),
         );
 
-        let blockhash = client.get_recent_blockhash().unwrap();
+        let blockhash = client.get_recent_blockhash();
         match request_airdrop_transaction(&drone_addr, &id.pubkey(), airdrop_amount, blockhash) {
             Ok(transaction) => {
-                let signature = client.async_send_transaction(transaction).unwrap();
-                client
-                    .poll_for_signature_confirmation(&signature, 1)
-                    .unwrap_or_else(|_| {
-                        panic!(
-                            "Error requesting airdrop: to addr: {:?} amount: {}",
-                            drone_addr, airdrop_amount
-                        )
-                    })
+                let signature = client.transfer_signed(&transaction).unwrap();
+                client.poll_for_signature(&signature).unwrap();
             }
             Err(err) => {
                 panic!(
@@ -536,7 +431,7 @@ pub fn airdrop_lamports<T: Client>(
             }
         };
 
-        let current_balance = client.get_balance(&id.pubkey()).unwrap_or_else(|e| {
+        let current_balance = client.poll_get_balance(&id.pubkey()).unwrap_or_else(|e| {
             println!("airdrop error {}", e);
             starting_balance
         });
@@ -555,8 +450,8 @@ pub fn airdrop_lamports<T: Client>(
     }
 }
 
-fn compute_and_report_stats(
-    maxes: &Arc<RwLock<Vec<(String, NodeStats)>>>,
+pub fn compute_and_report_stats(
+    maxes: &Arc<RwLock<Vec<(SocketAddr, NodeStats)>>>,
     sample_period: u64,
     tx_send_elapsed: &Duration,
     total_tx_send_count: usize,
@@ -577,7 +472,10 @@ fn compute_and_report_stats(
 
         println!(
             "{:20} | {:13.2} | {} {}",
-            sock, stats.tps, stats.tx, maybe_flag
+            (*sock).to_string(),
+            stats.tps,
+            stats.tx,
+            maybe_flag
         );
 
         if stats.tps == 0.0 {
@@ -619,37 +517,13 @@ fn compute_and_report_stats(
 // First transfer 3/4 of the lamports to the dest accounts
 // then ping-pong 1/4 of the lamports back to the other account
 // this leaves 1/4 lamport buffer in each account
-fn should_switch_directions(num_lamports_per_account: u64, i: u64) -> bool {
+pub 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(id: &Keypair, tx_count: usize) -> Vec<Keypair> {
-    let mut seed = [0u8; 32];
-    seed.copy_from_slice(&id.to_bytes()[..32]);
-    let mut rnd = GenKeys::new(seed);
-
-    let mut total_keys = 0;
-    let mut target = tx_count * 2;
-    while target > 0 {
-        total_keys += target;
-        target /= MAX_SPENDS_PER_TX;
-    }
-    rnd.gen_n_keypairs(total_keys as u64)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
-    use solana::cluster_info::FULLNODE_PORT_RANGE;
-    use solana::fullnode::FullnodeConfig;
-    use solana::local_cluster::{ClusterConfig, LocalCluster};
-    use solana_client::thin_client::create_client;
-    use solana_drone::drone::run_local_drone;
-    use solana_runtime::bank::Bank;
-    use solana_runtime::bank_client::BankClient;
-    use solana_sdk::genesis_block::GenesisBlock;
-    use std::sync::mpsc::channel;
-
     #[test]
     fn test_switch_directions() {
         assert_eq!(should_switch_directions(20, 0), false);
@@ -664,53 +538,4 @@ mod tests {
         assert_eq!(should_switch_directions(20, 100), true);
         assert_eq!(should_switch_directions(20, 101), false);
     }
-
-    #[test]
-    #[ignore]
-    fn test_bench_tps() {
-        let fullnode_config = FullnodeConfig::default();
-        const NUM_NODES: usize = 1;
-        let cluster = LocalCluster::new(&ClusterConfig {
-            node_stakes: vec![999_990; NUM_NODES],
-            cluster_lamports: 2_000_000,
-            fullnode_config,
-            ..ClusterConfig::default()
-        });
-
-        let drone_keypair = Keypair::new();
-        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 keypairs = generate_keypairs(&config.id, config.tx_count);
-        let client = create_client(
-            (cluster.entry_point_info.gossip, drone_addr),
-            FULLNODE_PORT_RANGE,
-        );
-
-        do_bench_tps(vec![client], config, keypairs, 0);
-    }
-
-    #[test]
-    fn test_bench_tps_bank_client() {
-        let (genesis_block, id) = GenesisBlock::new(10_000);
-        let bank = Bank::new(&genesis_block);
-        let clients = vec![BankClient::new(bank)];
-
-        let mut config = Config::default();
-        config.id = id;
-        config.tx_count = 10;
-        config.duration = Duration::from_secs(5);
-
-        let keypairs = generate_keypairs(&config.id, config.tx_count);
-        fund_keys(&clients[0], &config.id, &keypairs, 20);
-
-        do_bench_tps(clients, config, keypairs, 0);
-    }
 }

bench-tps/src/cli.rs

@@ -2,7 +2,7 @@ use std::net::SocketAddr;
 use std::process::exit;
 use std::time::Duration;
 
-use clap::{crate_description, crate_name, crate_version, App, Arg, ArgMatches};
+use clap::{crate_version, App, Arg, ArgMatches};
 use solana_drone::drone::DRONE_PORT;
 use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil};
 
@@ -17,6 +17,8 @@ pub struct Config {
     pub tx_count: usize,
     pub thread_batch_sleep_ms: usize,
     pub sustained: bool,
+    pub reject_extra_nodes: bool,
+    pub converge_only: bool,
 }
 
 impl Default for Config {
@@ -31,13 +33,15 @@ impl Default for Config {
             tx_count: 500_000,
             thread_batch_sleep_ms: 0,
             sustained: false,
+            reject_extra_nodes: false,
+            converge_only: false,
         }
     }
 }
 
 /// Defines and builds the CLI args for a run of the benchmark
 pub fn build_args<'a, 'b>() -> App<'a, 'b> {
-    App::new(crate_name!()).about(crate_description!())
+    App::new("solana-bench-tps")
         .version(crate_version!())
         .arg(
             Arg::with_name("network")
@@ -71,6 +75,11 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
                 .takes_value(true)
                 .help("Wait for NUM nodes to converge"),
         )
+        .arg(
+            Arg::with_name("reject-extra-nodes")
+                .long("reject-extra-nodes")
+                .help("Require exactly `num-nodes` on convergence. Appropriate only for internal networks"),
+        )
         .arg(
             Arg::with_name("threads")
                 .short("t")
@@ -86,6 +95,11 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
                 .takes_value(true)
                 .help("Seconds to run benchmark, then exit; default is forever"),
         )
+        .arg(
+            Arg::with_name("converge-only")
+                .long("converge-only")
+                .help("Exit immediately after converging"),
+        )
         .arg(
             Arg::with_name("sustained")
                 .long("sustained")
@@ -117,14 +131,14 @@ pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
     let mut args = Config::default();
 
     if let Some(addr) = matches.value_of("network") {
-        args.network_addr = solana_netutil::parse_host_port(addr).unwrap_or_else(|e| {
-            eprintln!("failed to parse network address: {}", e);
+        args.network_addr = addr.parse().unwrap_or_else(|e| {
+            eprintln!("failed to parse network: {}", e);
             exit(1)
         });
     }
 
     if let Some(addr) = matches.value_of("drone") {
-        args.drone_addr = solana_netutil::parse_host_port(addr).unwrap_or_else(|e| {
+        args.drone_addr = addr.parse().unwrap_or_else(|e| {
             eprintln!("failed to parse drone address: {}", e);
             exit(1)
         });
@@ -162,6 +176,8 @@ pub fn extract_args<'a>(matches: &ArgMatches<'a>) -> Config {
     }
 
     args.sustained = matches.is_present("sustained");
+    args.converge_only = matches.is_present("converge-only");
+    args.reject_extra_nodes = matches.is_present("reject-extra-nodes");
 
     args
 }

bench-tps/src/main.rs

@@ -1,38 +1,45 @@
 mod bench;
 mod cli;
 
-use crate::bench::{
-    airdrop_lamports, do_bench_tps, fund_keys, generate_keypairs, Config, NUM_LAMPORTS_PER_ACCOUNT,
-};
+use crate::bench::*;
 use solana::cluster_info::FULLNODE_PORT_RANGE;
-use solana::contact_info::ContactInfo;
-use solana::gossip_service::discover_nodes;
-use solana_client::thin_client::create_client;
-use solana_sdk::client::SyncClient;
-use solana_sdk::signature::KeypairUtil;
+use solana::gen_keys::GenKeys;
+use solana::gossip_service::discover;
+use solana_client::client::create_client;
+use solana_metrics;
+use solana_sdk::signature::{Keypair, KeypairUtil};
+use std::collections::VecDeque;
 use std::process::exit;
+use std::sync::atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering};
+use std::sync::{Arc, RwLock};
+use std::thread::sleep;
+use std::thread::Builder;
+use std::time::Duration;
+use std::time::Instant;
 
 fn main() {
     solana_logger::setup();
     solana_metrics::set_panic_hook("bench-tps");
 
     let matches = cli::build_args().get_matches();
-    let cli_config = cli::extract_args(&matches);
+
+    let cfg = cli::extract_args(&matches);
 
     let cli::Config {
-        network_addr,
+        network_addr: network,
         drone_addr,
         id,
         threads,
+        thread_batch_sleep_ms,
         num_nodes,
         duration,
         tx_count,
-        thread_batch_sleep_ms,
         sustained,
-    } = cli_config;
+        reject_extra_nodes,
+        converge_only,
+    } = cfg;
 
-    println!("Connecting to the cluster");
-    let nodes = discover_nodes(&network_addr, num_nodes).unwrap_or_else(|err| {
+    let nodes = discover(&network, num_nodes).unwrap_or_else(|err| {
         eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
         exit(1);
     });
@@ -43,49 +50,202 @@ fn main() {
         );
         exit(1);
     }
-    let clients: Vec<_> = nodes
-        .iter()
-        .filter_map(|node| {
-            let cluster_entrypoint = node.clone();
-            let cluster_addrs = cluster_entrypoint.client_facing_addr();
-            if ContactInfo::is_valid_address(&cluster_addrs.0)
-                && ContactInfo::is_valid_address(&cluster_addrs.1)
-            {
-                let client = create_client(cluster_addrs, FULLNODE_PORT_RANGE);
-                Some(client)
-            } else {
-                None
-            }
+    if reject_extra_nodes && nodes.len() > num_nodes {
+        eprintln!(
+            "Error: Extra nodes discovered.  Expecting exactly {}",
+            num_nodes
+        );
+        exit(1);
+    }
+
+    if converge_only {
+        return;
+    }
+    let cluster_entrypoint = nodes[0].clone(); // Pick the first node, why not?
+
+    let mut client = create_client(cluster_entrypoint.client_facing_addr(), FULLNODE_PORT_RANGE);
+    let mut barrier_client =
+        create_client(cluster_entrypoint.client_facing_addr(), FULLNODE_PORT_RANGE);
+
+    let mut seed = [0u8; 32];
+    seed.copy_from_slice(&id.public_key_bytes()[..32]);
+    let mut rnd = GenKeys::new(seed);
+
+    println!("Creating {} keypairs...", tx_count * 2);
+    let mut total_keys = 0;
+    let mut target = tx_count * 2;
+    while target > 0 {
+        total_keys += target;
+        target /= MAX_SPENDS_PER_TX;
+    }
+    let gen_keypairs = rnd.gen_n_keypairs(total_keys as u64);
+    let barrier_source_keypair = Keypair::new();
+    let barrier_dest_id = Keypair::new().pubkey();
+
+    println!("Get lamports...");
+    let num_lamports_per_account = 20;
+
+    // Sample the first keypair, see if it has lamports, if so then resume
+    // to avoid lamport loss
+    let keypair0_balance = client
+        .poll_get_balance(&gen_keypairs.last().unwrap().pubkey())
+        .unwrap_or(0);
+
+    if num_lamports_per_account > keypair0_balance {
+        let extra = num_lamports_per_account - keypair0_balance;
+        let total = extra * (gen_keypairs.len() as u64);
+        airdrop_lamports(&mut client, &drone_addr, &id, total);
+        println!("adding more lamports {}", extra);
+        fund_keys(&mut client, &id, &gen_keypairs, extra);
+    }
+    let start = gen_keypairs.len() - (tx_count * 2) as usize;
+    let keypairs = &gen_keypairs[start..];
+    airdrop_lamports(&mut barrier_client, &drone_addr, &barrier_source_keypair, 1);
+
+    println!("Get last ID...");
+    let mut blockhash = client.get_recent_blockhash();
+    println!("Got last ID {:?}", blockhash);
+
+    let first_tx_count = client.transaction_count();
+    println!("Initial transaction count {}", first_tx_count);
+
+    let exit_signal = Arc::new(AtomicBool::new(false));
+
+    // Setup a thread per validator to sample every period
+    // collect the max transaction rate and total tx count seen
+    let maxes = Arc::new(RwLock::new(Vec::new()));
+    let sample_period = 1; // in seconds
+    println!("Sampling TPS every {} second...", sample_period);
+    let v_threads: Vec<_> = nodes
+        .into_iter()
+        .map(|v| {
+            let exit_signal = exit_signal.clone();
+            let maxes = maxes.clone();
+            Builder::new()
+                .name("solana-client-sample".to_string())
+                .spawn(move || {
+                    sample_tx_count(&exit_signal, &maxes, first_tx_count, &v, sample_period);
+                })
+                .unwrap()
         })
         .collect();
 
-    println!("Creating {} keypairs...", tx_count * 2);
-    let keypairs = generate_keypairs(&id, tx_count);
+    let shared_txs: SharedTransactions = Arc::new(RwLock::new(VecDeque::new()));
 
-    println!("Get lamports...");
+    let shared_tx_active_thread_count = Arc::new(AtomicIsize::new(0));
+    let total_tx_sent_count = Arc::new(AtomicUsize::new(0));
 
-    // Sample the first keypair, see if it has lamports, if so then resume.
-    // This logic is to prevent lamport loss on repeated solana-bench-tps executions
-    let keypair0_balance = clients[0]
-        .get_balance(&keypairs.last().unwrap().pubkey())
-        .unwrap_or(0);
+    let s_threads: Vec<_> = (0..threads)
+        .map(|_| {
+            let exit_signal = exit_signal.clone();
+            let shared_txs = shared_txs.clone();
+            let cluster_entrypoint = cluster_entrypoint.clone();
+            let shared_tx_active_thread_count = shared_tx_active_thread_count.clone();
+            let total_tx_sent_count = total_tx_sent_count.clone();
+            Builder::new()
+                .name("solana-client-sender".to_string())
+                .spawn(move || {
+                    do_tx_transfers(
+                        &exit_signal,
+                        &shared_txs,
+                        &cluster_entrypoint,
+                        &shared_tx_active_thread_count,
+                        &total_tx_sent_count,
+                        thread_batch_sleep_ms,
+                    );
+                })
+                .unwrap()
+        })
+        .collect();
 
-    if NUM_LAMPORTS_PER_ACCOUNT > keypair0_balance {
-        let extra = NUM_LAMPORTS_PER_ACCOUNT - keypair0_balance;
-        let total = extra * (keypairs.len() as u64);
-        airdrop_lamports(&clients[0], &drone_addr, &id, total);
-        println!("adding more lamports {}", extra);
-        fund_keys(&clients[0], &id, &keypairs, extra);
+    // generate and send transactions for the specified duration
+    let start = Instant::now();
+    let mut reclaim_lamports_back_to_source_account = false;
+    let mut i = keypair0_balance;
+    while start.elapsed() < duration {
+        let balance = client.poll_get_balance(&id.pubkey()).unwrap_or(0);
+        metrics_submit_lamport_balance(balance);
+
+        // ping-pong between source and destination accounts for each loop iteration
+        // this seems to be faster than trying to determine the balance of individual
+        // accounts
+        let len = tx_count as usize;
+        generate_txs(
+            &shared_txs,
+            &keypairs[..len],
+            &keypairs[len..],
+            threads,
+            reclaim_lamports_back_to_source_account,
+            &cluster_entrypoint,
+        );
+        // In sustained mode overlap the transfers with generation
+        // this has higher average performance but lower peak performance
+        // in tested environments.
+        if !sustained {
+            while shared_tx_active_thread_count.load(Ordering::Relaxed) > 0 {
+                sleep(Duration::from_millis(100));
+            }
+        }
+        // It's not feasible (would take too much time) to confirm each of the `tx_count / 2`
+        // transactions sent by `generate_txs()` so instead send and confirm a single transaction
+        // to validate the network is still functional.
+        send_barrier_transaction(
+            &mut barrier_client,
+            &mut blockhash,
+            &barrier_source_keypair,
+            &barrier_dest_id,
+        );
+
+        i += 1;
+        if should_switch_directions(num_lamports_per_account, i) {
+            reclaim_lamports_back_to_source_account = !reclaim_lamports_back_to_source_account;
+        }
     }
 
-    let config = Config {
-        id,
-        threads,
-        thread_batch_sleep_ms,
-        duration,
-        tx_count,
-        sustained,
-    };
+    // Stop the sampling threads so it will collect the stats
+    exit_signal.store(true, Ordering::Relaxed);
 
-    do_bench_tps(clients, config, keypairs, keypair0_balance);
+    println!("Waiting for validator threads...");
+    for t in v_threads {
+        if let Err(err) = t.join() {
+            println!("  join() failed with: {:?}", err);
+        }
+    }
+
+    // join the tx send threads
+    println!("Waiting for transmit threads...");
+    for t in s_threads {
+        if let Err(err) = t.join() {
+            println!("  join() failed with: {:?}", err);
+        }
+    }
+
+    let balance = client.poll_get_balance(&id.pubkey()).unwrap_or(0);
+    metrics_submit_lamport_balance(balance);
+
+    compute_and_report_stats(
+        &maxes,
+        sample_period,
+        &start.elapsed(),
+        total_tx_sent_count.load(Ordering::Relaxed),
+    );
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn test_switch_directions() {
+        assert_eq!(should_switch_directions(20, 0), false);
+        assert_eq!(should_switch_directions(20, 1), false);
+        assert_eq!(should_switch_directions(20, 14), false);
+        assert_eq!(should_switch_directions(20, 15), true);
+        assert_eq!(should_switch_directions(20, 16), false);
+        assert_eq!(should_switch_directions(20, 19), false);
+        assert_eq!(should_switch_directions(20, 20), true);
+        assert_eq!(should_switch_directions(20, 21), false);
+        assert_eq!(should_switch_directions(20, 99), false);
+        assert_eq!(should_switch_directions(20, 100), true);
+        assert_eq!(should_switch_directions(20, 101), false);
+    }
 }

benches/append_vec.rs

@@ -0,0 +1,248 @@
+#![feature(test)]
+
+extern crate rand;
+extern crate test;
+
+use bincode::{deserialize, serialize_into, serialized_size};
+use rand::{thread_rng, Rng};
+use solana_runtime::append_vec::{
+    deserialize_account, get_serialized_size, serialize_account, AppendVec,
+};
+use solana_sdk::account::Account;
+use solana_sdk::signature::{Keypair, KeypairUtil};
+use std::env;
+use std::io::Cursor;
+use std::path::PathBuf;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::{Arc, RwLock};
+use std::thread::spawn;
+use test::Bencher;
+
+const START_SIZE: u64 = 4 * 1024 * 1024;
+const INC_SIZE: u64 = 1 * 1024 * 1024;
+
+macro_rules! align_up {
+    ($addr: expr, $align: expr) => {
+        ($addr + ($align - 1)) & !($align - 1)
+    };
+}
+
+fn get_append_vec_bench_path(path: &str) -> PathBuf {
+    let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "target".to_string());
+    let mut buf = PathBuf::new();
+    buf.push(&format!("{}/{}", out_dir, path));
+    buf
+}
+
+#[bench]
+fn append_vec_atomic_append(bencher: &mut Bencher) {
+    let path = get_append_vec_bench_path("bench_append");
+    let mut vec = AppendVec::<AtomicUsize>::new(&path, true, START_SIZE, INC_SIZE);
+    bencher.iter(|| {
+        if vec.append(AtomicUsize::new(0)).is_none() {
+            assert!(vec.grow_file().is_ok());
+            assert!(vec.append(AtomicUsize::new(0)).is_some());
+        }
+    });
+    std::fs::remove_file(path).unwrap();
+}
+
+#[bench]
+fn append_vec_atomic_random_access(bencher: &mut Bencher) {
+    let path = get_append_vec_bench_path("bench_ra");
+    let mut vec = AppendVec::<AtomicUsize>::new(&path, true, START_SIZE, INC_SIZE);
+    let size = 1_000_000;
+    for _ in 0..size {
+        if vec.append(AtomicUsize::new(0)).is_none() {
+            assert!(vec.grow_file().is_ok());
+            assert!(vec.append(AtomicUsize::new(0)).is_some());
+        }
+    }
+    bencher.iter(|| {
+        let index = thread_rng().gen_range(0, size as u64);
+        vec.get(index * std::mem::size_of::<AtomicUsize>() as u64);
+    });
+    std::fs::remove_file(path).unwrap();
+}
+
+#[bench]
+fn append_vec_atomic_random_change(bencher: &mut Bencher) {
+    let path = get_append_vec_bench_path("bench_rax");
+    let mut vec = AppendVec::<AtomicUsize>::new(&path, true, START_SIZE, INC_SIZE);
+    let size = 1_000_000;
+    for k in 0..size {
+        if vec.append(AtomicUsize::new(k)).is_none() {
+            assert!(vec.grow_file().is_ok());
+            assert!(vec.append(AtomicUsize::new(k)).is_some());
+        }
+    }
+    bencher.iter(|| {
+        let index = thread_rng().gen_range(0, size as u64);
+        let atomic1 = vec.get(index * std::mem::size_of::<AtomicUsize>() as u64);
+        let current1 = atomic1.load(Ordering::Relaxed);
+        assert_eq!(current1, index as usize);
+        let next = current1 + 1;
+        let mut index = vec.append(AtomicUsize::new(next));
+        if index.is_none() {
+            assert!(vec.grow_file().is_ok());
+            index = vec.append(AtomicUsize::new(next));
+        }
+        let atomic2 = vec.get(index.unwrap());
+        let current2 = atomic2.load(Ordering::Relaxed);
+        assert_eq!(current2, next);
+    });
+    std::fs::remove_file(path).unwrap();
+}
+
+#[bench]
+fn append_vec_atomic_random_read(bencher: &mut Bencher) {
+    let path = get_append_vec_bench_path("bench_read");
+    let mut vec = AppendVec::<AtomicUsize>::new(&path, true, START_SIZE, INC_SIZE);
+    let size = 1_000_000;
+    for _ in 0..size {
+        if vec.append(AtomicUsize::new(0)).is_none() {
+            assert!(vec.grow_file().is_ok());
+            assert!(vec.append(AtomicUsize::new(0)).is_some());
+        }
+    }
+    bencher.iter(|| {
+        let index = thread_rng().gen_range(0, size);
+        let atomic1 = vec.get((index * std::mem::size_of::<AtomicUsize>()) as u64);
+        let current1 = atomic1.load(Ordering::Relaxed);
+        assert_eq!(current1, 0);
+    });
+    std::fs::remove_file(path).unwrap();
+}
+
+#[bench]
+fn append_vec_concurrent_lock_append(bencher: &mut Bencher) {
+    let path = get_append_vec_bench_path("bench_lock_append");
+    let vec = Arc::new(RwLock::new(AppendVec::<AtomicUsize>::new(
+        &path, true, START_SIZE, INC_SIZE,
+    )));
+    let vec1 = vec.clone();
+    let size = 1_000_000;
+    let count = Arc::new(AtomicUsize::new(0));
+    let count1 = count.clone();
+    spawn(move || loop {
+        let mut len = count.load(Ordering::Relaxed);
+        {
+            let rlock = vec1.read().unwrap();
+            loop {
+                if rlock.append(AtomicUsize::new(0)).is_none() {
+                    break;
+                }
+                len = count.fetch_add(1, Ordering::Relaxed);
+            }
+            if len >= size {
+                break;
+            }
+        }
+        {
+            let mut wlock = vec1.write().unwrap();
+            if len >= size {
+                break;
+            }
+            assert!(wlock.grow_file().is_ok());
+        }
+    });
+    bencher.iter(|| {
+        let _rlock = vec.read().unwrap();
+        let len = count1.load(Ordering::Relaxed);
+        assert!(len < size * 2);
+    });
+    std::fs::remove_file(path).unwrap();
+}
+
+#[bench]
+fn append_vec_concurrent_get_append(bencher: &mut Bencher) {
+    let path = get_append_vec_bench_path("bench_get_append");
+    let vec = Arc::new(RwLock::new(AppendVec::<AtomicUsize>::new(
+        &path, true, START_SIZE, INC_SIZE,
+    )));
+    let vec1 = vec.clone();
+    let size = 1_000_000;
+    let count = Arc::new(AtomicUsize::new(0));
+    let count1 = count.clone();
+    spawn(move || loop {
+        let mut len = count.load(Ordering::Relaxed);
+        {
+            let rlock = vec1.read().unwrap();
+            loop {
+                if rlock.append(AtomicUsize::new(0)).is_none() {
+                    break;
+                }
+                len = count.fetch_add(1, Ordering::Relaxed);
+            }
+            if len >= size {
+                break;
+            }
+        }
+        {
+            let mut wlock = vec1.write().unwrap();
+            if len >= size {
+                break;
+            }
+            assert!(wlock.grow_file().is_ok());
+        }
+    });
+    bencher.iter(|| {
+        let rlock = vec.read().unwrap();
+        let len = count1.load(Ordering::Relaxed);
+        if len > 0 {
+            let index = thread_rng().gen_range(0, len);
+            rlock.get((index * std::mem::size_of::<AtomicUsize>()) as u64);
+        }
+    });
+    std::fs::remove_file(path).unwrap();
+}
+
+#[bench]
+fn bench_account_serialize(bencher: &mut Bencher) {
+    let num: usize = 1000;
+    let account = Account::new(2, 100, &Keypair::new().pubkey());
+    let len = get_serialized_size(&account);
+    let ser_len = align_up!(len + std::mem::size_of::<u64>(), std::mem::size_of::<u64>());
+    let mut memory = vec![0; num * ser_len];
+    bencher.iter(|| {
+        for i in 0..num {
+            let start = i * ser_len;
+            serialize_account(&mut memory[start..start + ser_len], &account, len);
+        }
+    });
+
+    // make sure compiler doesn't delete the code.
+    let index = thread_rng().gen_range(0, num);
+    if memory[index] != 0 {
+        println!("memory: {}", memory[index]);
+    }
+
+    let start = index * ser_len;
+    let new_account = deserialize_account(&memory[start..start + ser_len], 0, num * len).unwrap();
+    assert_eq!(new_account, account);
+}
+
+#[bench]
+fn bench_account_serialize_bincode(bencher: &mut Bencher) {
+    let num: usize = 1000;
+    let account = Account::new(2, 100, &Keypair::new().pubkey());
+    let len = serialized_size(&account).unwrap() as usize;
+    let mut memory = vec![0u8; num * len];
+    bencher.iter(|| {
+        for i in 0..num {
+            let start = i * len;
+            let cursor = Cursor::new(&mut memory[start..start + len]);
+            serialize_into(cursor, &account).unwrap();
+        }
+    });
+
+    // make sure compiler doesn't delete the code.
+    let index = thread_rng().gen_range(0, len);
+    if memory[index] != 0 {
+        println!("memory: {}", memory[index]);
+    }
+
+    let start = index * len;
+    let new_account: Account = deserialize(&memory[start..start + len]).unwrap();
+    assert_eq!(new_account, account);
+}

benches/banking_stage.rs

@@ -1,16 +1,12 @@
 #![feature(test)]
 
 extern crate test;
-#[macro_use]
-extern crate solana;
 
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
 use solana::banking_stage::{create_test_recorder, BankingStage};
-use solana::blocktree::{get_tmp_ledger_path, Blocktree};
 use solana::cluster_info::ClusterInfo;
 use solana::cluster_info::Node;
-use solana::leader_schedule_cache::LeaderScheduleCache;
 use solana::packet::to_packets_chunked;
 use solana::poh_recorder::WorkingBankEntries;
 use solana::service::Service;
@@ -19,7 +15,7 @@ use solana_sdk::genesis_block::GenesisBlock;
 use solana_sdk::hash::hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{KeypairUtil, Signature};
-use solana_sdk::system_transaction;
+use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, MAX_RECENT_BLOCKHASHES};
 use std::iter;
 use std::sync::atomic::Ordering;
@@ -49,17 +45,15 @@ fn check_txs(receiver: &Receiver<WorkingBankEntries>, ref_tx_count: usize) {
 #[bench]
 #[ignore]
 fn bench_banking_stage_multi_accounts(bencher: &mut Bencher) {
-    let num_threads = BankingStage::num_threads() as usize;
+    let num_threads = 4;
     //   a multiple of packet chunk  2X duplicates to avoid races
     let txes = 192 * 50 * num_threads * 2;
     let mint_total = 1_000_000_000_000;
     let (genesis_block, mint_keypair) = GenesisBlock::new(mint_total);
 
     let (verified_sender, verified_receiver) = channel();
-    let (vote_sender, vote_receiver) = channel();
     let bank = Arc::new(Bank::new(&genesis_block));
-    let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank));
-    let dummy = system_transaction::transfer(
+    let dummy = SystemTransaction::new_move(
         &mint_keypair,
         &mint_keypair.pubkey(),
         1,
@@ -73,17 +67,17 @@ fn bench_banking_stage_multi_accounts(bencher: &mut Bencher) {
             let from: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
             let to: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
             let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
-            new.message.account_keys[0] = Pubkey::new(&from[0..32]);
-            new.message.account_keys[1] = Pubkey::new(&to[0..32]);
+            new.account_keys[0] = Pubkey::new(&from[0..32]);
+            new.account_keys[1] = Pubkey::new(&to[0..32]);
             new.signatures = vec![Signature::new(&sig[0..64])];
             new
         })
         .collect();
     // fund all the accounts
     transactions.iter().for_each(|tx| {
-        let fund = system_transaction::transfer(
+        let fund = SystemTransaction::new_move(
             &mint_keypair,
-            &tx.message.account_keys[0],
+            &tx.account_keys[0],
             mint_total / txes as u64,
             genesis_block.hash(),
             0,
@@ -106,69 +100,52 @@ fn bench_banking_stage_multi_accounts(bencher: &mut Bencher) {
     let verified: Vec<_> = to_packets_chunked(&transactions.clone(), 192)
         .into_iter()
         .map(|x| {
-            let len = x.packets.len();
+            let len = x.read().unwrap().packets.len();
             (x, iter::repeat(1).take(len).collect())
         })
         .collect();
-    let ledger_path = get_tmp_ledger_path!();
-    {
-        let blocktree = Arc::new(
-            Blocktree::open(&ledger_path).expect("Expected to be able to open database ledger"),
-        );
-        let (exit, poh_recorder, poh_service, signal_receiver) =
-            create_test_recorder(&bank, &blocktree);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-        let cluster_info = Arc::new(RwLock::new(cluster_info));
-        let _banking_stage = BankingStage::new(
-            &cluster_info,
-            &poh_recorder,
-            verified_receiver,
-            vote_receiver,
-            &leader_schedule_cache,
-        );
-        poh_recorder.lock().unwrap().set_bank(&bank);
+    let (exit, poh_recorder, poh_service, signal_receiver) = create_test_recorder(&bank);
+    let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+    let cluster_info = Arc::new(RwLock::new(cluster_info));
+    let _banking_stage = BankingStage::new(&cluster_info, &poh_recorder, verified_receiver);
+    poh_recorder.lock().unwrap().set_bank(&bank);
 
-        let mut id = genesis_block.hash();
-        for _ in 0..(MAX_RECENT_BLOCKHASHES * DEFAULT_TICKS_PER_SLOT as usize) {
-            id = hash(&id.as_ref());
-            bank.register_tick(&id);
-        }
-
-        let half_len = verified.len() / 2;
-        let mut start = 0;
-        bencher.iter(move || {
-            // make sure the transactions are still valid
-            bank.register_tick(&genesis_block.hash());
-            for v in verified[start..start + half_len].chunks(verified.len() / num_threads) {
-                verified_sender.send(v.to_vec()).unwrap();
-            }
-            check_txs(&signal_receiver, txes / 2);
-            bank.clear_signatures();
-            start += half_len;
-            start %= verified.len();
-        });
-        drop(vote_sender);
-        exit.store(true, Ordering::Relaxed);
-        poh_service.join().unwrap();
+    let mut id = genesis_block.hash();
+    for _ in 0..(MAX_RECENT_BLOCKHASHES * DEFAULT_TICKS_PER_SLOT as usize) {
+        id = hash(&id.as_ref());
+        bank.register_tick(&id);
     }
-    Blocktree::destroy(&ledger_path).unwrap();
+
+    let half_len = verified.len() / 2;
+    let mut start = 0;
+    bencher.iter(move || {
+        // make sure the transactions are still valid
+        bank.register_tick(&genesis_block.hash());
+        for v in verified[start..start + half_len].chunks(verified.len() / num_threads) {
+            verified_sender.send(v.to_vec()).unwrap();
+        }
+        check_txs(&signal_receiver, txes / 2);
+        bank.clear_signatures();
+        start += half_len;
+        start %= verified.len();
+    });
+    exit.store(true, Ordering::Relaxed);
+    poh_service.join().unwrap();
 }
 
 #[bench]
 #[ignore]
 fn bench_banking_stage_multi_programs(bencher: &mut Bencher) {
     let progs = 4;
-    let num_threads = BankingStage::num_threads() as usize;
+    let num_threads = 4;
     //   a multiple of packet chunk  2X duplicates to avoid races
     let txes = 96 * 100 * num_threads * 2;
     let mint_total = 1_000_000_000_000;
     let (genesis_block, mint_keypair) = GenesisBlock::new(mint_total);
 
     let (verified_sender, verified_receiver) = channel();
-    let (vote_sender, vote_receiver) = channel();
     let bank = Arc::new(Bank::new(&genesis_block));
-    let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank));
-    let dummy = system_transaction::transfer(
+    let dummy = SystemTransaction::new_move(
         &mint_keypair,
         &mint_keypair.pubkey(),
         1,
@@ -182,33 +159,33 @@ fn bench_banking_stage_multi_programs(bencher: &mut Bencher) {
             let from: Vec<u8> = (0..32).map(|_| thread_rng().gen()).collect();
             let sig: Vec<u8> = (0..64).map(|_| thread_rng().gen()).collect();
             let to: Vec<u8> = (0..32).map(|_| thread_rng().gen()).collect();
-            new.message.account_keys[0] = Pubkey::new(&from[0..32]);
-            new.message.account_keys[1] = Pubkey::new(&to[0..32]);
-            let prog = new.message.instructions[0].clone();
+            new.account_keys[0] = Pubkey::new(&from[0..32]);
+            new.account_keys[1] = Pubkey::new(&to[0..32]);
+            let prog = new.instructions[0].clone();
             for i in 1..progs {
                 //generate programs that spend to random keys
                 let to: Vec<u8> = (0..32).map(|_| thread_rng().gen()).collect();
                 let to_key = Pubkey::new(&to[0..32]);
-                new.message.account_keys.push(to_key);
-                assert_eq!(new.message.account_keys.len(), i + 2);
-                new.message.instructions.push(prog.clone());
-                assert_eq!(new.message.instructions.len(), i + 1);
-                new.message.instructions[i].accounts[1] = 1 + i as u8;
+                new.account_keys.push(to_key);
+                assert_eq!(new.account_keys.len(), i + 2);
+                new.instructions.push(prog.clone());
+                assert_eq!(new.instructions.len(), i + 1);
+                new.instructions[i].accounts[1] = 1 + i as u8;
                 assert_eq!(new.key(i, 1), Some(&to_key));
                 assert_eq!(
-                    new.message.account_keys[new.message.instructions[i].accounts[1] as usize],
+                    new.account_keys[new.instructions[i].accounts[1] as usize],
                     to_key
                 );
             }
-            assert_eq!(new.message.instructions.len(), progs);
+            assert_eq!(new.instructions.len(), progs);
             new.signatures = vec![Signature::new(&sig[0..64])];
             new
         })
         .collect();
     transactions.iter().for_each(|tx| {
-        let fund = system_transaction::transfer(
+        let fund = SystemTransaction::new_move(
             &mint_keypair,
-            &tx.message.account_keys[0],
+            &tx.account_keys[0],
             mint_total / txes as u64,
             genesis_block.hash(),
             0,
@@ -230,51 +207,35 @@ fn bench_banking_stage_multi_programs(bencher: &mut Bencher) {
     let verified: Vec<_> = to_packets_chunked(&transactions.clone(), 96)
         .into_iter()
         .map(|x| {
-            let len = x.packets.len();
+            let len = x.read().unwrap().packets.len();
             (x, iter::repeat(1).take(len).collect())
         })
         .collect();
+    let (exit, poh_recorder, poh_service, signal_receiver) = create_test_recorder(&bank);
+    let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
+    let cluster_info = Arc::new(RwLock::new(cluster_info));
+    let _banking_stage = BankingStage::new(&cluster_info, &poh_recorder, verified_receiver);
+    poh_recorder.lock().unwrap().set_bank(&bank);
 
-    let ledger_path = get_tmp_ledger_path!();
-    {
-        let blocktree = Arc::new(
-            Blocktree::open(&ledger_path).expect("Expected to be able to open database ledger"),
-        );
-        let (exit, poh_recorder, poh_service, signal_receiver) =
-            create_test_recorder(&bank, &blocktree);
-        let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);
-        let cluster_info = Arc::new(RwLock::new(cluster_info));
-        let _banking_stage = BankingStage::new(
-            &cluster_info,
-            &poh_recorder,
-            verified_receiver,
-            vote_receiver,
-            &leader_schedule_cache,
-        );
-        poh_recorder.lock().unwrap().set_bank(&bank);
-
-        let mut id = genesis_block.hash();
-        for _ in 0..(MAX_RECENT_BLOCKHASHES * DEFAULT_TICKS_PER_SLOT as usize) {
-            id = hash(&id.as_ref());
-            bank.register_tick(&id);
-        }
-
-        let half_len = verified.len() / 2;
-        let mut start = 0;
-        bencher.iter(move || {
-            // make sure the transactions are still valid
-            bank.register_tick(&genesis_block.hash());
-            for v in verified[start..start + half_len].chunks(verified.len() / num_threads) {
-                verified_sender.send(v.to_vec()).unwrap();
-            }
-            check_txs(&signal_receiver, txes / 2);
-            bank.clear_signatures();
-            start += half_len;
-            start %= verified.len();
-        });
-        drop(vote_sender);
-        exit.store(true, Ordering::Relaxed);
-        poh_service.join().unwrap();
+    let mut id = genesis_block.hash();
+    for _ in 0..(MAX_RECENT_BLOCKHASHES * DEFAULT_TICKS_PER_SLOT as usize) {
+        id = hash(&id.as_ref());
+        bank.register_tick(&id);
     }
-    Blocktree::destroy(&ledger_path).unwrap();
+
+    let half_len = verified.len() / 2;
+    let mut start = 0;
+    bencher.iter(move || {
+        // make sure the transactions are still valid
+        bank.register_tick(&genesis_block.hash());
+        for v in verified[start..start + half_len].chunks(verified.len() / num_threads) {
+            verified_sender.send(v.to_vec()).unwrap();
+        }
+        check_txs(&signal_receiver, txes / 2);
+        bank.clear_signatures();
+        start += half_len;
+        start %= verified.len();
+    });
+    exit.store(true, Ordering::Relaxed);
+    poh_service.join().unwrap();
 }

benches/ledger.rs

@@ -5,7 +5,7 @@ extern crate test;
 use solana::entry::{next_entries, reconstruct_entries_from_blobs, EntrySlice};
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::signature::{Keypair, KeypairUtil};
-use solana_sdk::system_transaction;
+use solana_sdk::system_transaction::SystemTransaction;
 use test::Bencher;
 
 #[bench]
@@ -13,7 +13,7 @@ fn bench_block_to_blobs_to_block(bencher: &mut Bencher) {
     let zero = Hash::default();
     let one = hash(&zero.as_ref());
     let keypair = Keypair::new();
-    let tx0 = system_transaction::transfer(&keypair, &keypair.pubkey(), 1, one, 0);
+    let tx0 = SystemTransaction::new_move(&keypair, &keypair.pubkey(), 1, one, 0);
     let transactions = vec![tx0; 10];
     let entries = next_entries(&zero, 1, transactions);
 

book/.gitattributes

@@ -1 +0,0 @@
-theme/highlight.js binary

book/art/fullnode.bob

@@ -25,6 +25,6 @@
       |      |     |                |               | |  | Downstream |  |
       |      |  .--+--.     .-------+---.           | |  | Validators |  |
       `-------->| TPU +---->| Broadcast +--------------->|            |  |
-             |  `-----`     | Stage     |           | |  `------------`  |
+             |  `-----`     | Service   |           | |  `------------`  |
              |              `-----------`           | `------------------`
              `--------------------------------------`

book/art/passive-staking-callflow.msc

@@ -1,30 +0,0 @@
-msc {
-  hscale="2.2";
-   VoteSigner,
-   Validator,
-   Cluster,
-   StakerX,
-   StakerY;
-
-   |||;
-  Validator box Validator [label="boot.."];
-
-  VoteSigner <:> Validator [label="register\n\n(optional)"];
-  Validator => Cluster [label="VoteState::Initialize(VoteSigner)"];
-  StakerX => Cluster [label="StakeState::Delegate(Validator)"];
-  StakerY => Cluster [label="StakeState::Delegate(Validator)"];
-
-     |||;
-  Validator box Cluster [label="\nvalidate\n"];
-  Validator => VoteSigner [label="sign(vote)"];
-  VoteSigner >> Validator [label="signed vote"];
-
-  Validator => Cluster [label="gossip(vote)"];
-  ...;
-  ... ;
-  Validator abox Validator [label="\nmax\nlockout\n"];
-       |||;
-  StakerX => Cluster [label="StakeState::RedeemCredits()"];
-  StakerY => Cluster [label="StakeState::RedeemCredits()"] ;
-
-}

book/art/tpu.bob

@@ -1,17 +1,16 @@
-
-                                        .-------------.
-                                        | PoH Service |
-                                        `--------+----`
-                                            ^    |
-             .------------------------------|----|--------------------.
-             | TPU                          |    v                    |
-             |  .-------.  .-----------.  .-+-------.  .-----------.  |  .------------.
- .---------. |  | Fetch |  | SigVerify |  | Banking |  | Broadcast |  |  | Downstream |
- | Clients |--->| Stage |->| Stage     |->| Stage   |->| Stage     |---->| Validators |
- `---------` |  |       |  |           |  |         |  |           |  |  |            |
-             |  `-------`  `-----------`  `----+----`  `-----------`  |  `------------`
-             |                                 |                      |
-             `---------------------------------|----------------------`
+             .-------------------------------------------.
+             |  TPU                     .-------------.  |
+             |                          | PoH Service |  |
+             |                          `--------+----`  |
+             |                              ^    |       |
+             |                              |    v       |
+             |  .-------.  .-----------.  .-+-------.    |  .------------.
+ .---------. |  | Fetch |  | SigVerify |  | Banking |    |  | Broadcast  |
+ | Clients |--->| Stage |->| Stage     |->| Stage   |------>| Service    |
+ `---------` |  |       |  |           |  |         |    |  |            |
+             |  `-------`  `-----------`  `----+----`    |  `------------`
+             |                                 |         |
+             `---------------------------------|---------`
                                                |
                                                v
                                             .------.

book/src/SUMMARY.md

@@ -20,7 +20,6 @@
   - [Ledger Replication](ledger-replication.md)
   - [Secure Vote Signing](vote-signing.md)
   - [Staking Delegation and Rewards](stake-delegation-and-rewards.md)
-  - [Performance Metrics](performance-metrics.md)
 
 - [Anatomy of a Fullnode](fullnode.md)
   - [TPU](tpu.md)
@@ -35,13 +34,14 @@
   - [JavaScript API](javascript-api.md)
   - [solana-wallet CLI](wallet.md)
 
-- [Accepted Design Proposals](proposals.md)
+- [Proposed Architectural Changes](proposals.md)
   - [Ledger Replication](ledger-replication-to-implement.md)
   - [Secure Vote Signing](vote-signing-to-implement.md)
   - [Staking Rewards](staking-rewards.md)
-  - [Passive Stake Delegation and Rewards](passive-stake-delegation-and-rewards.md)
+  - [Fork Selection](fork-selection.md)
   - [Reliable Vote Transmission](reliable-vote-transmission.md)
   - [Persistent Account Storage](persistent-account-storage.md)
+  - [Leader to Leader Transition](leader-leader-transition.md)
   - [Cluster Economics](ed_overview.md)
     - [Validation-client Economics](ed_validation_client_economics.md)
       - [State-validation Protocol-based Rewards](ed_vce_state_validation_protocol_based_rewards.md)
@@ -53,16 +53,7 @@
       - [Replication-client Reward Auto-delegation](ed_rce_replication_client_reward_auto_delegation.md)
     - [Economic Sustainability](ed_economic_sustainability.md)
     - [Attack Vectors](ed_attack_vectors.md)
-	- [Economic Design MVP](ed_mvp.md)
     - [References](ed_references.md)
+  - [Leader-to-Validator Transition](leader-validator-transition.md)
   - [Cluster Test Framework](cluster-test-framework.md)
   - [Testing Programs](testing-programs.md)
-  - [Credit-only Accounts](credit-only-credit-debit-accounts.md)
-  - [Cluster Software Installation and Updates](installer.md)
-  - [Deterministic Transaction Fees](transaction-fees.md)
-
-- [Implemented Design Proposals](implemented-proposals.md)
-  - [Fork Selection](fork-selection.md)
-  - [Leader-to-Leader Transition](leader-leader-transition.md)
-  - [Leader-to-Validator Transition](leader-validator-transition.md)
-  - [Testnet Participation](testnet-participation.md)

book/src/cluster-test-framework.md

@@ -51,10 +51,10 @@ At test start, the cluster has already been established and is fully connected.
 The test can discover most of the available nodes over a few second.
 
 ```rust,ignore
-use crate::gossip_service::discover_nodes;
+use crate::gossip_service::discover;
 
 // Discover the cluster over a few seconds.
-let cluster_nodes = discover_nodes(&entry_point_info, num_nodes);
+let cluster_nodes = discover(&entry_point_info, num_nodes);
 ```
 
 ## Cluster Configuration
@@ -99,10 +99,10 @@ pub fn test_large_invalid_gossip_nodes(
     funding_keypair: &Keypair,
     num_nodes: usize,
 ) {
-    let cluster = discover_nodes(&entry_point_info, num_nodes);
+    let cluster = discover(&entry_point_info, num_nodes);
 
     // Poison the cluster.
-    let client = create_client(entry_point_info.client_facing_addr(), FULLNODE_PORT_RANGE);
+    let mut client = create_client(entry_point_info.client_facing_addr(), FULLNODE_PORT_RANGE);
     for _ in 0..(num_nodes * 100) {
         client.gossip_push(
             cluster_info::invalid_contact_info()
@@ -112,7 +112,7 @@ pub fn test_large_invalid_gossip_nodes(
 
     // Force refresh of the active set.
     for node in &cluster {
-        let client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
+        let mut client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
         client.gossip_refresh_active_set();
     }
 

book/src/credit-only-credit-debit-accounts.md

@@ -1,140 +0,0 @@
-# Credit-Only Accounts
-
-This design covers the handling of credit-only and credit-debit accounts in the
-[runtime](runtime.md).  Accounts already distinguish themselves as credit-only or
-credit-debit based on the program ID specified by the transaction's instruction.
-Programs must treat accounts that are not owned by them as credit-only.
-
-To identify credit-only accounts by program id would require the account to be
-fetched and loaded from disk.  This operation is expensive, and while it is
-occurring, the runtime would have to reject any transactions referencing the same
-account.
-
-The proposal introduces a `num_readonly_accounts` field to the transaction
-structure, and removes the `program_ids` dedicated vector for program accounts.
-
-This design doesn't change the runtime transaction processing rules.
-Programs still can't write or spend accounts that they do not own, but it
-allows the runtime to optimistically take the correct lock for each account
-specified in the transaction before loading the accounts from storage.
-
-Accounts selected as credit-debit by the transaction can still be treated as
-credit-only by the instructions.
-
-## Runtime handling
-
-credit-only accounts have the following properties:
-
-* Can be deposited into:  Deposits can be implemented as a simple `atomic_add`.
-* read-only access to account data.
-
-Instructions that debit or modify the credit-only account data will fail.
-
-## Account Lock Optimizations
-
-The Accounts module keeps track of current locked accounts in the runtime,
-which separates credit-only accounts from the credit-debit accounts.  The credit-only
-accounts can be cached in memory and shared between all the threads executing
-transactions.
-
-The current runtime can't predict whether an account is credit-only or credit-debit when
-the transaction account keys are locked at the start of the transaction
-processing pipeline.  Accounts referenced by the transaction have not been
-loaded from the disk yet.
-
-An ideal design would cache the credit-only accounts while they are referenced by
-any transaction moving through the runtime, and release the cache when the last
-transaction exits the runtime.
-
-## Credit-only accounts and read-only account data
-
-Credit-only account data can be treated as read-only. Credit-debit
-account data is treated as read-write.
-
-## Transaction changes
-
-To enable the possibility of caching accounts only while they are in the
-runtime, the Transaction structure should be changed in the following way:
-
-* `program_ids: Vec<Pubkey>` - This vector is removed.  Program keys can be
-placed at the end of the `account_keys` vector within the `num_readonly_accounts`
-number set to the number of programs.
-
-* `num_readonly_accounts: u8` - The number of keys from the **end** of the
-transaction's `account_keys` array that is credit-only.
-
-The following possible accounts are present in an transaction:
-
-* paying account
-* RW accounts
-* R accounts
-* Program IDs
-
-The paying account must be credit-debit, and program IDs must be credit-only.  The
-first account in the `account_keys` array is always the account that pays for
-the transaction fee, therefore it cannot be credit-only.  For these reasons the
-credit-only accounts are all grouped together at the end of the `account_keys`
-vector.  Counting credit-only accounts from the end allow for the default `0`
-value to still be functionally correct, since a transaction will succeed with
-all credit-debit accounts.
-
-Since accounts can only appear once in the transaction's `account_keys` array,
-an account can only be credit-only or credit-debit in a single transaction, not
-both.  The runtime treats a transaction as one atomic unit of execution. If any
-instruction needs credit-debit access to an account, a copy needs to be made. The
-write lock is held for the entire time the transaction is being processed by
-the runtime.
-
-## Starvation
-
-Read locks for credit-only accounts can keep the runtime from executing
-transactions requesting a write lock to a credit-debit account.
-
-When a request for a write lock is made while a read lock is open, the
-transaction requesting the write lock should be cached.  Upon closing the read
-lock, the pending transactions can be pushed through the runtime.
-
-While a pending write transaction exists, any additional read lock requests for
-that account should fail.  It follows that any other write lock requests will also 
-fail.  Currently, clients must retransmit when a transaction fails because of 
-a pending transaction.  This approach would mimic that behavior as closely as
-possible while preventing write starvation.
-
-## Program execution with credit-only accounts
-
-Before handing off the accounts to program execution, the runtime can mark each
-account in each instruction as a credit-only account.  The credit-only accounts can
-be passed as references without an extra copy.  The transaction will abort on a
-write to credit-only.
-
-An alternative is to detect writes to credit-only accounts and fail the
-transactions before commit.
-
-## Alternative design
-
-This design attempts to cache a credit-only account after loading without the use
-of a transaction-specified credit-only accounts list.  Instead, the credit-only
-accounts are held in a reference-counted table inside the runtime as the
-transactions are processed.
-
-1. Transaction accounts are locked.
-    a. If the account is present in the ‘credit-only' table, the TX does not fail.
-       The pending state for this TX is marked NeedReadLock.
-2. Transaction accounts are loaded.
-    a. Transaction accounts that are credit-only increase their reference
-       count in the `credit-only` table.
-    b. Transaction accounts that need a write lock and are present in the
-       `credit-only` table fail.
-3. Transaction accounts are unlocked.
-    a. Decrement the `credit-only` lock table reference count; remove if its 0
-    b. Remove from the `lock` set if the account is not in the `credit-only`
-       table.
-
-The downside with this approach is that if the `lock` set mutex is released
-between lock and load to allow better pipelining of transactions, a request for
-a credit-only account may fail. Therefore, this approach is not suitable for
-treating programs as credit-only accounts.
-
-Holding the accounts lock mutex while fetching the account from disk would
-potentially have a significant performance hit on the runtime. Fetching from
-disk is expected to be slow, but can be parallelized between multiple disks.

book/src/drones.md

@@ -10,7 +10,7 @@ client's account.
 A drone is a simple signing service. It listens for requests to sign
 *transaction data*.  Once received, the drone validates the request however it
 sees fit. It may, for example, only accept transaction data with a
-`SystemInstruction::Transfer` instruction transferring only up to a certain amount
+`SystemInstruction::Move` instruction transferring only up to a certain amount
 of tokens. If the drone accepts the transaction, it returns an `Ok(Signature)`
 where `Signature` is a signature of the transaction data using the drone's
 private key. If it rejects the transaction data, it returns a `DroneError`
@@ -76,7 +76,7 @@ beyond a certain *age*.
 
 If the transaction data size is smaller than the size of the returned signature
 (or descriptive error), a single client can flood the network.  Considering
-that a simple `Transfer` operation requires two public keys (each 32 bytes) and a
+that a simple `Move` operation requires two public keys (each 32 bytes) and a
 `fee` field, and that the returned signature is 64 bytes (and a byte to
 indicate `Ok`), consideration for this attack may not be required.
 

book/src/ed_mvp.md

@@ -1,12 +0,0 @@
-## Proposed MVP of Economic Design
-
-The preceeding sections, outlined in the [Economic Design Overview](ed_overview.md), describe a long-term vision of a sustainable Solana economy. Of course, we don't expect the final implementation to perfectly match what has been described above. We intend to fully engage with network stakeholders throughout the implementation phases (i.e. pre-testnet, testnet, mainnet) to ensure the system supports, and is representative of, the various network participants' interests. The first step toward this goal, however, is outlining a some desired MVP economic features to be available for early pre-testnet and testnet participants. Below is a rough sketch outlining basic economic functionality from which a more complete and functional system can be developed.
-
-### MVP Economic Features
-
-* Faucet to deliver testnet SOLs to validators for staking and dapp development.
-* Mechanism by which validators are rewarded in proportion to their stake. Interest rate mechansism (i.e. to be determined by total % staked) to come later.
-* Ability to delegate tokens to validator nodes.
-* Replicators to receive fixed, arbitrary reward for submitting validated PoReps. Reward size mechanism (i.e. PoRep reward as a function of total ledger redundancy) to come later.
-* Pooling of replicator PoRep transaction fees and weighted distribution to validators based on PoRep verification (see [Replication-validation Transaction Fees](ed_vce_replication_validation_transaction_fees.md). It will be useful to test this protection against attacks on testnet.
-* Nice-to-have: auto-delegation of replicator rewards to validator.

book/src/ed_overview.md

@@ -8,7 +8,7 @@ These protocol-based rewards, to be distributed to participating validation and
 
 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. 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. 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/solana_economic_design.png" alt="== Solana Economic Design Diagram ==" width="800"/></p>

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 --network testnet.solana.com:8001 --duration 60
+$ ./multinode-demo/client.sh --network $(dig +short 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)

book/src/implemented-proposals.md

@@ -1,3 +0,0 @@
-# Implemented Design Proposals
-
-The following design proposals are fully implemented.

book/src/installer.md

@@ -1,213 +0,0 @@
-## Cluster Software Installation and Updates
-Currently users are required to build the solana cluster software themselves
-from the git repository and manually update it, which is error prone and
-inconvenient.
-
-This document proposes an easy to use software install and updater that can be
-used to deploy pre-built binaries for supported platforms.  Users may elect to
-use binaries supplied by Solana or any other party they trust.  Deployment of
-updates is managed using an on-chain update manifest program.
-
-### Motivating Examples
-#### 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.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` 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-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
-With a well-known release URL, a pre-built binary can be obtained for supported
-platforms:
-
-```bash
-$ 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
-If a pre-built binary is not available for a given platform, building the
-installer from source is always an option:
-```bash
-$ git clone https://github.com/solana-labs/solana.git
-$ cd solana/install
-$ cargo run -- --help
-```
-
-#### Deploy a new update to a cluster
-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 -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
-```
-
-#### Run a validator node that auto updates itself
-```bash
-$ solana-install init --pubkey 92DMonmBYXwEMHJ99c9ceRSpAmk9v6i3RdvDdXaVcrfj  # <-- pubkey is obtained from whoever is deploying the updates
-$ export PATH=~/.local/share/solana-install/bin:$PATH
-$ solana-keygen ...  # <-- runs the latest solana-keygen
-$ solana-install run solana-fullnode ...  # <-- runs a fullnode, restarting it as necesary when an update is applied
-```
-
-### On-chain Update Manifest
-An update manifest is used to advertise the deployment of new release tarballs
-on a solana cluster.  The update manifest is stored using the `config` program,
-and each update manifest account describes a logical update channel for a given
-target triple (eg, `x86_64-apple-darwin`).  The account public key is well-known
-between the entity deploying new updates and users consuming those updates.
-
-The update tarball itself is hosted elsewhere, off-chain and can be fetched from
-the specified `download_url`.
-
-```rust,ignore
-use solana_sdk::signature::Signature;
-
-/// Information required to download and apply a given update
-pub struct UpdateManifest {
-    pub timestamp_secs: u64, // When the release was deployed in seconds since UNIX EPOCH
-    pub download_url: String, // Download URL to the release tar.bz2
-    pub download_sha256: String, // SHA256 digest of the release tar.bz2 file
-}
-
-/// Userdata of an Update Manifest program Account.
-#[derive(Serialize, Deserialize, Default, Debug, PartialEq)]
-pub struct SignedUpdateManifest {
-    pub manifest: UpdateManifest,
-    pub manifest_signature: Signature,
-}
-
-```
-
-Note that the `manifest` field itself contains a corresponding signature
-(`manifest_signature`) to guard against man-in-the-middle attacks between the
-`solana-install` tool and the solana cluster RPC API.
-
-To guard against rollback attacks, `solana-install` will refuse to install an
-update with an older `timestamp_secs` than what is currently installed.
-
-### Release Archive Contents
-A release archive is expected to be a tar file compressed with
-bzip2 with the following internal structure:
-
-* `/version.yml` - a simple YAML file containing the field `"target"` - the
-  target tuple.  Any additional fields are ignored.
-* `/bin/` -- directory containing available programs in the release.
-  `solana-install` will symlink this directory to
-  `~/.local/share/solana-install/bin` for use by the `PATH` environment
-  variable.
-* `...` -- any additional files and directories are permitted
-
-### solana-install Tool
-The `solana-install` tool is used by the user to install and update their cluster software.
-
-It manages the following files and directories in the user's home directory:
-* `~/.config/solana/install/config.yml` - user configuration and information about currently installed software version
-* `~/.local/share/solana/install/bin` - a symlink to the current release. eg, `~/.local/share/solana-update/<update-pubkey>-<manifest_signature>/bin`
-* `~/.local/share/solana/install/releases/<download_sha256>/` - contents of a release
-
-#### Command-line Interface
-```manpage
-solana-install 0.13.0
-The solana cluster software installer
-
-USAGE:
-    solana-install [OPTIONS] <SUBCOMMAND>
-
-FLAGS:
-    -h, --help       Prints help information
-    -V, --version    Prints version information
-
-OPTIONS:
-    -c, --config <PATH>    Configuration file to use [default: /Users/mvines/Library/Preferences/solana/install.yml]
-
-SUBCOMMANDS:
-    deploy    deploys a new update
-    help      Prints this message or the help of the given subcommand(s)
-    info      displays information about the current installation
-    init      initializes a new installation
-    run       Runs a program while periodically checking and applying software updates
-    update    checks for an update, and if available downloads and applies it
-```
-
-```manpage
-solana-install-init
-initializes a new installation
-
-USAGE:
-    solana-install init [OPTIONS]
-
-FLAGS:
-    -h, --help    Prints help information
-
-OPTIONS:
-    -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]
-```
-
-```manpage
-solana-install-info
-displays information about the current installation
-
-USAGE:
-    solana-install info [FLAGS]
-
-FLAGS:
-    -h, --help     Prints help information
-    -l, --local    only display local information, don't check the cluster for new updates
-```
-
-```manpage
-solana-install-deploy
-deploys a new update
-
-USAGE:
-    solana-install deploy <download_url> <update_manifest_keypair>
-
-FLAGS:
-    -h, --help    Prints help information
-
-ARGS:
-    <download_url>               URL to the solana release archive
-    <update_manifest_keypair>    Keypair file for the update manifest (/path/to/keypair.json)
-```
-
-```manpage
-solana-install-update
-checks for an update, and if available downloads and applies it
-
-USAGE:
-    solana-install update
-
-FLAGS:
-    -h, --help    Prints help information
-```
-
-```manpage
-solana-install-run
-Runs a program while periodically checking and applying software updates
-
-USAGE:
-    solana-install run <program_name> [program_arguments]...
-
-FLAGS:
-    -h, --help    Prints help information
-
-ARGS:
-    <program_name>            program to run
-    <program_arguments>...    arguments to supply to the program
-
-The program will be restarted upon a successful software update
-```

book/src/jsonrpc-api.md

@@ -24,11 +24,8 @@ Methods
 * [confirmTransaction](#confirmtransaction)
 * [getAccountInfo](#getaccountinfo)
 * [getBalance](#getbalance)
-* [getClusterNodes](#getclusternodes)
 * [getRecentBlockhash](#getrecentblockhash)
 * [getSignatureStatus](#getsignaturestatus)
-* [getSlotLeader](#getslotleader)
-* [getNumBlocksSinceSignatureConfirmation](#getnumblockssincesignatureconfirmation)
 * [getTransactionCount](#gettransactioncount)
 * [requestAirdrop](#requestairdrop)
 * [sendTransaction](#sendtransaction)
@@ -116,30 +113,6 @@ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "
 
 ---
 
-### getClusterNodes
-Returns information about all the nodes participating in the cluster
-
-##### Parameters:
-None
-
-##### Results:
-The result field will be an array of JSON objects, each with the following sub fields:
-* `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
-
-##### Example:
-```bash
-// Request
-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","id":"9QzsJf7LPLj8GkXbYT3LFDKqsj2hHG7TA3xinJHu8epQ","rpc":"10.239.6.48:8899","tpu":"10.239.6.48:8856"}],"id":1}
-```
-
----
-
 ### getAccountInfo
 Returns all information associated with the account of provided Pubkey
 
@@ -195,10 +168,12 @@ events.
 * `string` - Signature of Transaction to confirm, as base-58 encoded string
 
 ##### Results:
-* `null` - Unknown transaction
-* `object` - Transaction status:
-    * `"Ok": null` - Transaction was successful
-    * `"Err": <ERR>` - Transaction failed with TransactionError <ERR> [TransactionError definitions](https://github.com/solana-labs/solana/blob/master/sdk/src/transaction.rs#L14)
+* `string` - Transaction status:
+    * `Confirmed` - Transaction was successful
+    * `SignatureNotFound` - Unknown transaction
+    * `ProgramRuntimeError` - An error occurred in the program that processed this Transaction
+    * `AccountInUse` - Another Transaction had a write lock one of the Accounts specified in this Transaction.  The Transaction may succeed if retried
+    * `GenericFailure` - Some other error occurred.  **Note**: In the future new Transaction statuses may be added to this list.  It's safe to assume that all new statuses will be more specific error conditions that previously presented as `GenericFailure`
 
 ##### Example:
 ```bash
@@ -209,48 +184,7 @@ curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "
 {"jsonrpc":"2.0","result":"SignatureNotFound","id":1}
 ```
 
------
-
-### getSlotLeader
-Returns the current slot leader
-
-##### Parameters:
-None
-
-##### Results:
-* `string` - Node Id as base-58 encoded string
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getSlotLeader"}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":"ENvAW7JScgYq6o4zKZwewtkzzJgDzuJAFxYasvmEQdpS","id":1}
-```
-
------
-
-### getNumBlocksSinceSignatureConfirmation
-Returns the current number of blocks since signature has been confirmed.
-
-##### Parameters:
-* `string` - Signature of Transaction to confirm, as base-58 encoded string
-
-##### Results:
-* `integer` - count, as unsigned 64-bit integer
-
-##### Example:
-```bash
-// Request
-curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getNumBlocksSinceSignatureConfirmation", "params":["5VERv8NMvzbJMEkV8xnrLkEaWRtSz9CosKDYjCJjBRnbJLgp8uirBgmQpjKhoR4tjF3ZpRzrFmBV6UjKdiSZkQUW"]}' http://localhost:8899
-
-// Result
-{"jsonrpc":"2.0","result":8,"id":1}
-```
-
 ---
-
 ### getTransactionCount
 Returns the current Transaction count from the ledger
 

book/src/passive-stake-delegation-and-rewards.md

@@ -1,212 +0,0 @@
-# Stake Delegation and Reward
-
-This design proposal focuses on the software architecture for the on-chain
-voting and staking programs.  Incentives for staking is covered in [staking
-rewards](staking-rewards.md).
-
-The current architecture requires a vote for each delegated stake from the
-validator, and therefore does not scale to allow replicator clients to
-automatically delegate their rewards.
-
-The design proposes a new set of programs for voting and stake delegation, The
-proposed programs allow many stake accounts to passively earn rewards with a
-single validator vote without permission or active involvement from the
-validator.
-
-## Current Design Problems
-
-In the current design each staker creates their own VoteState, and assigns a
-**delegate** in the VoteState that can submit votes.  Since the validator has to
-actively vote for each stake delegated to it, validators can censor stakes by
-not voting for them.
-
-The number of votes is equal to the number of stakers, and not the number of
-validators.  Replicator clients are expected to delegate their replication
-rewards as they are earned, and therefore the number of stakes is expected to be
-large compared to the number of validators in a long running cluster.
-
-## Proposed changes to the current design.
-
-The general idea is that instead of the staker, the validator will own the
-VoteState program. In this proposal the VoteState program is there to track
-validator votes, count validator generated credits and to provide any
-additional validator specific state.  The VoteState program is not aware of any
-stakes delegated to it, and has no staking weight.
-
-The rewards generated are proportional to the amount of lamports staked.  In
-this proposal stake state is stored as part of the StakeState program. This
-program is owned by the staker only.  Lamports stored in this program are the
-stake.  Unlike the current design, this program contains a new field to indicate
-which VoteState program the stake is delegated to.
-
-### VoteState
-
-VoteState is the current state of all the votes the **delegate** has submitted
-to the bank.  VoteState contains the following state information:
-
-* votes - The submitted votes data structure.
-
-* 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
-rewards.
-
-* commission - The commission taken by this VoteState for any rewards claimed by
-staker's StakeState accounts.  This is the percentage ceiling of the reward.
-
-* Account::lamports - The accumulated lamports from the commission.  These do not
-count as stakes.
-
-* `authorized_vote_signer` - Only this identity is authorized to submit votes, and
-this field can only modified by this entity
-
-### VoteInstruction::Initialize
-
-* `account[0]` - RW - The VoteState
-  `VoteState::authorized_vote_signer` is initialized to `account[0]`
-   other VoteState members defaulted
-
-### VoteInstruction::AuthorizeVoteSigner(Pubkey)
-
-* `account[0]` - RW - The VoteState
-  `VoteState::authorized_vote_signer` is set to to `Pubkey`, instruction must by
-   signed by Pubkey
-
-
-### StakeState
-
-A StakeState takes one of two forms, StakeState::Delegate and StakeState::MiningPool.
-
-### StakeState::Delegate
-
-StakeState is the current delegation preference of the **staker**. StakeState
-contains the following state information:
-
-* Account::lamports - The staked lamports.
-
-* `voter_id` - The pubkey of the VoteState instance the lamports are
-delegated to.
-
-* `credits_observed` - The total credits claimed over the lifetime of the
-program.
-
-### StakeState::MiningPool
-
-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 a
-StakeState::MiningPool as the cluster wide mining pools.
-
-* 256 StakeState::MiningPool are initialized, each with 1/256 number of mining pool
-tokens stored as `Account::lamports`.
-
-The stakes and the MiningPool are accounts that are owned by the same `Stake`
-program.
-
-### StakeInstruction::Initialize
-
-* `account[0]` - RW - The StakeState::Delegate instance.
-  `StakeState::Delegate::credits_observed` is initialized to `VoteState::credits`.
-  `StakeState::Delegate::voter_id` is initialized to `account[1]`
-
-* `account[1]` - R - The VoteState instance.
-
-### StakeInstruction::RedeemVoteCredits
-
-The VoteState program and the StakeState programs maintain a lifetime counter
-of total rewards generated and claimed.  Therefore an explicit `Clear`
-instruction is not necessary.  When claiming rewards, the total lamports
-deposited into the StakeState and as validator commission is proportional to
-`VoteState::credits - StakeState::credits_observed`.
-
-
-* `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_id`
-
-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::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
-instruction to claim the reward.
-
-Any random MiningPool can be used to redeem the credits.
-
-```rust,ignore
-let credits_to_claim = vote_state.credits - stake_state.credits_observed;
-stake_state.credits_observed = vote_state.credits;
-```
-
-`credits_to_claim` is used to compute the reward and commission, and
-`StakeState::Delegate::credits_observed` is updated to the latest
-`VoteState::credits` value.
-
-### Collecting network fees into the MiningPool
-
-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.
-
-* 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.
-
-### Benefits
-
-* Single vote for all the stakers.
-
-* Clearing of the credit variable is not necessary for claiming rewards.
-
-* Each delegated stake can claim its rewards independently.
-
-* 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.
-
-## Passive Delegation
-
-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::Delegate::voter_id`.
-
-## Example Callflow
-
-<img alt="Passive Staking Callflow" src="img/passive-staking-callflow.svg" class="center"/>
-
-## Future work
-
-Validators may want to split the stake delegated to them amongst many validator
-nodes since stake is used as weight in the network control and data planes.  One
-way to implement this would be for the StakeState to delegate to a pool of
-validators instead of a single one.
-
-Instead of a single `vote_id` and `credits_observed` entry in the StakeState
-program, the program can be initialized with a vector of tuples.
-
-```rust,ignore
-Voter {
-    voter_id: Pubkey,
-    credits_observed: u64,
-    weight: u8,
-}
-```
-
-* voters: Vec<Voter> - Array of VoteState accounts that are voting rewards with
-this stake.
-
-A StakeState program would claim a fraction of the reward from each voter in
-the `voters` array, and each voter would be delegated a fraction of the stake.

book/src/performance-metrics.md

@@ -1,29 +0,0 @@
-# Performance Metrics
-
-Solana cluster performance is measured as average number of transactions per second
-that the network can sustain (TPS). And, how long it takes for a transaction to be
-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. 
-
-## TPS
-
-The leader node's banking stage maintains a count of transactions that it processed.
-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
-
-Each validator node maintains a list of active ledger forks that are visible to the node.
-A fork is considered to be frozen when the node has received and processed all entries
-corresponding to the fork. A fork is considered to be confirmed when it receives cumulative
-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. 

book/src/programs.md

@@ -3,8 +3,8 @@
 A client *app* interacts with a Solana cluster by sending it *transactions*
 with one or more *instructions*. The Solana *runtime* passes those instructions
 to user-contributed *programs*. An instruction might, for example, tell a
-program to transfer *lamports* from one *account* to another or create an interactive
-contract that governs how lamports are transfered. Instructions are executed
+program to move *lamports* from one *account* to another or create an interactive
+contract that governs how lamports are moved. Instructions are executed
 atomically. If any instruction is invalid, any changes made within the
 transaction are discarded.
 

book/src/runtime.md

@@ -67,7 +67,7 @@ data array and assign it to a Program.
 
 * `Assign` - Allows the user to assign an existing account to a program.
 
-* `Transfer`  - Transfers lamports between accounts.
+* `Move`  - Moves lamports between accounts.
 
 ## Program State Security
 

book/src/testing-programs.md

@@ -25,7 +25,7 @@ When Futures 0.3.0 is released, the Transact trait may look like this:
 
 ```rust,ignore
 trait Transact {
-    async fn send_transactions(txs: &[Transaction]) -> Vec<Result<(), TransactionError>>;
+    async fn send_transactions(txs: &[Transaction]) -> Vec<Result<(), BankError>>;
 }
 ```
 

book/src/testnet-participation.md

@@ -1,189 +0,0 @@
-## Testnet Participation
-This document describes how to participate in the testnet as a
-validator node.
-
-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.
-
-Also we'd love it if you choose to register your validator node with us at
-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.
-
-#### 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.14.1  # skip this line to install the latest release
-$ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v0.14.1/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 -n testnet.solana.com airdrop 123
-$ solana-wallet -n testnet.solana.com balance
-```
-
-Also try running following command to join the gossip network and view all the other nodes in the cluster:
-```bash
-$ solana-gossip --network testnet.solana.com:8001 spy
-# Press ^C to exit
-```
-
-Now configure a key pair for your validator by running:
-```bash
-$ solana-keygen -o fullnode-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-fullnode-config.sh
-$ fullnode.sh --identity fullnode-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-fullnode-config.sh
-$ solana-install run fullnode.sh -- --identity fullnode-keypair.json --poll-for-new-genesis-block testnet.solana.com
-```
-
-If you built from source:
-```bash
-$ USE_INSTALL=1 ./multinode-demo/clear-fullnode-config.sh
-$ USE_INSTALL=1 ./multinode-demo/fullnode.sh --identity fullnode-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, `fullnode.sh --dynamic-port-range 11000-11010 ...` will restrict the
-validator to ports 11000-11011.
-
-### Validator Monitoring
-When `fullnode.sh` starts, it will output a fullnode configuration that looks
-similar to:
-```bash
-======================[ Fullnode configuration ]======================
-node pubkey: 4ceWXsL3UJvn7NYZiRkw7NsryMpviaKBDYr8GK7J61Dm
-vote pubkey: 2ozWvfaXQd1X6uKh8jERoRGApDqSqcEy6fF1oN13LL2G
-ledger: ...
-accounts: ...
-======================================================================
-```
-
-The **node pubkey** for your validator can also be found by running:
-```bash
-$ solana-keygen pubkey fullnode-keypair.json
-```
-
-From another console, confirm the IP address of your validator is visible in the
-gossip network by running:
-```bash
-$ solana-gossip --network 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 -n testnet.solana.com 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/fullnode-vote-keypair.json
-# Otherwise run:
-$ solana-keygen pubkey ./config-local/fullnode-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 node 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
-```

book/src/transaction-fees.md

@@ -1,59 +0,0 @@
-# Deterministic Transaction Fees
-
-Transactions currently include a fee field that indicates the maximum fee field
-a slot leader is permitted to charge to process a transaction. The cluster, on
-the other hand, agrees on a minimum fee. If the network is congested, the slot
-leader may prioritize the transactions offering higher fees. That means the
-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 the ledger data in the previous epoch.
-
-### Calculating fees
-
-The client uses the JSON RPC API to query the cluster for the current fee
-parameters.  Those parameters are tagged with a blockhash and remain valid
-until that blockhash is old enough to be rejected by the slot leader.
-
-Before sending a transaction to the cluster, a client may submit the
-transaction and fee account data to an SDK module called the *fee calculator*.
-So long as the client's SDK version matches the slot leader's version, the
-client is assured that its account will be changed exactly the same number of
-lamports as returned by the fee calculator.
-
-### Fee Parameters
-
-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. 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:
-
-* `lamports_per_pubkey` - cost to load an account
-* `lamports_per_slot_distance` - higher cost to load very old accounts
-* `lamports_per_byte` - cost per size of account loaded
-* `lamports_per_bpf_instruction` - cost to run a program
-
-### Attacks
-
-#### Hijacking the SPS Target
-
-A group of validators can centralize the cluster if they can convince it to
-raise the SPS Target above a point where the rest of the validators can keep
-up. Raising the target will cause fees to drop, presumably creating more demand
-and therefore higher TPS. If the validator doesn't have hardware that can
-process that many transactions that fast, its confirmation votes will
-eventually get so long that the cluster will be forced to boot it.

book/src/wallet.md

@@ -41,7 +41,7 @@ $ solana-wallet balance
 $ solana-wallet confirm <TX_SIGNATURE>
 
 // Return
-"Confirmed" / "Not found" / "Transaction failed with error <ERR>"
+"Confirmed" / "Not found"
 ```
 
 #### Deploy program
@@ -352,3 +352,4 @@ ARGS:
     <PUBKEY>        The pubkey of recipient
     <PROCESS_ID>    The process id of the transfer to unlock
 ```
+

ci/buildkite.yml

@@ -9,7 +9,6 @@ steps:
   - command: "ci/test-stable-perf.sh"
     name: "stable-perf"
     timeout_in_minutes: 20
-    artifact_paths: "log-*.txt"
     agents:
       - "queue=cuda"
   - command: "ci/test-bench.sh"
@@ -17,8 +16,7 @@ steps:
     timeout_in_minutes: 20
   - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-stable.sh"
     name: "stable"
-    timeout_in_minutes: 30
-    artifact_paths: "log-*.txt"
+    timeout_in_minutes: 20
   - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-coverage.sh"
     name: "coverage"
     timeout_in_minutes: 20

ci/crate-version.sh

@@ -1,26 +1,17 @@
 #!/usr/bin/env bash
 #
-# Outputs the current crate version from a given Cargo.toml
+# Outputs the current crate version
 #
 set -e
 
-Cargo_toml=$1
-[[ -n $Cargo_toml ]] || {
-  echo "Usage: $0 path/to/Cargo.toml"
-  exit 0
-}
-
-[[ -r $Cargo_toml ]] || {
-  echo "Error: unable to read $Cargo_toml"
-  exit 1
-}
+cd "$(dirname "$0")"/..
 
 while read -r name equals value _; do
   if [[ $name = version && $equals = = ]]; then
     echo "${value//\"/}"
     exit 0
   fi
-done < <(cat "$Cargo_toml")
+done < <(cat Cargo.toml)
 
 echo Unable to locate version in Cargo.toml 1>&2
 exit 1

ci/docker-rust/Dockerfile

@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/buildkite.yml to pick up the new image tag
-FROM rust:1.34.0
+FROM rust:1.32.0
 
 RUN set -x \
  && apt update \
@@ -17,7 +17,6 @@ RUN set -x \
       lcov \
       libclang-common-7-dev \
       llvm-7 \
-      mscgen \
       rsync \
       sudo \
       \

ci/docker-rust/build.sh

@@ -8,4 +8,5 @@ docker build -t solanalabs/rust .
 read -r rustc version _ < <(docker run solanalabs/rust rustc --version)
 [[ $rustc = rustc ]]
 docker tag solanalabs/rust:latest solanalabs/rust:"$version"
-docker push solanalabs/rust:"$version"
+
+docker push solanalabs/rust

ci/iterations-localnet.sh

@@ -52,6 +52,15 @@ runTest() {
 
 build
 
+runTest "Leader rotation off" \
+  "ci/localnet-sanity.sh -i 128 -b"
+
+runTest "Leader rotation off, restart" \
+  "ci/localnet-sanity.sh -i 128 -k 16 -b"
+
+runTest "Leader rotation off, incremental restart, extra node" \
+  "ci/localnet-sanity.sh -i 128 -k 16 -R -x -b"
+
 runTest "Leader rotation on" \
   "ci/localnet-sanity.sh -i 128"
 

ci/localnet-sanity.sh

@@ -55,7 +55,7 @@ while getopts "ch?i:k:brxR" opt; do
     restartInterval=$OPTARG
     ;;
   b)
-    maybeNoLeaderRotation="--stake 0"
+    maybeNoLeaderRotation="--only-bootstrap-stake"
     ;;
   x)
     extraNodes=$((extraNodes + 1))
@@ -78,6 +78,7 @@ source scripts/configure-metrics.sh
 nodes=(
   "multinode-demo/drone.sh"
   "multinode-demo/bootstrap-leader.sh \
+    $maybeNoLeaderRotation \
     --enable-rpc-exit \
     --init-complete-file init-complete-node1.log"
   "multinode-demo/fullnode.sh \
@@ -90,7 +91,7 @@ nodes=(
 for i in $(seq 1 $extraNodes); do
   nodes+=(
     "multinode-demo/fullnode.sh \
-      --label dyn$i \
+      -X dyn$i \
       --init-complete-file init-complete-node$((2 + i)).log \
       $maybeNoLeaderRotation"
   )
@@ -306,7 +307,11 @@ while [[ $iteration -le $iterations ]]; do
     set -x
     client_id=/tmp/client-id.json-$$
     $solana_keygen -o $client_id || exit $?
-    $solana_gossip spy --num-nodes-exactly $numNodes || exit $?
+    $solana_bench_tps \
+      --identity $client_id \
+      --num-nodes $numNodes \
+      --reject-extra-nodes \
+      --converge-only || exit $?
     rm -rf $client_id
   ) || flag_error
 

ci/nits.sh

@@ -18,14 +18,14 @@ declare prints=(
 # Parts of the tree that are expected to be print free
 declare print_free_tree=(
   'core/src'
-  'drone/src'
-  'metrics/src'
-  'netutil/src'
-  'runtime/src'
-  'sdk/src'
+  'drone'
+  'metrics'
+  'netutil'
+  'runtime'
+  'sdk'
 )
 
-if _ git grep --max-depth=0 "${prints[@]/#/-e }" -- "${print_free_tree[@]}"; then
+if _ git grep "${prints[@]/#/-e }" -- "${print_free_tree[@]}"; then
     exit 1
 fi
 

ci/publish-bpf-sdk.sh

@@ -2,7 +2,15 @@
 set -e
 
 cd "$(dirname "$0")/.."
+
 eval "$(ci/channel-info.sh)"
+if [[ $BUILDKITE_BRANCH = "$STABLE_CHANNEL" ]]; then
+  CHANNEL=stable
+elif [[ $BUILDKITE_BRANCH = "$EDGE_CHANNEL" ]]; then
+  CHANNEL=edge
+elif [[ $BUILDKITE_BRANCH = "$BETA_CHANNEL" ]]; then
+  CHANNEL=beta
+fi
 
 echo --- Creating tarball
 (

ci/publish-crate.sh

@@ -11,7 +11,6 @@ source ci/semver_bash/semver.sh
 # here. (TODO: figure the crate ordering dynamically)
 #
 CRATES=(
-  kvstore
   logger
   netutil
   sdk
@@ -19,20 +18,18 @@ CRATES=(
   metrics
   client
   drone
-  programs/{budget_api,config_api,stake_api,storage_api,token_api,vote_api,exchange_api}
-  programs/{vote_program,budget_program,bpf_loader,config_program,exchange_program,failure_program}
-  programs/{noop_program,stake_program,storage_program,token_program}
+  programs/{budget_api,storage_api,token_api,vote_api}
   runtime
+  programs/{budget,bpf_loader,storage,token,vote}
   vote-signer
   core
   fullnode
   genesis
-  gossip
   ledger-tool
   wallet
-  install
 )
 
+
 # Only package/publish if this is a tagged release
 [[ -n $TRIGGERED_BUILDKITE_TAG ]] || {
   echo TRIGGERED_BUILDKITE_TAG unset, skipped
@@ -55,7 +52,7 @@ for crate in "${CRATES[@]}"; do
     exit 1
   fi
   echo "-- $crate"
-  grep -q "^version = \"$expectedCrateVersion\"$" "$crate"/Cargo.toml || {
+  grep -q "^version = \"$expectedCrateVersion\"$" Cargo.toml || {
     echo "Error: $crate/Cargo.toml version is not $expectedCrateVersion"
     exit 1
   }

ci/publish-tarball.sh

@@ -66,30 +66,7 @@ echo --- Creating tarball
   cp solana-release-cuda/bin/solana-fullnode solana-release/bin/solana-fullnode-cuda
   cp -a scripts multinode-demo solana-release/
 
-  # Add a wrapper script for fullnode.sh
-  # TODO: Remove multinode/... from tarball
-  cat > solana-release/bin/fullnode.sh <<'EOF'
-#!/usr/bin/env bash
-set -e
-cd "$(dirname "$0")"/..
-export USE_INSTALL=1
-exec multinode-demo/fullnode.sh "$@"
-EOF
-  chmod +x solana-release/bin/fullnode.sh
-
-  # Add a wrapper script for clear-fullnode-config.sh
-  # TODO: Remove multinode/... from tarball
-  cat > solana-release/bin/clear-fullnode-config.sh <<'EOF'
-#!/usr/bin/env bash
-set -e
-cd "$(dirname "$0")"/..
-export USE_INSTALL=1
-exec multinode-demo/clear-fullnode-config.sh "$@"
-EOF
-  chmod +x solana-release/bin/clear-fullnode-config.sh
-
   tar jvcf solana-release-$TARGET.tar.bz2 solana-release/
-  cp solana-release/bin/solana-install solana-install-$TARGET
 )
 
 echo --- Saving build artifacts
@@ -101,25 +78,24 @@ if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
   exit 0
 fi
 
-for file in solana-release-$TARGET.tar.bz2 solana-install-$TARGET; do
-  echo --- AWS S3 Store: $file
-  (
-    set -x
-    $DRYRUN docker run \
-      --rm \
-      --env AWS_ACCESS_KEY_ID \
-      --env AWS_SECRET_ACCESS_KEY \
-      --volume "$PWD:/solana" \
-      eremite/aws-cli:2018.12.18 \
-      /usr/bin/s3cmd --acl-public put /solana/"$file" s3://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
+file=solana-release-$TARGET.tar.bz2
+echo --- AWS S3 Store: $file
+(
+  set -x
+  $DRYRUN docker run \
+    --rm \
+    --env AWS_ACCESS_KEY_ID \
+    --env AWS_SECRET_ACCESS_KEY \
+    --volume "$PWD:/solana" \
+    eremite/aws-cli:2018.12.18 \
+    /usr/bin/s3cmd --acl-public put /solana/"$file" s3://solana-release/"$CHANNEL_OR_TAG"/"$file"
 
-    echo Published to:
-    $DRYRUN ci/format-url.sh http://release.solana.com/"$CHANNEL_OR_TAG"/"$file"
-  )
+  echo Published to:
+  $DRYRUN ci/format-url.sh http://solana-release.s3.amazonaws.com/"$CHANNEL_OR_TAG"/"$file"
+)
 
-  if [[ -n $TAG ]]; then
-    ci/upload-github-release-asset.sh $file
-  fi
-done
+if [[ -n $TAG ]]; then
+  ci/upload-github-release-asset.sh $file
+fi
 
 echo --- ok

ci/run-local.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+#
+# Run the entire buildkite CI pipeline locally for pre-testing before sending a
+# Github pull request
+#
+set -e
+
+cd "$(dirname "$0")/.."
+BKRUN=ci/node_modules/.bin/bkrun
+
+if [[ ! -x $BKRUN ]]; then
+  (
+    set -x
+    cd ci/
+    npm install bkrun
+  )
+fi
+
+set -x
+exec ./ci/node_modules/.bin/bkrun ci/buildkite.yml

ci/rust-version.sh

@@ -13,8 +13,8 @@
 #   $ source ci/rust-version.sh
 #
 
-export rust_stable=1.34.0
-export rust_stable_docker_image=solanalabs/rust:1.34.0
+export rust_stable=1.32.0
+export rust_stable_docker_image=solanalabs/rust:1.32.0
 
 export rust_nightly=nightly-2019-03-14
 export rust_nightly_docker_image=solanalabs/rust-nightly:2019-03-14

ci/test-bench.sh

@@ -39,28 +39,17 @@ fi
 
 BENCH_FILE=bench_output.log
 BENCH_ARTIFACT=current_bench_results.log
-
-# First remove "BENCH_FILE", if it exists so that the following commands can append
-rm -f "$BENCH_FILE"
-
-# Run sdk benches
-_ cargo +$rust_nightly bench --manifest-path sdk/Cargo.toml ${V:+--verbose} \
-  -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
-
-# Run runtime benches
-_ cargo +$rust_nightly bench --manifest-path runtime/Cargo.toml ${V:+--verbose} \
-  -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
-
-# Run core benches
-_ cargo +$rust_nightly bench --manifest-path core/Cargo.toml ${V:+--verbose} \
-  -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
+_ cargo +$rust_nightly bench ${V:+--verbose} \
+  -- -Z unstable-options --format=json | tee "$BENCH_FILE"
 
 # Run bpf benches
-_ cargo +$rust_nightly bench --manifest-path programs/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
-  -- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE"
-
-# TODO: debug why solana-upload-perf takes over 30 minutes to complete.
-exit 0
+echo --- program/bpf
+(
+  set -x
+  cd programs/bpf
+  cargo +$rust_nightly bench ${V:+--verbose} --features=bpf_c \
+    -- -Z unstable-options --format=json --nocapture | tee -a ../../../"$BENCH_FILE"
+)
 
 _ cargo +$rust_nightly run --release --package solana-upload-perf \
   -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT"

ci/test-stable.sh

@@ -27,6 +27,7 @@ test-stable)
 
   _ cargo +"$rust_stable" build --all ${V:+--verbose}
   _ cargo +"$rust_stable" test --all ${V:+--verbose} -- --nocapture --test-threads=1
+  _ cargo +"$rust_stable" test --manifest-path runtime/Cargo.toml
   ;;
 test-stable-perf)
   echo "Executing $testName"
@@ -41,7 +42,7 @@ test-stable-perf)
     ^sdk/ \
   || {
     annotate --style info \
-      "Skipped test-stable-perf as no relevant files were modified"
+      "Skipped test-stable-perf as no relavant files were modified"
     exit 0
   }
 
@@ -70,7 +71,19 @@ test-stable-perf)
 
   # Run root package library tests
   _ cargo +"$rust_stable" build --all ${V:+--verbose} --features="$ROOT_FEATURES"
-  _ cargo +"$rust_stable" test --manifest-path=core/Cargo.toml ${V:+--verbose} --features="$ROOT_FEATURES" -- --nocapture --test-threads=1
+  _ cargo +"$rust_stable" test --all --lib ${V:+--verbose} --features="$ROOT_FEATURES" -- --nocapture --test-threads=1
+  _ cargo +"$rust_stable" test --manifest-path runtime/Cargo.toml
+
+  # Run root package integration tests
+  for test in tests/*.rs; do
+    test=${test##*/} # basename x
+    test=${test%.rs} # basename x .rs
+    (
+      export RUST_LOG="$test"=trace,$RUST_LOG
+      _ cargo +"$rust_stable" test --all ${V:+--verbose} --features="$ROOT_FEATURES" --test="$test" \
+        -- --test-threads=1 --nocapture
+    )
+  done
   ;;
 *)
   echo "Error: Unknown test: $testName"

ci/testnet-automation.sh

@@ -14,25 +14,21 @@ source ci/upload-ci-artifact.sh
 [[ -n $ITERATION_WAIT ]] || ITERATION_WAIT=300
 [[ -n $NUMBER_OF_NODES ]] || NUMBER_OF_NODES="10 25 50 100"
 [[ -n $LEADER_CPU_MACHINE_TYPE ]] ||
-  LEADER_CPU_MACHINE_TYPE="--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
+  LEADER_CPU_MACHINE_TYPE="n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100"
 [[ -n $CLIENT_COUNT ]] || CLIENT_COUNT=2
 [[ -n $TESTNET_TAG ]] || TESTNET_TAG=testnet-automation
-[[ -n $TESTNET_ZONES ]] || TESTNET_ZONES="us-west1-b"
+[[ -n $TESTNET_ZONE ]] || TESTNET_ZONE=us-west1-b
 [[ -n $CHANNEL ]] || CHANNEL=beta
-[[ -n $ADDITIONAL_FLAGS ]] || ADDITIONAL_FLAGS=""
-
-TESTNET_CLOUD_ZONES=(); while read -r -d, ; do TESTNET_CLOUD_ZONES+=( "$REPLY" ); done <<< "${TESTNET_ZONES},"
 
 launchTestnet() {
   declare nodeCount=$1
   echo --- setup "$nodeCount" node test
-
-  # shellcheck disable=SC2068
   net/gce.sh create \
+    -b \
     -d pd-ssd \
     -n "$nodeCount" -c "$CLIENT_COUNT" \
     -G "$LEADER_CPU_MACHINE_TYPE" \
-    -p "$TESTNET_TAG" ${TESTNET_CLOUD_ZONES[@]/#/-z } "$ADDITIONAL_FLAGS"
+    -p "$TESTNET_TAG" -z "$TESTNET_ZONE"
 
   echo --- configure database
   net/init-metrics.sh -e
@@ -47,8 +43,6 @@ launchTestnet() {
   echo --- wait "$ITERATION_WAIT" seconds to complete test
   sleep "$ITERATION_WAIT"
 
-  set -x
-
   declare q_mean_tps='
     SELECT round(mean("sum_count")) AS "mean_tps" FROM (
       SELECT sum("count") AS "sum_count"
@@ -65,21 +59,21 @@ launchTestnet() {
 
   declare q_mean_confirmation='
     SELECT round(mean("duration_ms")) as "mean_confirmation"
-      FROM "testnet-automation"."autogen"."validator-confirmation"
+      FROM "testnet-automation"."autogen"."leader-confirmation"
       WHERE time > now() - 300s'
 
   declare q_max_confirmation='
     SELECT round(max("duration_ms")) as "max_confirmation"
-      FROM "testnet-automation"."autogen"."validator-confirmation"
+      FROM "testnet-automation"."autogen"."leader-confirmation"
       WHERE time > now() - 300s'
 
   declare q_99th_confirmation='
     SELECT round(percentile("duration_ms", 99)) as "99th_confirmation"
-      FROM "testnet-automation"."autogen"."validator-confirmation"
+      FROM "testnet-automation"."autogen"."leader-confirmation"
       WHERE time > now() - 300s'
 
-  curl -G "${INFLUX_HOST}/query?u=ro&p=topsecret" \
-    --data-urlencode "db=testnet-automation" \
+  curl -G "https://metrics.solana.com:8086/query?u=${INFLUX_USERNAME}&p=${INFLUX_PASSWORD}" \
+    --data-urlencode "db=$INFLUX_DATABASE" \
     --data-urlencode "q=$q_mean_tps;$q_max_tps;$q_mean_confirmation;$q_max_confirmation;$q_99th_confirmation" |
     python ci/testnet-automation-json-parser.py >>TPS"$nodeCount".log
 

ci/testnet-deploy.sh

@@ -10,20 +10,13 @@ bootstrapFullNodeMachineType=
 clientNodeCount=0
 additionalFullNodeCount=10
 publicNetwork=false
-stopNetwork=false
-reuseLedger=false
-skipCreate=false
-skipStart=false
-externalNode=false
-failOnValidatorBootupFailure=true
+skipSetup=false
 tarChannelOrTag=edge
 delete=false
 enableGpu=false
 bootDiskType=""
 leaderRotation=true
 blockstreamer=false
-deployUpdateManifest=true
-fetchLogs=true
 
 usage() {
   exitcode=0
@@ -32,14 +25,13 @@ usage() {
     echo "Error: $*"
   fi
   cat <<EOF
-usage: $0 -p network-name -C cloud -z zone1 [-z zone2] ... [-z zoneN] [options...]
+usage: $0 [name] [cloud] [zone] [options...]
 
 Deploys a CD testnet
 
-  mandatory arguments:
-  -p [network-name]  - name of the network
-  -C [cloud] - cloud provider to use (gce, ec2)
-  -z [zone]  - cloud provider zone to deploy the network into.  Must specify at least one zone
+  name  - name of the network
+  cloud - cloud provider to use (gce, ec2)
+  zone  - cloud provider zone to deploy the network into
 
   options:
    -t edge|beta|stable|vX.Y.Z  - Deploy the latest tarball release for the
@@ -58,13 +50,6 @@ Deploys a CD testnet
    -D                   - Delete the network
    -r                   - Reuse existing node/ledger configuration from a
                           previous |start| (ie, don't run ./multinode-demo/setup.sh).
-   -x                   - External node.  Default: false
-   -e                   - Skip create.  Assume the nodes have already been created
-   -s                   - Skip start.  Nodes will still be created or configured, but network software will not be started.
-   -S                   - Stop network software without tearing down nodes.
-   -f                   - Discard validator nodes that didn't bootup successfully
-   -w                   - Skip time-consuming "bells and whistles" that are
-                          unnecessary for a high-node count demo testnet
 
    Note: the SOLANA_METRICS_CONFIG environment variable is used to configure
          metrics
@@ -72,22 +57,19 @@ EOF
   exit $exitcode
 }
 
-zone=()
+netName=$1
+cloudProvider=$2
+zone=$3
+[[ -n $netName ]] || usage
+[[ -n $cloudProvider ]] || usage "Cloud provider not specified"
+[[ -n $zone ]] || usage "Zone not specified"
+shift 3
 
-while getopts "h?p:Pn:c:t:gG:a:Dbd:rusxz:p:C:Sfew" opt; do
+while getopts "h?p:Pn:c:t:gG:a:Dbd:ru" opt; do
   case $opt in
   h | \?)
     usage
     ;;
-  p)
-    netName=$OPTARG
-    ;;
-  C)
-    cloudProvider=$OPTARG
-    ;;
-  z)
-    zone+=("$OPTARG")
-    ;;
   P)
     publicNetwork=true
     ;;
@@ -127,40 +109,17 @@ while getopts "h?p:Pn:c:t:gG:a:Dbd:rusxz:p:C:Sfew" opt; do
     delete=true
     ;;
   r)
-    reuseLedger=true
-    ;;
-  e)
-    skipCreate=true
-    ;;
-  s)
-    skipStart=true
-    ;;
-  x)
-    externalNode=true
-    ;;
-  f)
-    failOnValidatorBootupFailure=false
+    skipSetup=true
     ;;
   u)
     blockstreamer=true
     ;;
-  S)
-    stopNetwork=true
-    ;;
-  w)
-    fetchLogs=false
-    deployUpdateManifest=false
-    ;;
   *)
     usage "Error: unhandled option: $opt"
     ;;
   esac
 done
 
-[[ -n $netName ]] || usage
-[[ -n $cloudProvider ]] || usage "Cloud provider not specified"
-[[ -n ${zone[*]} ]] || usage "At least one zone must be specified"
-
 shutdown() {
   exitcode=$?
 
@@ -181,25 +140,9 @@ trap shutdown EXIT INT
 
 set -x
 
-# Build a string to pass zone opts to $cloudProvider.sh: "-z zone1 -z zone2 ..."
-zone_args=()
-for val in "${zone[@]}"; do
-  zone_args+=("-z $val")
-done
-
-if $stopNetwork; then
-  skipCreate=true
-fi
-
-if $delete; then
-  skipCreate=false
-fi
-
-# Create the network
-if ! $skipCreate; then
+if ! $skipSetup; then
   echo "--- $cloudProvider.sh delete"
-  # shellcheck disable=SC2068
-  time net/"$cloudProvider".sh delete ${zone_args[@]} -p "$netName" ${externalNode:+-x}
+  time net/"$cloudProvider".sh delete -z "$zone" -p "$netName"
   if $delete; then
     exit 0
   fi
@@ -207,12 +150,11 @@ if ! $skipCreate; then
   echo "--- $cloudProvider.sh create"
   create_args=(
     -p "$netName"
+    -z "$zone"
     -a "$bootstrapFullNodeAddress"
     -c "$clientNodeCount"
     -n "$additionalFullNodeCount"
   )
-  # shellcheck disable=SC2206
-  create_args+=(${zone_args[@]})
 
   if $blockstreamer; then
     create_args+=(-u)
@@ -238,34 +180,17 @@ if ! $skipCreate; then
     create_args+=(-P)
   fi
 
-  if $externalNode; then
-    create_args+=(-x)
-  fi
-
-  if ! $failOnValidatorBootupFailure; then
-    create_args+=(-f)
-  fi
-
   time net/"$cloudProvider".sh create "${create_args[@]}"
 else
   echo "--- $cloudProvider.sh config"
   config_args=(
     -p "$netName"
+    -z "$zone"
   )
-  # shellcheck disable=SC2206
-  config_args+=(${zone_args[@]})
   if $publicNetwork; then
     config_args+=(-P)
   fi
 
-  if $externalNode; then
-    config_args+=(-x)
-  fi
-
-  if ! $failOnValidatorBootupFailure; then
-    config_args+=(-f)
-  fi
-
   time net/"$cloudProvider".sh config "${config_args[@]}"
 fi
 net/init-metrics.sh -e
@@ -273,56 +198,39 @@ net/init-metrics.sh -e
 echo "+++ $cloudProvider.sh info"
 net/"$cloudProvider".sh info
 
-if $stopNetwork; then
-  echo --- net.sh stop
-  time net/net.sh stop
-  exit 0
+echo --- net.sh start
+maybeRejectExtraNodes=
+if ! $publicNetwork; then
+  maybeRejectExtraNodes="-o rejectExtraNodes"
+fi
+maybeNoValidatorSanity=
+if [[ -n $NO_VALIDATOR_SANITY ]]; then
+  maybeNoValidatorSanity="-o noValidatorSanity"
+fi
+maybeNoLedgerVerify=
+if [[ -n $NO_LEDGER_VERIFY ]]; then
+  maybeNoLedgerVerify="-o noLedgerVerify"
+fi
+
+maybeSkipSetup=
+if $skipSetup; then
+  maybeSkipSetup="-r"
 fi
 
 ok=true
-if ! $skipStart; then
-  (
-    if $skipCreate; then
-      # TODO: Enable rolling updates
-      #op=update
-      op=restart
-    else
-      op=start
-    fi
-    echo "--- net.sh $op"
-    args=("$op" -t "$tarChannelOrTag")
-
-    if ! $publicNetwork; then
-      args+=(-o rejectExtraNodes)
-    fi
-    if [[ -n $NO_VALIDATOR_SANITY ]]; then
-      args+=(-o noValidatorSanity)
-    fi
-    if [[ -n $NO_LEDGER_VERIFY ]]; then
-      args+=(-o noLedgerVerify)
-    fi
-
-    if $reuseLedger; then
-      args+=(-r)
-    fi
-
-    if ! $failOnValidatorBootupFailure; then
-      args+=(-F)
-    fi
-
-    # shellcheck disable=SC2154 # SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu comes from .buildkite/env/
-    if $deployUpdateManifest && [[ -n $SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu ]]; then
-      echo "$SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu" > update_manifest_keypair.json
-      args+=(-i update_manifest_keypair.json)
-    fi
-
-    # shellcheck disable=SC2086 # Don't want to double quote the $maybeXYZ variables
-    time net/net.sh "${args[@]}"
-  ) || ok=false
-
-  if $fetchLogs; then
-    net/net.sh logs
+(
+  if $skipSetup; then
+    # TODO: Enable rolling updates
+    #op=update
+    op=restart
+  else
+    op=start
   fi
-fi
 
+  # shellcheck disable=SC2086 # Don't want to double quote maybeRejectExtraNodes
+  time net/net.sh $op -t "$tarChannelOrTag" \
+    $maybeSkipSetup $maybeRejectExtraNodes $maybeNoValidatorSanity $maybeNoLedgerVerify
+) || ok=false
+
+net/net.sh logs
 $ok

ci/testnet-manager.sh

@@ -42,32 +42,20 @@ steps:
             value: "testnet-beta"
           - label: "testnet-beta-perf"
             value: "testnet-beta-perf"
-          - label: "testnet-demo"
-            value: "testnet-demo"
       - select: "Operation"
         key: "testnet-operation"
         default: "sanity-or-restart"
         options:
-          - label: "Create testnet and then start software.  If the testnet already exists it will be deleted and re-created"
-            value: "create-and-start"
-          - label: "Create testnet, but do not start software.  If the testnet already exists it will be deleted and re-created"
-            value: "create"
-          - label: "Start network software on an existing testnet.  If software is already running it will be restarted"
-            value: "start"
-          - label: "Stop network software without deleting testnet nodes"
-            value: "stop"
-          - label: "Update the network software.  Restart network software on failure"
-            value: "update-or-restart"
-          - label: "Sanity check.  Restart network software on failure"
+          - label: "Sanity check.  Restart network on failure"
             value: "sanity-or-restart"
+          - label: "Start (or restart) the network"
+            value: "start"
+          - label: "Update the network software.  Restart network on failure"
+            value: "update-or-restart"
+          - label: "Stop the network"
+            value: "stop"
           - label: "Sanity check only"
             value: "sanity"
-          - label: "Delete the testnet"
-            value: "delete"
-          - label: "Enable/unlock the testnet"
-            value: "enable"
-          - label: "Delete and then lock the testnet from further operation until it is re-enabled"
-            value: "disable"
   - command: "ci/$(basename "$0")"
     agents:
       - "queue=$BUILDKITE_AGENT_META_DATA_QUEUE"
@@ -76,93 +64,6 @@ EOF
   exit 0
 fi
 
-ci/channel-info.sh
-eval "$(ci/channel-info.sh)"
-
-
-EC2_ZONES=(us-west-1a sa-east-1a ap-northeast-2a eu-central-1a ca-central-1a)
-
-# GCE zones with _lots_ of quota
-GCE_ZONES=(
-  us-west1-a
-  us-central1-a
-  us-east1-b
-  europe-west4-a
-
-  us-west1-b
-  us-central1-b
-  us-east1-c
-  europe-west4-b
-
-  us-west1-c
-  us-east1-d
-  europe-west4-c
-)
-
-# GCE zones with enough quota for one CPU-only fullnode
-GCE_LOW_QUOTA_ZONES=(
-  asia-east2-a
-  asia-northeast1-b
-  asia-northeast2-b
-  asia-south1-c
-  asia-southeast1-b
-  australia-southeast1-b
-  europe-north1-a
-  europe-west2-b
-  europe-west3-c
-  europe-west6-a
-  northamerica-northeast1-a
-  southamerica-east1-b
-)
-
-case $TESTNET in
-testnet-edge|testnet-edge-perf)
-  CHANNEL_OR_TAG=edge
-  CHANNEL_BRANCH=$EDGE_CHANNEL
-  : "${TESTNET_DB_HOST:=https://clocktower-f1d56615.influxcloud.net:8086}"
-  ;;
-testnet-beta|testnet-beta-perf)
-  CHANNEL_OR_TAG=beta
-  CHANNEL_BRANCH=$BETA_CHANNEL
-  : "${TESTNET_DB_HOST:=https://clocktower-f1d56615.influxcloud.net:8086}"
-  ;;
-testnet)
-  CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG
-  CHANNEL_BRANCH=$STABLE_CHANNEL
-  : "${EC2_NODE_COUNT:=10}"
-  : "${GCE_NODE_COUNT:=}"
-  : "${TESTNET_DB_HOST:=https://clocktower-f1d56615.influxcloud.net:8086}"
-  ;;
-testnet-perf)
-  CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG
-  CHANNEL_BRANCH=$STABLE_CHANNEL
-  ;;
-testnet-demo)
-  CHANNEL_OR_TAG=beta
-  CHANNEL_BRANCH=$BETA_CHANNEL
-  : "${GCE_NODE_COUNT:=150}"
-  : "${GCE_LOW_QUOTA_NODE_COUNT:=70}"
-  : "${TESTNET_DB_HOST:=https://clocktower-f1d56615.influxcloud.net:8086}"
-  ;;
-*)
-  echo "Error: Invalid TESTNET=$TESTNET"
-  exit 1
-  ;;
-esac
-
-EC2_ZONE_ARGS=()
-for val in "${EC2_ZONES[@]}"; do
-  EC2_ZONE_ARGS+=("-z $val")
-done
-GCE_ZONE_ARGS=()
-for val in "${GCE_ZONES[@]}"; do
-  GCE_ZONE_ARGS+=("-z $val")
-done
-GCE_LOW_QUOTA_ZONE_ARGS=()
-for val in "${GCE_LOW_QUOTA_ZONES[@]}"; do
-  GCE_LOW_QUOTA_ZONE_ARGS+=("-z $val")
-done
-
 if [[ -n $TESTNET_DB_HOST ]]; then
   SOLANA_METRICS_PARTIAL_CONFIG="host=$TESTNET_DB_HOST,$SOLANA_METRICS_PARTIAL_CONFIG"
 fi
@@ -171,13 +72,31 @@ export SOLANA_METRICS_CONFIG="db=$TESTNET,$SOLANA_METRICS_PARTIAL_CONFIG"
 echo "SOLANA_METRICS_CONFIG: $SOLANA_METRICS_CONFIG"
 source scripts/configure-metrics.sh
 
-if [[ -n $TESTNET_TAG ]]; then
-  CHANNEL_OR_TAG=$TESTNET_TAG
-else
+ci/channel-info.sh
+eval "$(ci/channel-info.sh)"
 
-  if [[ $BUILDKITE_BRANCH != "$CHANNEL_BRANCH" ]]; then
-    (
-      cat <<EOF
+case $TESTNET in
+testnet-edge|testnet-edge-perf)
+  CHANNEL_OR_TAG=edge
+  CHANNEL_BRANCH=$EDGE_CHANNEL
+  ;;
+testnet-beta|testnet-beta-perf)
+  CHANNEL_OR_TAG=beta
+  CHANNEL_BRANCH=$BETA_CHANNEL
+  ;;
+testnet|testnet-perf)
+  CHANNEL_OR_TAG=$STABLE_CHANNEL_LATEST_TAG
+  CHANNEL_BRANCH=$STABLE_CHANNEL
+  ;;
+*)
+  echo "Error: Invalid TESTNET=$TESTNET"
+  exit 1
+  ;;
+esac
+
+if [[ $BUILDKITE_BRANCH != "$CHANNEL_BRANCH" ]]; then
+  (
+    cat <<EOF
 steps:
   - trigger: "$BUILDKITE_PIPELINE_SLUG"
     async: true
@@ -188,23 +107,19 @@ steps:
         TESTNET: "$TESTNET"
         TESTNET_OP: "$TESTNET_OP"
         TESTNET_DB_HOST: "$TESTNET_DB_HOST"
-        EC2_NODE_COUNT: "$EC2_NODE_COUNT"
-        GCE_NODE_COUNT: "$GCE_NODE_COUNT"
-        GCE_LOW_QUOTA_NODE_COUNT: "$GCE_LOW_QUOTA_NODE_COUNT"
 EOF
-    ) | buildkite-agent pipeline upload
-    exit 0
-  fi
+  ) | buildkite-agent pipeline upload
+  exit 0
 fi
 
+
 sanity() {
   echo "--- sanity $TESTNET"
   case $TESTNET in
   testnet-edge)
     (
       set -x
-      NO_LEDGER_VERIFY=1 \
-        ci/testnet-sanity.sh edge-testnet-solana-com ec2 us-west-1a
+      ci/testnet-sanity.sh edge-testnet-solana-com ec2 us-west-1a
     )
     ;;
   testnet-edge-perf)
@@ -219,8 +134,7 @@ sanity() {
   testnet-beta)
     (
       set -x
-      NO_LEDGER_VERIFY=1 \
-        ci/testnet-sanity.sh beta-testnet-solana-com ec2 us-west-1a
+      ci/testnet-sanity.sh beta-testnet-solana-com ec2 us-west-1a
     )
     ;;
   testnet-beta-perf)
@@ -235,19 +149,8 @@ sanity() {
   testnet)
     (
       set -x
-
-      ok=true
-      if [[ -n $EC2_NODE_COUNT ]]; then
-        NO_LEDGER_VERIFY=1 \
-          ci/testnet-sanity.sh testnet-solana-com ec2 "${EC2_ZONES[0]}" || ok=false
-      elif [[ -n $GCE_NODE_COUNT ]]; then
-        NO_LEDGER_VERIFY=1 \
-          ci/testnet-sanity.sh testnet-solana-com gce "${GCE_ZONES[0]}" || ok=false
-      else
-        echo "Error: no EC2 or GCE nodes"
-        ok=false
-      fi
-      $ok
+      ci/testnet-sanity.sh testnet-solana-com ec2 us-west-1a
+      #ci/testnet-sanity.sh testnet-solana-com gce us-east1-c
     )
     ;;
   testnet-perf)
@@ -260,22 +163,6 @@ sanity() {
       #ci/testnet-sanity.sh perf-testnet-solana-com ec2 us-east-1a
     )
     ;;
-  testnet-demo)
-    (
-      set -x
-
-      ok=true
-      if [[ -n $GCE_NODE_COUNT ]]; then
-        NO_LEDGER_VERIFY=1 \
-        NO_VALIDATOR_SANITY=1 \
-          ci/testnet-sanity.sh demo-testnet-solana-com gce "${GCE_ZONES[0]}" -f || ok=false
-      else
-        echo "Error: no GCE nodes"
-        ok=false
-      fi
-      $ok
-    )
-    ;;
   *)
     echo "Error: Invalid TESTNET=$TESTNET"
     exit 1
@@ -283,38 +170,26 @@ sanity() {
   esac
 }
 
-deploy() {
-  declare maybeCreate=$1
-  declare maybeStart=$2
-  declare maybeStop=$3
-  declare maybeDelete=$4
 
-  echo "--- deploy \"$maybeCreate\" \"$maybeStart\" \"$maybeStop\" \"$maybeDelete\""
-
-  # Create or recreate the nodes
-  if [[ -z $maybeCreate ]]; then
-    skipCreate=skip
+start() {
+  declare maybeDelete=$1
+  if [[ -z $maybeDelete ]]; then
+    echo "--- start $TESTNET"
   else
-    skipCreate=""
-  fi
-
-  # Start or restart the network software on the nodes
-  if [[ -z $maybeStart ]]; then
-    skipStart=skip
-  else
-    skipStart=""
+    echo "--- stop $TESTNET"
   fi
+  declare maybeReuseLedger=$2
 
   case $TESTNET in
   testnet-edge)
     (
       set -x
-      ci/testnet-deploy.sh -p edge-testnet-solana-com -C ec2 -z us-west-1a \
-        -t "$CHANNEL_OR_TAG" -n 3 -c 0 -u -P -a eipalloc-0ccd4f2239886fa94 \
-        ${skipCreate:+-e} \
-        ${skipStart:+-s} \
-        ${maybeStop:+-S} \
-        ${maybeDelete:+-D}
+      NO_VALIDATOR_SANITY=1 \
+      RUST_LOG=solana=info \
+        ci/testnet-deploy.sh edge-testnet-solana-com ec2 us-west-1a \
+          -t "$CHANNEL_OR_TAG" -n 3 -c 0 -u -P -a eipalloc-0ccd4f2239886fa94 \
+          ${maybeReuseLedger:+-r} \
+          ${maybeDelete:+-D}
     )
     ;;
   testnet-edge-perf)
@@ -322,13 +197,10 @@ deploy() {
       set -x
       NO_LEDGER_VERIFY=1 \
       NO_VALIDATOR_SANITY=1 \
-      RUST_LOG=solana=warn \
-        ci/testnet-deploy.sh -p edge-perf-testnet-solana-com -C ec2 -z us-west-2b \
+        ci/testnet-deploy.sh edge-perf-testnet-solana-com ec2 us-west-2b \
           -g -t "$CHANNEL_OR_TAG" -c 2 \
           -b \
-          ${skipCreate:+-e} \
-          ${skipStart:+-s} \
-          ${maybeStop:+-S} \
+          ${maybeReuseLedger:+-r} \
           ${maybeDelete:+-D}
     )
     ;;
@@ -336,12 +208,11 @@ deploy() {
     (
       set -x
       NO_VALIDATOR_SANITY=1 \
-        ci/testnet-deploy.sh -p beta-testnet-solana-com -C ec2 -z us-west-1a \
+      RUST_LOG=solana=info \
+        ci/testnet-deploy.sh beta-testnet-solana-com ec2 us-west-1a \
           -t "$CHANNEL_OR_TAG" -n 3 -c 0 -u -P -a eipalloc-0f286cf8a0771ce35 \
           -b \
-          ${skipCreate:+-e} \
-          ${skipStart:+-s} \
-          ${maybeStop:+-S} \
+          ${maybeReuseLedger:+-r} \
           ${maybeDelete:+-D}
     )
     ;;
@@ -350,42 +221,27 @@ deploy() {
       set -x
       NO_LEDGER_VERIFY=1 \
       NO_VALIDATOR_SANITY=1 \
-      RUST_LOG=solana=warn \
-        ci/testnet-deploy.sh -p beta-perf-testnet-solana-com -C ec2 -z us-west-2b \
+        ci/testnet-deploy.sh beta-perf-testnet-solana-com ec2 us-west-2b \
           -g -t "$CHANNEL_OR_TAG" -c 2 \
           -b \
-          ${skipCreate:+-e} \
-          ${skipStart:+-s} \
-          ${maybeStop:+-S} \
+          ${maybeReuseLedger:+-r} \
           ${maybeDelete:+-D}
     )
     ;;
   testnet)
     (
       set -x
-
-      if [[ -n $GCE_NODE_COUNT ]] || [[ -n $skipStart ]]; then
-        maybeSkipStart="skip"
-      fi
-
-      # shellcheck disable=SC2068
-      ci/testnet-deploy.sh -p testnet-solana-com -C ec2 ${EC2_ZONE_ARGS[@]} \
-        -t "$CHANNEL_OR_TAG" -n "$EC2_NODE_COUNT" -c 0 -u -P -a eipalloc-0fa502bf95f6f18b2 \
-        ${skipCreate:+-e} \
-        ${maybeSkipStart:+-s} \
-        ${maybeStop:+-S} \
-        ${maybeDelete:+-D}
-
-      if [[ -n $GCE_NODE_COUNT ]]; then
-        # shellcheck disable=SC2068
-        ci/testnet-deploy.sh -p testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
-          -t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P \
-          ${skipCreate:+-e} \
-          ${skipStart:+-s} \
-          ${maybeStop:+-S} \
-          ${maybeDelete:+-D} \
-          -x
-      fi
+      NO_VALIDATOR_SANITY=1 \
+      RUST_LOG=solana=info \
+        ci/testnet-deploy.sh testnet-solana-com ec2 us-west-1a \
+          -t "$CHANNEL_OR_TAG" -n 3 -c 0 -u -P -a eipalloc-0fa502bf95f6f18b2 \
+          -b \
+          ${maybeReuseLedger:+-r} \
+          ${maybeDelete:+-D}
+        #ci/testnet-deploy.sh testnet-solana-com gce us-east1-c \
+        #  -t "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a testnet-solana-com  \
+        #  ${maybeReuseLedger:+-r} \
+        #  ${maybeDelete:+-D}
     )
     ;;
   testnet-perf)
@@ -393,48 +249,18 @@ deploy() {
       set -x
       NO_LEDGER_VERIFY=1 \
       NO_VALIDATOR_SANITY=1 \
-      RUST_LOG=solana=warn \
-        ci/testnet-deploy.sh -p perf-testnet-solana-com -C gce -z us-west1-b \
-          -G "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
+        ci/testnet-deploy.sh perf-testnet-solana-com gce us-west1-b \
+          -G "n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
           -t "$CHANNEL_OR_TAG" -c 2 \
           -b \
           -d pd-ssd \
-          ${skipCreate:+-e} \
-          ${skipStart:+-s} \
-          ${maybeStop:+-S} \
+          ${maybeReuseLedger:+-r} \
           ${maybeDelete:+-D}
-    )
-    ;;
-  testnet-demo)
-    (
-      set -x
-
-      if [[ -n $GCE_LOW_QUOTA_NODE_COUNT ]] || [[ -n $skipStart ]]; then
-        maybeSkipStart="skip"
-      fi
-
-      # shellcheck disable=SC2068
-      NO_LEDGER_VERIFY=1 \
-      NO_VALIDATOR_SANITY=1 \
-        ci/testnet-deploy.sh -p demo-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
-          -t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -u -f -w \
-          -a demo-testnet-solana-com \
-          ${skipCreate:+-e} \
-          ${maybeSkipStart:+-s} \
-          ${maybeStop:+-S} \
-          ${maybeDelete:+-D}
-
-      if [[ -n $GCE_LOW_QUOTA_NODE_COUNT ]]; then
-        # shellcheck disable=SC2068
-        NO_LEDGER_VERIFY=1 \
-        NO_VALIDATOR_SANITY=1 \
-          ci/testnet-deploy.sh -p demo-testnet-solana-com2 -C gce ${GCE_LOW_QUOTA_ZONE_ARGS[@]} \
-            -t "$CHANNEL_OR_TAG" -n "$GCE_LOW_QUOTA_NODE_COUNT" -c 0 -P -f -x -w \
-            ${skipCreate:+-e} \
-            ${skipStart:+-s} \
-            ${maybeStop:+-S} \
-            ${maybeDelete:+-D}
-      fi
+        #ci/testnet-deploy.sh perf-testnet-solana-com ec2 us-east-1a \
+        #  -g \
+        #  -t "$CHANNEL_OR_TAG" -c 2 \
+        #  ${maybeReuseLedger:+-r} \
+        #  ${maybeDelete:+-D}
     )
     ;;
   *)
@@ -444,107 +270,33 @@ deploy() {
   esac
 }
 
-ENABLED_LOCKFILE="${HOME}/${TESTNET}.is_enabled"
-
-create-and-start() {
-  deploy create start
-}
-create() {
-  deploy create
-}
-start() {
-  deploy "" start
-}
 stop() {
-  deploy "" ""
-}
-delete() {
-  deploy "" "" "" delete
-}
-enable_testnet() {
-  touch "${ENABLED_LOCKFILE}"
-  echo "+++ $TESTNET now enabled"
-}
-disable_testnet() {
-  rm -f "${ENABLED_LOCKFILE}"
-  echo "+++ $TESTNET now disabled"
-}
-is_testnet_enabled() {
-  if [[ ! -f ${ENABLED_LOCKFILE} ]]; then
-    echo "+++ ${TESTNET} is currently disabled.  Enable ${TESTNET} by running ci/testnet-manager.sh with \$TESTNET_OP=enable, then re-run with current settings."
-    exit 0
-  fi
+  start delete
 }
 
 case $TESTNET_OP in
-enable)
-  enable_testnet
-  ;;
-disable)
-  disable_testnet
-  delete
-  ;;
-create-and-start)
-  is_testnet_enabled
-  create-and-start
-  ;;
-create)
-  is_testnet_enabled
-  create
+sanity)
+  sanity
   ;;
 start)
-  is_testnet_enabled
   start
   ;;
 stop)
-  is_testnet_enabled
   stop
   ;;
-sanity)
-  is_testnet_enabled
-  sanity
-  ;;
-delete)
-  is_testnet_enabled
-  delete
-  ;;
 update-or-restart)
-  is_testnet_enabled
-  if start; then
-    echo Update successful
-  else
-    echo "+++ Update failed, restarting the network"
-    $metricsWriteDatapoint "testnet-manager update-failure=1"
-    create-and-start
-  fi
+  echo "+++ Restarting the network"
+  start
   ;;
 sanity-or-restart)
-  is_testnet_enabled
   if sanity; then
     echo Pass
   else
-    echo "+++ Sanity failed, updating the network"
+    echo "+++ Sanity failed, restarting the network"
     $metricsWriteDatapoint "testnet-manager sanity-failure=1"
-
-    # TODO: Restore attempt to restart the cluster before recreating it
-    #       See https://github.com/solana-labs/solana/issues/3774
-    if false; then
-      if start; then
-        echo Update successful
-      else
-        echo "+++ Update failed, restarting the network"
-        $metricsWriteDatapoint "testnet-manager update-failure=1"
-        create-and-start
-      fi
-    else
-      create-and-start
-    fi
+    start
   fi
   ;;
-*)
-  echo "Error: Invalid TESTNET_OP=$TESTNET_OP"
-  exit 1
-  ;;
 esac
 
 echo --- fin

ci/testnet-sanity.sh

@@ -11,13 +11,13 @@ usage() {
     echo "Error: $*"
   fi
   cat <<EOF
-usage: $0 [name] [cloud] [zone1] ... [zoneN]
+usage: $0 [name] [cloud] [zone]
 
-Sanity check a testnet
+Sanity check a CD testnet
 
-  name            - name of the network
-  cloud           - cloud provider to use (gce, ec2)
-  zone1 .. zoneN  - cloud provider zones to check
+  name  - name of the network
+  cloud - cloud provider to use (gce, ec2)
+  zone  - cloud provider zone of the network
 
   Note: the SOLANA_METRICS_CONFIG environment variable is used to configure
         metrics
@@ -27,10 +27,10 @@ EOF
 
 netName=$1
 cloudProvider=$2
+zone=$3
 [[ -n $netName ]] || usage ""
 [[ -n $cloudProvider ]] || usage "Cloud provider not specified"
-shift 2
-[[ -n $1 ]] || usage "zone1 not specified"
+[[ -n $zone ]] || usage "Zone not specified"
 
 shutdown() {
   exitcode=$?
@@ -48,24 +48,20 @@ shutdown() {
   exit $exitcode
 }
 rm -rf net/{log,-sanity}
-rm -f net/config/config
 trap shutdown EXIT INT
 
 set -x
-for zone in "$@"; do
-  echo "--- $cloudProvider config [$zone]"
-  timeout 5m net/"$cloudProvider".sh config -p "$netName" -z "$zone"
-  net/init-metrics.sh -e
-  echo "+++ $cloudProvider.sh info"
-  net/"$cloudProvider".sh info
-  echo "--- net.sh sanity [$cloudProvider:$zone]"
-  ok=true
-  timeout 5m net/net.sh sanity \
-    ${NO_LEDGER_VERIFY:+-o noLedgerVerify} \
-    ${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
-    ${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
-    $zone || ok=false
+echo "--- $cloudProvider.sh config"
+timeout 5m net/"$cloudProvider".sh config -p "$netName" -z "$zone"
+net/init-metrics.sh -e
+echo "+++ $cloudProvider.sh info"
+net/"$cloudProvider".sh info
+echo --- net.sh sanity
+ok=true
+timeout 5m net/net.sh sanity \
+  ${NO_LEDGER_VERIFY:+-o noLedgerVerify} \
+  ${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
+  ${REJECT_EXTRA_NODES:+-o rejectExtraNodes} || ok=false
 
-  net/net.sh logs
-  $ok
-done
+net/net.sh logs
+$ok

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-client"
-version = "0.14.2"
+version = "0.12.2"
 description = "Solana Client"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
@@ -12,15 +12,13 @@ edition = "2018"
 bincode = "1.1.2"
 bs58 = "0.2.0"
 log = "0.4.2"
-jsonrpc-core = "10.1.0"
 reqwest = "0.9.11"
-serde = "1.0.89"
-serde_derive = "1.0.88"
 serde_json = "1.0.39"
-solana-netutil = { path = "../netutil", version = "0.14.2"   }
-solana-sdk = { path = "../sdk", version = "0.14.2"   }
+solana-metrics = { path = "../metrics", version = "0.12.2" }
+solana-netutil = { path = "../netutil", version = "0.12.2" }
+solana-sdk = { path = "../sdk", version = "0.12.2" }
 
 [dev-dependencies]
 jsonrpc-core = "10.1.0"
 jsonrpc-http-server = "10.1.0"
-solana-logger = { path = "../logger", version = "0.14.2"   }
+solana-logger = { path = "../logger", version = "0.12.2" }

client/src/client.rs

@@ -0,0 +1,17 @@
+use crate::thin_client::ThinClient;
+use std::net::SocketAddr;
+use std::time::Duration;
+
+pub fn create_client((rpc, tpu): (SocketAddr, SocketAddr), range: (u16, u16)) -> ThinClient {
+    let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap();
+    ThinClient::new(rpc, tpu, transactions_socket)
+}
+
+pub fn create_client_with_timeout(
+    (rpc, tpu): (SocketAddr, SocketAddr),
+    range: (u16, u16),
+    timeout: Duration,
+) -> ThinClient {
+    let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap();
+    ThinClient::new_with_timeout(rpc, tpu, transactions_socket, timeout)
+}

client/src/client_error.rs

@@ -1,50 +0,0 @@
-use crate::rpc_request;
-use solana_sdk::transaction::TransactionError;
-use std::{fmt, io};
-
-#[derive(Debug)]
-pub enum ClientError {
-    Io(io::Error),
-    Reqwest(reqwest::Error),
-    RpcError(rpc_request::RpcError),
-    SerdeJson(serde_json::error::Error),
-    TransactionError(TransactionError),
-}
-
-impl fmt::Display for ClientError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "solana client error")
-    }
-}
-
-impl std::error::Error for ClientError {}
-
-impl From<io::Error> for ClientError {
-    fn from(err: io::Error) -> ClientError {
-        ClientError::Io(err)
-    }
-}
-
-impl From<reqwest::Error> for ClientError {
-    fn from(err: reqwest::Error) -> ClientError {
-        ClientError::Reqwest(err)
-    }
-}
-
-impl From<rpc_request::RpcError> for ClientError {
-    fn from(err: rpc_request::RpcError) -> ClientError {
-        ClientError::RpcError(err)
-    }
-}
-
-impl From<serde_json::error::Error> for ClientError {
-    fn from(err: serde_json::error::Error) -> ClientError {
-        ClientError::SerdeJson(err)
-    }
-}
-
-impl From<TransactionError> for ClientError {
-    fn from(err: TransactionError) -> ClientError {
-        ClientError::TransactionError(err)
-    }
-}

client/src/generic_rpc_client_request.rs

@@ -1,11 +0,0 @@
-use crate::client_error::ClientError;
-use crate::rpc_request::RpcRequest;
-
-pub(crate) trait GenericRpcClientRequest {
-    fn send(
-        &self,
-        request: &RpcRequest,
-        params: Option<serde_json::Value>,
-        retries: usize,
-    ) -> Result<serde_json::Value, ClientError>;
-}

client/src/lib.rs

@@ -1,7 +1,4 @@
-pub mod client_error;
-mod generic_rpc_client_request;
-pub mod mock_rpc_client_request;
-pub mod rpc_client;
-pub mod rpc_client_request;
+pub mod client;
+pub mod rpc_mock;
 pub mod rpc_request;
 pub mod thin_client;

client/src/mock_rpc_client_request.rs

@@ -1,64 +0,0 @@
-use crate::client_error::ClientError;
-use crate::generic_rpc_client_request::GenericRpcClientRequest;
-use crate::rpc_request::RpcRequest;
-use serde_json::{Number, Value};
-use solana_sdk::transaction::{self, TransactionError};
-
-pub const PUBKEY: &str = "7RoSF9fUmdphVCpabEoefH81WwrW7orsWonXWqTXkKV8";
-pub const SIGNATURE: &str =
-    "43yNSFC6fYTuPgTNFFhF4axw7AfWxB2BPdurme8yrsWEYwm8299xh8n6TAHjGymiSub1XtyxTNyd9GBfY2hxoBw8";
-
-pub struct MockRpcClientRequest {
-    url: String,
-}
-
-impl MockRpcClientRequest {
-    pub fn new(url: String) -> Self {
-        Self { url }
-    }
-}
-
-impl GenericRpcClientRequest for MockRpcClientRequest {
-    fn send(
-        &self,
-        request: &RpcRequest,
-        params: Option<serde_json::Value>,
-        _retries: usize,
-    ) -> Result<serde_json::Value, ClientError> {
-        if self.url == "fails" {
-            return Ok(Value::Null);
-        }
-        let val = match request {
-            RpcRequest::ConfirmTransaction => {
-                if let Some(Value::Array(param_array)) = params {
-                    if let Value::String(param_string) = &param_array[0] {
-                        Value::Bool(param_string == SIGNATURE)
-                    } else {
-                        Value::Null
-                    }
-                } else {
-                    Value::Null
-                }
-            }
-            RpcRequest::GetBalance => {
-                let n = if self.url == "airdrop" { 0 } else { 50 };
-                Value::Number(Number::from(n))
-            }
-            RpcRequest::GetRecentBlockhash => Value::String(PUBKEY.to_string()),
-            RpcRequest::GetSignatureStatus => {
-                let response: Option<transaction::Result<()>> = if self.url == "account_in_use" {
-                    Some(Err(TransactionError::AccountInUse))
-                } else if self.url == "sig_not_found" {
-                    None
-                } else {
-                    Some(Ok(()))
-                };
-                serde_json::to_value(response).unwrap()
-            }
-            RpcRequest::GetTransactionCount => Value::Number(Number::from(1234)),
-            RpcRequest::SendTransaction => Value::String(SIGNATURE.to_string()),
-            _ => Value::Null,
-        };
-        Ok(val)
-    }
-}

client/src/rpc_client.rs

@@ -1,753 +0,0 @@
-use crate::client_error::ClientError;
-use crate::generic_rpc_client_request::GenericRpcClientRequest;
-use crate::mock_rpc_client_request::MockRpcClientRequest;
-use crate::rpc_client_request::RpcClientRequest;
-use crate::rpc_request::RpcRequest;
-use bincode::serialize;
-use bs58;
-use log::*;
-use serde_json::{json, Value};
-use solana_sdk::account::Account;
-use solana_sdk::hash::Hash;
-use solana_sdk::pubkey::Pubkey;
-use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
-use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND};
-use solana_sdk::transaction::{self, Transaction, TransactionError};
-use std::error;
-use std::io;
-use std::net::SocketAddr;
-use std::thread::sleep;
-use std::time::{Duration, Instant};
-
-pub struct RpcClient {
-    client: Box<GenericRpcClientRequest + Send + Sync>,
-}
-
-impl RpcClient {
-    pub fn new(url: String) -> Self {
-        Self {
-            client: Box::new(RpcClientRequest::new(url)),
-        }
-    }
-
-    pub fn new_mock(url: String) -> Self {
-        Self {
-            client: Box::new(MockRpcClientRequest::new(url)),
-        }
-    }
-
-    pub fn new_socket(addr: SocketAddr) -> Self {
-        Self::new(get_rpc_request_str(addr, false))
-    }
-
-    pub fn new_socket_with_timeout(addr: SocketAddr, timeout: Duration) -> Self {
-        let url = get_rpc_request_str(addr, false);
-        Self {
-            client: Box::new(RpcClientRequest::new_with_timeout(url, timeout)),
-        }
-    }
-
-    pub fn send_transaction(&self, transaction: &Transaction) -> Result<String, ClientError> {
-        let serialized = serialize(transaction).unwrap();
-        let params = json!([serialized]);
-        let signature = self
-            .client
-            .send(&RpcRequest::SendTransaction, Some(params), 5)?;
-        if signature.as_str().is_none() {
-            Err(io::Error::new(
-                io::ErrorKind::Other,
-                "Received result of an unexpected type",
-            ))?;
-        }
-        Ok(signature.as_str().unwrap().to_string())
-    }
-
-    pub fn get_signature_status(
-        &self,
-        signature: &str,
-    ) -> Result<Option<transaction::Result<()>>, ClientError> {
-        let params = json!([signature.to_string()]);
-        let signature_status =
-            self.client
-                .send(&RpcRequest::GetSignatureStatus, Some(params), 5)?;
-        let result: Option<transaction::Result<()>> =
-            serde_json::from_value(signature_status).unwrap();
-        Ok(result)
-    }
-
-    pub fn send_and_confirm_transaction<T: KeypairUtil>(
-        &self,
-        transaction: &mut Transaction,
-        signer: &T,
-    ) -> Result<String, ClientError> {
-        let mut send_retries = 5;
-        loop {
-            let mut status_retries = 4;
-            let signature_str = self.send_transaction(transaction)?;
-            let status = loop {
-                let status = self.get_signature_status(&signature_str)?;
-                if status.is_none() {
-                    status_retries -= 1;
-                    if status_retries == 0 {
-                        break status;
-                    }
-                } else {
-                    break status;
-                }
-                if cfg!(not(test)) {
-                    // Retry ~twice during a slot
-                    sleep(Duration::from_millis(
-                        500 * DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND,
-                    ));
-                }
-            };
-            send_retries = if let Some(result) = status.clone() {
-                match result {
-                    Ok(_) => return Ok(signature_str),
-                    Err(TransactionError::AccountInUse) => {
-                        // Fetch a new blockhash and re-sign the transaction before sending it again
-                        self.resign_transaction(transaction, signer)?;
-                        send_retries - 1
-                    }
-                    Err(_) => 0,
-                }
-            } else {
-                send_retries - 1
-            };
-            if send_retries == 0 {
-                if status.is_some() {
-                    status.unwrap()?
-                } else {
-                    Err(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("Transaction {:?} failed: {:?}", signature_str, status),
-                    ))?;
-                }
-            }
-        }
-    }
-
-    pub fn send_and_confirm_transactions(
-        &self,
-        mut transactions: Vec<Transaction>,
-        signer: &Keypair,
-    ) -> Result<(), Box<dyn error::Error>> {
-        let mut send_retries = 5;
-        loop {
-            let mut status_retries = 4;
-
-            // Send all transactions
-            let mut transactions_signatures = vec![];
-            for transaction in transactions {
-                if cfg!(not(test)) {
-                    // Delay ~1 tick between write transactions in an attempt to reduce AccountInUse errors
-                    // when all the write transactions modify the same program account (eg, deploying a
-                    // new program)
-                    sleep(Duration::from_millis(1000 / NUM_TICKS_PER_SECOND));
-                }
-
-                let signature = self.send_transaction(&transaction).ok();
-                transactions_signatures.push((transaction, signature))
-            }
-
-            // Collect statuses for all the transactions, drop those that are confirmed
-            while status_retries > 0 {
-                status_retries -= 1;
-
-                if cfg!(not(test)) {
-                    // Retry ~twice during a slot
-                    sleep(Duration::from_millis(
-                        500 * DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND,
-                    ));
-                }
-
-                transactions_signatures = transactions_signatures
-                    .into_iter()
-                    .filter(|(_transaction, signature)| {
-                        if let Some(signature) = signature {
-                            if let Ok(status) = self.get_signature_status(&signature) {
-                                if status.is_none() {
-                                    return false;
-                                }
-                                return status.unwrap().is_err();
-                            }
-                        }
-                        true
-                    })
-                    .collect();
-
-                if transactions_signatures.is_empty() {
-                    return Ok(());
-                }
-            }
-
-            if send_retries == 0 {
-                Err(io::Error::new(io::ErrorKind::Other, "Transactions failed"))?;
-            }
-            send_retries -= 1;
-
-            // Re-sign any failed transactions with a new blockhash and retry
-            let blockhash =
-                self.get_new_blockhash(&transactions_signatures[0].0.message().recent_blockhash)?;
-            transactions = transactions_signatures
-                .into_iter()
-                .map(|(mut transaction, _)| {
-                    transaction.sign(&[signer], blockhash);
-                    transaction
-                })
-                .collect();
-        }
-    }
-
-    pub fn resign_transaction<T: KeypairUtil>(
-        &self,
-        tx: &mut Transaction,
-        signer_key: &T,
-    ) -> Result<(), ClientError> {
-        let blockhash = self.get_new_blockhash(&tx.message().recent_blockhash)?;
-        tx.sign(&[signer_key], blockhash);
-        Ok(())
-    }
-
-    pub fn retry_get_balance(
-        &self,
-        pubkey: &Pubkey,
-        retries: usize,
-    ) -> Result<Option<u64>, Box<dyn error::Error>> {
-        let params = json!([format!("{}", pubkey)]);
-        let res = self
-            .client
-            .send(&RpcRequest::GetBalance, Some(params), retries)?
-            .as_u64();
-        Ok(res)
-    }
-
-    pub fn get_account_data(&self, pubkey: &Pubkey) -> io::Result<Vec<u8>> {
-        let params = json!([format!("{}", pubkey)]);
-        let response = self
-            .client
-            .send(&RpcRequest::GetAccountInfo, Some(params), 0);
-        match response {
-            Ok(account_json) => {
-                let account: Account =
-                    serde_json::from_value(account_json).expect("deserialize account");
-                Ok(account.data)
-            }
-            Err(error) => {
-                debug!("get_account_data failed: {:?}", error);
-                Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    "get_account_data failed",
-                ))
-            }
-        }
-    }
-
-    /// Request the balance of the user holding `pubkey`. This method blocks
-    /// until the server sends a response. If the response packet is dropped
-    /// by the network, this method will hang indefinitely.
-    pub fn get_balance(&self, pubkey: &Pubkey) -> io::Result<u64> {
-        let params = json!([format!("{}", pubkey)]);
-        let response = self
-            .client
-            .send(&RpcRequest::GetAccountInfo, Some(params), 0);
-
-        response
-            .and_then(|account_json| {
-                let account: Account =
-                    serde_json::from_value(account_json).expect("deserialize account");
-                trace!("Response account {:?} {:?}", pubkey, account);
-                trace!("get_balance {:?}", account.lamports);
-                Ok(account.lamports)
-            })
-            .map_err(|error| {
-                debug!("Response account {}: None (error: {:?})", pubkey, error);
-                io::Error::new(io::ErrorKind::Other, "AccountNotFound")
-            })
-    }
-
-    /// Request the transaction count.  If the response packet is dropped by the network,
-    /// this method will try again 5 times.
-    pub fn get_transaction_count(&self) -> io::Result<u64> {
-        debug!("get_transaction_count");
-
-        let mut num_retries = 5;
-        while num_retries > 0 {
-            let response = self.client.send(&RpcRequest::GetTransactionCount, None, 0);
-
-            match response {
-                Ok(value) => {
-                    debug!("transaction_count response: {:?}", value);
-                    if let Some(transaction_count) = value.as_u64() {
-                        return Ok(transaction_count);
-                    }
-                }
-                Err(err) => {
-                    debug!("transaction_count failed: {:?}", err);
-                }
-            }
-            num_retries -= 1;
-        }
-        Err(io::Error::new(
-            io::ErrorKind::Other,
-            "Unable to get transaction count, too many retries",
-        ))?
-    }
-
-    pub fn get_recent_blockhash(&self) -> io::Result<Hash> {
-        let mut num_retries = 5;
-        while num_retries > 0 {
-            match self.client.send(&RpcRequest::GetRecentBlockhash, None, 0) {
-                Ok(value) => {
-                    if let Some(blockhash_str) = value.as_str() {
-                        let blockhash_vec = bs58::decode(blockhash_str)
-                            .into_vec()
-                            .expect("bs58::decode");
-                        return Ok(Hash::new(&blockhash_vec));
-                    }
-                }
-                Err(err) => {
-                    debug!("retry_get_recent_blockhash failed: {:?}", err);
-                }
-            }
-            num_retries -= 1;
-        }
-        Err(io::Error::new(
-            io::ErrorKind::Other,
-            "Unable to get recent blockhash, too many retries",
-        ))
-    }
-
-    pub fn get_new_blockhash(&self, blockhash: &Hash) -> io::Result<Hash> {
-        let mut num_retries = 10;
-        while num_retries > 0 {
-            if let Ok(new_blockhash) = self.get_recent_blockhash() {
-                if new_blockhash != *blockhash {
-                    return Ok(new_blockhash);
-                }
-            }
-            debug!("Got same blockhash ({:?}), will retry...", blockhash);
-
-            // Retry ~twice during a slot
-            sleep(Duration::from_millis(
-                500 * DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND,
-            ));
-            num_retries -= 1;
-        }
-        Err(io::Error::new(
-            io::ErrorKind::Other,
-            "Unable to get new blockhash, too many retries",
-        ))
-    }
-
-    pub fn poll_balance_with_timeout(
-        &self,
-        pubkey: &Pubkey,
-        polling_frequency: &Duration,
-        timeout: &Duration,
-    ) -> io::Result<u64> {
-        let now = Instant::now();
-        loop {
-            match self.get_balance(&pubkey) {
-                Ok(bal) => {
-                    return Ok(bal);
-                }
-                Err(e) => {
-                    sleep(*polling_frequency);
-                    if now.elapsed() > *timeout {
-                        return Err(e);
-                    }
-                }
-            };
-        }
-    }
-
-    pub fn poll_get_balance(&self, pubkey: &Pubkey) -> io::Result<u64> {
-        self.poll_balance_with_timeout(pubkey, &Duration::from_millis(100), &Duration::from_secs(1))
-    }
-
-    pub fn wait_for_balance(&self, pubkey: &Pubkey, expected_balance: Option<u64>) -> Option<u64> {
-        const LAST: usize = 30;
-        for run in 0..LAST {
-            let balance_result = self.poll_get_balance(pubkey);
-            if expected_balance.is_none() {
-                return balance_result.ok();
-            }
-            trace!(
-                "retry_get_balance[{}] {:?} {:?}",
-                run,
-                balance_result,
-                expected_balance
-            );
-            if let (Some(expected_balance), Ok(balance_result)) = (expected_balance, balance_result)
-            {
-                if expected_balance == balance_result {
-                    return Some(balance_result);
-                }
-            }
-        }
-        None
-    }
-
-    /// Poll the server to confirm a transaction.
-    pub fn poll_for_signature(&self, signature: &Signature) -> io::Result<()> {
-        let now = Instant::now();
-        while !self.check_signature(signature) {
-            if now.elapsed().as_secs() > 15 {
-                // TODO: Return a better error.
-                return Err(io::Error::new(io::ErrorKind::Other, "signature not found"));
-            }
-            sleep(Duration::from_millis(250));
-        }
-        Ok(())
-    }
-
-    /// Check a signature in the bank.
-    pub fn check_signature(&self, signature: &Signature) -> bool {
-        trace!("check_signature: {:?}", signature);
-        let params = json!([format!("{}", signature)]);
-
-        for _ in 0..30 {
-            let response =
-                self.client
-                    .send(&RpcRequest::ConfirmTransaction, Some(params.clone()), 0);
-
-            match response {
-                Ok(confirmation) => {
-                    let signature_status = confirmation.as_bool().unwrap();
-                    if signature_status {
-                        trace!("Response found signature");
-                    } else {
-                        trace!("Response signature not found");
-                    }
-
-                    return signature_status;
-                }
-                Err(err) => {
-                    debug!("check_signature request failed: {:?}", err);
-                }
-            };
-            sleep(Duration::from_millis(250));
-        }
-
-        panic!("Couldn't check signature of {}", signature);
-    }
-
-    /// Poll the server to confirm a transaction.
-    pub fn poll_for_signature_confirmation(
-        &self,
-        signature: &Signature,
-        min_confirmed_blocks: usize,
-    ) -> io::Result<()> {
-        let mut now = Instant::now();
-        let mut confirmed_blocks = 0;
-        loop {
-            let response = self.get_num_blocks_since_signature_confirmation(signature);
-            match response {
-                Ok(count) => {
-                    if confirmed_blocks != count {
-                        info!(
-                            "signature {} confirmed {} out of {}",
-                            signature, count, min_confirmed_blocks
-                        );
-                        now = Instant::now();
-                        confirmed_blocks = count;
-                    }
-                    if count >= min_confirmed_blocks {
-                        break;
-                    }
-                }
-                Err(err) => {
-                    debug!("check_confirmations request failed: {:?}", err);
-                }
-            };
-            if now.elapsed().as_secs() > 15 {
-                // TODO: Return a better error.
-                return Err(io::Error::new(io::ErrorKind::Other, "signature not found"));
-            }
-            sleep(Duration::from_millis(250));
-        }
-        Ok(())
-    }
-
-    pub fn get_num_blocks_since_signature_confirmation(
-        &self,
-        sig: &Signature,
-    ) -> io::Result<usize> {
-        let params = json!([format!("{}", sig)]);
-        let response = self
-            .client
-            .send(
-                &RpcRequest::GetNumBlocksSinceSignatureConfirmation,
-                Some(params.clone()),
-                1,
-            )
-            .map_err(|error| {
-                debug!(
-                    "Response get_num_blocks_since_signature_confirmation: {:?}",
-                    error
-                );
-                io::Error::new(
-                    io::ErrorKind::Other,
-                    "GetNumBlocksSinceSignatureConfirmation request failure",
-                )
-            })?;
-        serde_json::from_value(response).map_err(|error| {
-            debug!(
-                "ParseError: get_num_blocks_since_signature_confirmation: {}",
-                error
-            );
-            io::Error::new(
-                io::ErrorKind::Other,
-                "GetNumBlocksSinceSignatureConfirmation parse failure",
-            )
-        })
-    }
-
-    pub fn fullnode_exit(&self) -> io::Result<bool> {
-        let response = self
-            .client
-            .send(&RpcRequest::FullnodeExit, None, 0)
-            .map_err(|err| {
-                io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("FullnodeExit request failure: {:?}", err),
-                )
-            })?;
-        serde_json::from_value(response).map_err(|err| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("FullnodeExit parse failure: {:?}", err),
-            )
-        })
-    }
-
-    // TODO: Remove
-    pub fn retry_make_rpc_request(
-        &self,
-        request: &RpcRequest,
-        params: Option<Value>,
-        retries: usize,
-    ) -> Result<Value, ClientError> {
-        self.client.send(request, params, retries)
-    }
-}
-
-pub fn get_rpc_request_str(rpc_addr: SocketAddr, tls: bool) -> String {
-    if tls {
-        format!("https://{}", rpc_addr)
-    } else {
-        format!("http://{}", rpc_addr)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::mock_rpc_client_request::{PUBKEY, SIGNATURE};
-    use jsonrpc_core::{Error, IoHandler, Params};
-    use jsonrpc_http_server::{AccessControlAllowOrigin, DomainsValidation, ServerBuilder};
-    use serde_json::Number;
-    use solana_logger;
-    use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::system_transaction;
-    use solana_sdk::transaction::TransactionError;
-    use std::sync::mpsc::channel;
-    use std::thread;
-
-    #[test]
-    fn test_make_rpc_request() {
-        let (sender, receiver) = channel();
-        thread::spawn(move || {
-            let rpc_addr = "0.0.0.0:0".parse().unwrap();
-            let mut io = IoHandler::default();
-            // Successful request
-            io.add_method("getBalance", |_params: Params| {
-                Ok(Value::Number(Number::from(50)))
-            });
-            // Failed request
-            io.add_method("getRecentBlockhash", |params: Params| {
-                if params != Params::None {
-                    Err(Error::invalid_request())
-                } else {
-                    Ok(Value::String(
-                        "deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx".to_string(),
-                    ))
-                }
-            });
-
-            let server = ServerBuilder::new(io)
-                .threads(1)
-                .cors(DomainsValidation::AllowOnly(vec![
-                    AccessControlAllowOrigin::Any,
-                ]))
-                .start_http(&rpc_addr)
-                .expect("Unable to start RPC server");
-            sender.send(*server.address()).unwrap();
-            server.wait();
-        });
-
-        let rpc_addr = receiver.recv().unwrap();
-        let rpc_client = RpcClient::new_socket(rpc_addr);
-
-        let balance = rpc_client.retry_make_rpc_request(
-            &RpcRequest::GetBalance,
-            Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"])),
-            0,
-        );
-        assert_eq!(balance.unwrap().as_u64().unwrap(), 50);
-
-        let blockhash = rpc_client.retry_make_rpc_request(&RpcRequest::GetRecentBlockhash, None, 0);
-        assert_eq!(
-            blockhash.unwrap().as_str().unwrap(),
-            "deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"
-        );
-
-        // Send erroneous parameter
-        let blockhash = rpc_client.retry_make_rpc_request(
-            &RpcRequest::GetRecentBlockhash,
-            Some(json!("paramter")),
-            0,
-        );
-        assert_eq!(blockhash.is_err(), true);
-    }
-
-    #[test]
-    fn test_retry_make_rpc_request() {
-        solana_logger::setup();
-        let (sender, receiver) = channel();
-        thread::spawn(move || {
-            // 1. Pick a random port
-            // 2. Tell the client to start using it
-            // 3. Delay for 1.5 seconds before starting the server to ensure the client will fail
-            //    and need to retry
-            let rpc_addr: SocketAddr = "0.0.0.0:4242".parse().unwrap();
-            sender.send(rpc_addr.clone()).unwrap();
-            sleep(Duration::from_millis(1500));
-
-            let mut io = IoHandler::default();
-            io.add_method("getBalance", move |_params: Params| {
-                Ok(Value::Number(Number::from(5)))
-            });
-            let server = ServerBuilder::new(io)
-                .threads(1)
-                .cors(DomainsValidation::AllowOnly(vec![
-                    AccessControlAllowOrigin::Any,
-                ]))
-                .start_http(&rpc_addr)
-                .expect("Unable to start RPC server");
-            server.wait();
-        });
-
-        let rpc_addr = receiver.recv().unwrap();
-        let rpc_client = RpcClient::new_socket(rpc_addr);
-
-        let balance = rpc_client.retry_make_rpc_request(
-            &RpcRequest::GetBalance,
-            Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhw"])),
-            10,
-        );
-        assert_eq!(balance.unwrap().as_u64().unwrap(), 5);
-    }
-
-    #[test]
-    fn test_send_transaction() {
-        let rpc_client = RpcClient::new_mock("succeeds".to_string());
-
-        let key = Keypair::new();
-        let to = Pubkey::new_rand();
-        let blockhash = Hash::default();
-        let tx = system_transaction::create_user_account(&key, &to, 50, blockhash, 0);
-
-        let signature = rpc_client.send_transaction(&tx);
-        assert_eq!(signature.unwrap(), SIGNATURE.to_string());
-
-        let rpc_client = RpcClient::new_mock("fails".to_string());
-
-        let signature = rpc_client.send_transaction(&tx);
-        assert!(signature.is_err());
-    }
-    #[test]
-    fn test_get_recent_blockhash() {
-        let rpc_client = RpcClient::new_mock("succeeds".to_string());
-
-        let vec = bs58::decode(PUBKEY).into_vec().unwrap();
-        let expected_blockhash = Hash::new(&vec);
-
-        let blockhash = dbg!(rpc_client.get_recent_blockhash()).expect("blockhash ok");
-        assert_eq!(blockhash, expected_blockhash);
-
-        let rpc_client = RpcClient::new_mock("fails".to_string());
-
-        let blockhash = dbg!(rpc_client.get_recent_blockhash());
-        assert!(blockhash.is_err());
-    }
-
-    #[test]
-    fn test_get_signature_status() {
-        let rpc_client = RpcClient::new_mock("succeeds".to_string());
-        let signature = "good_signature";
-        let status = rpc_client.get_signature_status(&signature).unwrap();
-        assert_eq!(status, Some(Ok(())));
-
-        let rpc_client = RpcClient::new_mock("sig_not_found".to_string());
-        let signature = "sig_not_found";
-        let status = rpc_client.get_signature_status(&signature).unwrap();
-        assert_eq!(status, None);
-
-        let rpc_client = RpcClient::new_mock("account_in_use".to_string());
-        let signature = "account_in_use";
-        let status = rpc_client.get_signature_status(&signature).unwrap();
-        assert_eq!(status, Some(Err(TransactionError::AccountInUse)));
-    }
-
-    #[test]
-    fn test_send_and_confirm_transaction() {
-        let rpc_client = RpcClient::new_mock("succeeds".to_string());
-
-        let key = Keypair::new();
-        let to = Pubkey::new_rand();
-        let blockhash = Hash::default();
-        let mut tx = system_transaction::create_user_account(&key, &to, 50, blockhash, 0);
-
-        let result = rpc_client.send_and_confirm_transaction(&mut tx, &key);
-        result.unwrap();
-
-        let rpc_client = RpcClient::new_mock("account_in_use".to_string());
-        let result = rpc_client.send_and_confirm_transaction(&mut tx, &key);
-        assert!(result.is_err());
-
-        let rpc_client = RpcClient::new_mock("fails".to_string());
-        let result = rpc_client.send_and_confirm_transaction(&mut tx, &key);
-        assert!(result.is_err());
-    }
-
-    #[test]
-    fn test_resign_transaction() {
-        let rpc_client = RpcClient::new_mock("succeeds".to_string());
-
-        let key = Keypair::new();
-        let to = Pubkey::new_rand();
-        let vec = bs58::decode("HUu3LwEzGRsUkuJS121jzkPJW39Kq62pXCTmTa1F9jDL")
-            .into_vec()
-            .unwrap();
-        let blockhash = Hash::new(&vec);
-        let prev_tx = system_transaction::create_user_account(&key, &to, 50, blockhash, 0);
-        let mut tx = system_transaction::create_user_account(&key, &to, 50, blockhash, 0);
-
-        rpc_client.resign_transaction(&mut tx, &key).unwrap();
-
-        assert_ne!(prev_tx, tx);
-        assert_ne!(prev_tx.signatures, tx.signatures);
-        assert_ne!(
-            prev_tx.message().recent_blockhash,
-            tx.message().recent_blockhash
-        );
-    }
-
-    #[test]
-    fn test_rpc_client_thread() {
-        let rpc_client = RpcClient::new_mock("succeeds".to_string());
-        thread::spawn(move || rpc_client);
-    }
-}

client/src/rpc_client_request.rs

@@ -1,82 +0,0 @@
-use crate::client_error::ClientError;
-use crate::generic_rpc_client_request::GenericRpcClientRequest;
-use crate::rpc_request::{RpcError, RpcRequest};
-use log::*;
-use reqwest;
-use reqwest::header::CONTENT_TYPE;
-use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND};
-use std::thread::sleep;
-use std::time::Duration;
-
-pub struct RpcClientRequest {
-    client: reqwest::Client,
-    url: String,
-}
-
-impl RpcClientRequest {
-    pub fn new(url: String) -> Self {
-        Self {
-            client: reqwest::Client::new(),
-            url,
-        }
-    }
-
-    pub fn new_with_timeout(url: String, timeout: Duration) -> Self {
-        let client = reqwest::Client::builder()
-            .timeout(timeout)
-            .build()
-            .expect("build rpc client");
-
-        Self { client, url }
-    }
-}
-
-impl GenericRpcClientRequest for RpcClientRequest {
-    fn send(
-        &self,
-        request: &RpcRequest,
-        params: Option<serde_json::Value>,
-        mut retries: usize,
-    ) -> Result<serde_json::Value, ClientError> {
-        // Concurrent requests are not supported so reuse the same request id for all requests
-        let request_id = 1;
-
-        let request_json = request.build_request_json(request_id, params);
-
-        loop {
-            match self
-                .client
-                .post(&self.url)
-                .header(CONTENT_TYPE, "application/json")
-                .body(request_json.to_string())
-                .send()
-            {
-                Ok(mut response) => {
-                    let json: serde_json::Value = serde_json::from_str(&response.text()?)?;
-                    if json["error"].is_object() {
-                        Err(RpcError::RpcRequestError(format!(
-                            "RPC Error response: {}",
-                            serde_json::to_string(&json["error"]).unwrap()
-                        )))?
-                    }
-                    return Ok(json["result"].clone());
-                }
-                Err(e) => {
-                    info!(
-                        "make_rpc_request({:?}) failed, {} retries left: {:?}",
-                        request, retries, e
-                    );
-                    if retries == 0 {
-                        Err(e)?;
-                    }
-                    retries -= 1;
-
-                    // Sleep for approximately half a slot
-                    sleep(Duration::from_millis(
-                        500 * DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND,
-                    ));
-                }
-            }
-        }
-    }
-}

client/src/rpc_mock.rs

@@ -0,0 +1,111 @@
+// Implementation of RpcRequestHandler trait for testing Rpc requests without i/o
+
+use crate::rpc_request::{RpcRequest, RpcRequestHandler};
+use serde_json::{json, Number, Value};
+use solana_sdk::hash::Hash;
+use solana_sdk::pubkey::Pubkey;
+use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::system_transaction::SystemTransaction;
+use solana_sdk::transaction::Transaction;
+use std::error;
+use std::io::{Error, ErrorKind};
+use std::net::SocketAddr;
+
+pub const PUBKEY: &str = "7RoSF9fUmdphVCpabEoefH81WwrW7orsWonXWqTXkKV8";
+pub const SIGNATURE: &str =
+    "43yNSFC6fYTuPgTNFFhF4axw7AfWxB2BPdurme8yrsWEYwm8299xh8n6TAHjGymiSub1XtyxTNyd9GBfY2hxoBw8";
+
+#[derive(Clone)]
+pub struct MockRpcClient {
+    pub addr: String,
+}
+
+impl MockRpcClient {
+    pub fn new(addr: String) -> Self {
+        MockRpcClient { addr }
+    }
+
+    pub fn retry_get_balance(
+        &self,
+        id: u64,
+        pubkey: &Pubkey,
+        retries: usize,
+    ) -> Result<Option<u64>, Box<dyn error::Error>> {
+        let params = json!([format!("{}", pubkey)]);
+        let res = self
+            .retry_make_rpc_request(id, &RpcRequest::GetBalance, Some(params), retries)?
+            .as_u64();
+        Ok(res)
+    }
+
+    pub fn retry_make_rpc_request(
+        &self,
+        _id: u64,
+        request: &RpcRequest,
+        params: Option<Value>,
+        mut _retries: usize,
+    ) -> Result<Value, Box<dyn error::Error>> {
+        if self.addr == "fails" {
+            return Ok(Value::Null);
+        }
+        let val = match request {
+            RpcRequest::ConfirmTransaction => {
+                if let Some(Value::Array(param_array)) = params {
+                    if let Value::String(param_string) = &param_array[0] {
+                        Value::Bool(param_string == SIGNATURE)
+                    } else {
+                        Value::Null
+                    }
+                } else {
+                    Value::Null
+                }
+            }
+            RpcRequest::GetBalance => {
+                let n = if self.addr == "airdrop" { 0 } else { 50 };
+                Value::Number(Number::from(n))
+            }
+            RpcRequest::GetRecentBlockhash => Value::String(PUBKEY.to_string()),
+            RpcRequest::GetSignatureStatus => {
+                let str = if self.addr == "account_in_use" {
+                    "AccountInUse"
+                } else if self.addr == "bad_sig_status" {
+                    "Nonexistent"
+                } else {
+                    "Confirmed"
+                };
+                Value::String(str.to_string())
+            }
+            RpcRequest::GetTransactionCount => Value::Number(Number::from(1234)),
+            RpcRequest::SendTransaction => Value::String(SIGNATURE.to_string()),
+            _ => Value::Null,
+        };
+        Ok(val)
+    }
+}
+
+impl RpcRequestHandler for MockRpcClient {
+    fn make_rpc_request(
+        &self,
+        id: u64,
+        request: RpcRequest,
+        params: Option<Value>,
+    ) -> Result<Value, Box<dyn error::Error>> {
+        self.retry_make_rpc_request(id, &request, params, 0)
+    }
+}
+
+pub fn request_airdrop_transaction(
+    _drone_addr: &SocketAddr,
+    _id: &Pubkey,
+    lamports: u64,
+    _blockhash: Hash,
+) -> Result<Transaction, Error> {
+    if lamports == 0 {
+        Err(Error::new(ErrorKind::Other, "Airdrop failed"))?
+    }
+    let key = Keypair::new();
+    let to = Keypair::new().pubkey();
+    let blockhash = Hash::default();
+    let tx = SystemTransaction::new_account(&key, &to, lamports, blockhash, 0);
+    Ok(tx)
+}

client/src/rpc_request.rs

@@ -1,52 +1,168 @@
+use log::*;
+use reqwest;
+use reqwest::header::CONTENT_TYPE;
 use serde_json::{json, Value};
+use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND};
+use std::net::SocketAddr;
+use std::thread::sleep;
+use std::time::Duration;
 use std::{error, fmt};
 
+use solana_sdk::pubkey::Pubkey;
+
+#[derive(Clone)]
+pub struct RpcClient {
+    pub client: reqwest::Client,
+    pub addr: String,
+}
+
+impl RpcClient {
+    pub fn new(addr: String) -> Self {
+        RpcClient {
+            client: reqwest::Client::new(),
+            addr,
+        }
+    }
+
+    pub fn new_with_timeout(addr: SocketAddr, timeout: Duration) -> Self {
+        let addr = get_rpc_request_str(addr, false);
+        let client = reqwest::Client::builder()
+            .timeout(timeout)
+            .build()
+            .expect("build rpc client");
+        RpcClient { client, addr }
+    }
+
+    pub fn new_from_socket(addr: SocketAddr) -> Self {
+        Self::new(get_rpc_request_str(addr, false))
+    }
+
+    pub fn retry_get_balance(
+        &self,
+        id: u64,
+        pubkey: &Pubkey,
+        retries: usize,
+    ) -> Result<Option<u64>, Box<dyn error::Error>> {
+        let params = json!([format!("{}", pubkey)]);
+        let res = self
+            .retry_make_rpc_request(id, &RpcRequest::GetBalance, Some(params), retries)?
+            .as_u64();
+        Ok(res)
+    }
+
+    pub fn retry_make_rpc_request(
+        &self,
+        id: u64,
+        request: &RpcRequest,
+        params: Option<Value>,
+        mut retries: usize,
+    ) -> Result<Value, Box<dyn error::Error>> {
+        let request_json = request.build_request_json(id, params);
+
+        loop {
+            match self
+                .client
+                .post(&self.addr)
+                .header(CONTENT_TYPE, "application/json")
+                .body(request_json.to_string())
+                .send()
+            {
+                Ok(mut response) => {
+                    let json: Value = serde_json::from_str(&response.text()?)?;
+                    if json["error"].is_object() {
+                        Err(RpcError::RpcRequestError(format!(
+                            "RPC Error response: {}",
+                            serde_json::to_string(&json["error"]).unwrap()
+                        )))?
+                    }
+                    return Ok(json["result"].clone());
+                }
+                Err(e) => {
+                    info!(
+                        "make_rpc_request() failed, {} retries left: {:?}",
+                        retries, e
+                    );
+                    if retries == 0 {
+                        Err(e)?;
+                    }
+                    retries -= 1;
+
+                    // Sleep for approximately half a slot
+                    sleep(Duration::from_millis(
+                        500 * DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND,
+                    ));
+                }
+            }
+        }
+    }
+}
+
+pub fn get_rpc_request_str(rpc_addr: SocketAddr, tls: bool) -> String {
+    if tls {
+        format!("https://{}", rpc_addr)
+    } else {
+        format!("http://{}", rpc_addr)
+    }
+}
+
+pub trait RpcRequestHandler {
+    fn make_rpc_request(
+        &self,
+        id: u64,
+        request: RpcRequest,
+        params: Option<Value>,
+    ) -> Result<Value, Box<dyn error::Error>>;
+}
+
+impl RpcRequestHandler for RpcClient {
+    fn make_rpc_request(
+        &self,
+        id: u64,
+        request: RpcRequest,
+        params: Option<Value>,
+    ) -> Result<Value, Box<dyn error::Error>> {
+        self.retry_make_rpc_request(id, &request, params, 0)
+    }
+}
+
 #[derive(Debug, PartialEq)]
 pub enum RpcRequest {
     ConfirmTransaction,
-    DeregisterNode,
-    FullnodeExit,
     GetAccountInfo,
     GetBalance,
-    GetClusterNodes,
-    GetNumBlocksSinceSignatureConfirmation,
     GetRecentBlockhash,
     GetSignatureStatus,
-    GetSlotLeader,
+    GetTransactionCount,
+    RequestAirdrop,
+    SendTransaction,
+    RegisterNode,
+    SignVote,
+    DeregisterNode,
     GetStorageBlockhash,
     GetStorageEntryHeight,
     GetStoragePubkeysForEntryHeight,
-    GetTransactionCount,
-    RegisterNode,
-    RequestAirdrop,
-    SendTransaction,
-    SignVote,
+    FullnodeExit,
 }
 
 impl RpcRequest {
-    pub(crate) fn build_request_json(&self, id: u64, params: Option<Value>) -> Value {
+    fn build_request_json(&self, id: u64, params: Option<Value>) -> Value {
         let jsonrpc = "2.0";
         let method = match self {
             RpcRequest::ConfirmTransaction => "confirmTransaction",
-            RpcRequest::DeregisterNode => "deregisterNode",
-            RpcRequest::FullnodeExit => "fullnodeExit",
             RpcRequest::GetAccountInfo => "getAccountInfo",
             RpcRequest::GetBalance => "getBalance",
-            RpcRequest::GetClusterNodes => "getClusterNodes",
-            RpcRequest::GetNumBlocksSinceSignatureConfirmation => {
-                "getNumBlocksSinceSignatureConfirmation"
-            }
             RpcRequest::GetRecentBlockhash => "getRecentBlockhash",
             RpcRequest::GetSignatureStatus => "getSignatureStatus",
-            RpcRequest::GetSlotLeader => "getSlotLeader",
+            RpcRequest::GetTransactionCount => "getTransactionCount",
+            RpcRequest::RequestAirdrop => "requestAirdrop",
+            RpcRequest::SendTransaction => "sendTransaction",
+            RpcRequest::RegisterNode => "registerNode",
+            RpcRequest::SignVote => "signVote",
+            RpcRequest::DeregisterNode => "deregisterNode",
             RpcRequest::GetStorageBlockhash => "getStorageBlockhash",
             RpcRequest::GetStorageEntryHeight => "getStorageEntryHeight",
             RpcRequest::GetStoragePubkeysForEntryHeight => "getStoragePubkeysForEntryHeight",
-            RpcRequest::GetTransactionCount => "getTransactionCount",
-            RpcRequest::RegisterNode => "registerNode",
-            RpcRequest::RequestAirdrop => "requestAirdrop",
-            RpcRequest::SendTransaction => "sendTransaction",
-            RpcRequest::SignVote => "signVote",
+            RpcRequest::FullnodeExit => "fullnodeExit",
         };
         let mut request = json!({
            "jsonrpc": jsonrpc,
@@ -85,6 +201,12 @@ impl error::Error for RpcError {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use jsonrpc_core::{Error, IoHandler, Params};
+    use jsonrpc_http_server::{AccessControlAllowOrigin, DomainsValidation, ServerBuilder};
+    use serde_json::Number;
+    use solana_logger;
+    use std::sync::mpsc::channel;
+    use std::thread;
 
     #[test]
     fn test_build_request_json() {
@@ -114,4 +236,96 @@ mod tests {
         let request = test_request.build_request_json(1, None);
         assert_eq!(request["method"], "sendTransaction");
     }
+    #[test]
+    fn test_make_rpc_request() {
+        let (sender, receiver) = channel();
+        thread::spawn(move || {
+            let rpc_addr = "0.0.0.0:0".parse().unwrap();
+            let mut io = IoHandler::default();
+            // Successful request
+            io.add_method("getBalance", |_params: Params| {
+                Ok(Value::Number(Number::from(50)))
+            });
+            // Failed request
+            io.add_method("getRecentBlockhash", |params: Params| {
+                if params != Params::None {
+                    Err(Error::invalid_request())
+                } else {
+                    Ok(Value::String(
+                        "deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx".to_string(),
+                    ))
+                }
+            });
+
+            let server = ServerBuilder::new(io)
+                .threads(1)
+                .cors(DomainsValidation::AllowOnly(vec![
+                    AccessControlAllowOrigin::Any,
+                ]))
+                .start_http(&rpc_addr)
+                .expect("Unable to start RPC server");
+            sender.send(*server.address()).unwrap();
+            server.wait();
+        });
+
+        let rpc_addr = receiver.recv().unwrap();
+        let rpc_client = RpcClient::new_from_socket(rpc_addr);
+
+        let balance = rpc_client.make_rpc_request(
+            1,
+            RpcRequest::GetBalance,
+            Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"])),
+        );
+        assert_eq!(balance.unwrap().as_u64().unwrap(), 50);
+
+        let blockhash = rpc_client.make_rpc_request(2, RpcRequest::GetRecentBlockhash, None);
+        assert_eq!(
+            blockhash.unwrap().as_str().unwrap(),
+            "deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"
+        );
+
+        // Send erroneous parameter
+        let blockhash =
+            rpc_client.make_rpc_request(3, RpcRequest::GetRecentBlockhash, Some(json!("paramter")));
+        assert_eq!(blockhash.is_err(), true);
+    }
+
+    #[test]
+    fn test_retry_make_rpc_request() {
+        solana_logger::setup();
+        let (sender, receiver) = channel();
+        thread::spawn(move || {
+            // 1. Pick a random port
+            // 2. Tell the client to start using it
+            // 3. Delay for 1.5 seconds before starting the server to ensure the client will fail
+            //    and need to retry
+            let rpc_addr: SocketAddr = "0.0.0.0:4242".parse().unwrap();
+            sender.send(rpc_addr.clone()).unwrap();
+            sleep(Duration::from_millis(1500));
+
+            let mut io = IoHandler::default();
+            io.add_method("getBalance", move |_params: Params| {
+                Ok(Value::Number(Number::from(5)))
+            });
+            let server = ServerBuilder::new(io)
+                .threads(1)
+                .cors(DomainsValidation::AllowOnly(vec![
+                    AccessControlAllowOrigin::Any,
+                ]))
+                .start_http(&rpc_addr)
+                .expect("Unable to start RPC server");
+            server.wait();
+        });
+
+        let rpc_addr = receiver.recv().unwrap();
+        let rpc_client = RpcClient::new_from_socket(rpc_addr);
+
+        let balance = rpc_client.retry_make_rpc_request(
+            1,
+            &RpcRequest::GetBalance,
+            Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhw"])),
+            10,
+        );
+        assert_eq!(balance.unwrap().as_u64().unwrap(), 5);
+    }
 }

client/src/thin_client.rs

@@ -3,25 +3,31 @@
 //! messages to the network directly. The binary encoding of its messages are
 //! unstable and may change in future releases.
 
-use crate::rpc_client::RpcClient;
-use bincode::{serialize_into, serialized_size};
+use crate::rpc_request::{RpcClient, RpcRequest, RpcRequestHandler};
+use bincode::serialize_into;
+use bs58;
 use log::*;
-use solana_sdk::client::{AsyncClient, Client, SyncClient};
+use serde_json::json;
+use solana_metrics;
+use solana_metrics::influxdb;
+use solana_sdk::account::Account;
 use solana_sdk::hash::Hash;
-use solana_sdk::instruction::Instruction;
-use solana_sdk::message::Message;
 use solana_sdk::packet::PACKET_DATA_SIZE;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
-use solana_sdk::system_instruction;
-use solana_sdk::transaction::{self, Transaction};
-use solana_sdk::transport::Result as TransportResult;
+use solana_sdk::system_transaction::SystemTransaction;
+use solana_sdk::timing;
+use solana_sdk::transaction::Transaction;
+use std;
 use std::io;
 use std::net::{SocketAddr, UdpSocket};
+use std::thread::sleep;
 use std::time::Duration;
+use std::time::Instant;
 
 /// An object for querying and sending transactions to the network.
 pub struct ThinClient {
+    rpc_addr: SocketAddr,
     transactions_addr: SocketAddr,
     transactions_socket: UdpSocket,
     rpc_client: RpcClient,
@@ -36,213 +42,41 @@ impl ThinClient {
         transactions_socket: UdpSocket,
     ) -> Self {
         Self::new_from_client(
+            rpc_addr,
             transactions_addr,
             transactions_socket,
-            RpcClient::new_socket(rpc_addr),
+            RpcClient::new_from_socket(rpc_addr),
         )
     }
 
-    pub fn new_socket_with_timeout(
+    pub fn new_with_timeout(
         rpc_addr: SocketAddr,
         transactions_addr: SocketAddr,
         transactions_socket: UdpSocket,
         timeout: Duration,
     ) -> Self {
-        let rpc_client = RpcClient::new_socket_with_timeout(rpc_addr, timeout);
-        Self::new_from_client(transactions_addr, transactions_socket, rpc_client)
+        let rpc_client = RpcClient::new_with_timeout(rpc_addr, timeout);
+        Self::new_from_client(rpc_addr, transactions_addr, transactions_socket, rpc_client)
     }
 
     fn new_from_client(
+        rpc_addr: SocketAddr,
         transactions_addr: SocketAddr,
         transactions_socket: UdpSocket,
         rpc_client: RpcClient,
     ) -> Self {
-        Self {
+        ThinClient {
             rpc_client,
+            rpc_addr,
             transactions_addr,
             transactions_socket,
         }
     }
 
-    /// Retry a sending a signed Transaction to the server for processing.
-    pub fn retry_transfer_until_confirmed(
-        &self,
-        keypair: &Keypair,
-        transaction: &mut Transaction,
-        tries: usize,
-        min_confirmed_blocks: usize,
-    ) -> io::Result<Signature> {
-        self.send_and_confirm_transaction(&[keypair], transaction, tries, min_confirmed_blocks)
-    }
-
-    /// Retry sending a signed Transaction with one signing Keypair to the server for processing.
-    pub fn retry_transfer(
-        &self,
-        keypair: &Keypair,
-        transaction: &mut Transaction,
-        tries: usize,
-    ) -> io::Result<Signature> {
-        self.send_and_confirm_transaction(&[keypair], transaction, tries, 0)
-    }
-
-    /// Retry sending a signed Transaction to the server for processing
-    pub fn send_and_confirm_transaction(
-        &self,
-        keypairs: &[&Keypair],
-        transaction: &mut Transaction,
-        tries: usize,
-        min_confirmed_blocks: usize,
-    ) -> io::Result<Signature> {
-        for x in 0..tries {
-            let mut buf = vec![0; serialized_size(&transaction).unwrap() as usize];
-            let mut wr = std::io::Cursor::new(&mut buf[..]);
-            serialize_into(&mut wr, &transaction)
-                .expect("serialize Transaction in pub fn transfer_signed");
-            self.transactions_socket
-                .send_to(&buf[..], &self.transactions_addr)?;
-            if self
-                .poll_for_signature_confirmation(&transaction.signatures[0], min_confirmed_blocks)
-                .is_ok()
-            {
-                return Ok(transaction.signatures[0]);
-            }
-            info!("{} tries failed transfer to {}", x, self.transactions_addr);
-            transaction.sign(keypairs, self.rpc_client.get_recent_blockhash()?);
-        }
-        Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!("retry_transfer failed in {} retries", tries),
-        ))
-    }
-
-    pub fn get_new_blockhash(&self, blockhash: &Hash) -> io::Result<Hash> {
-        self.rpc_client.get_new_blockhash(blockhash)
-    }
-
-    pub fn poll_balance_with_timeout(
-        &self,
-        pubkey: &Pubkey,
-        polling_frequency: &Duration,
-        timeout: &Duration,
-    ) -> io::Result<u64> {
-        self.rpc_client
-            .poll_balance_with_timeout(pubkey, polling_frequency, timeout)
-    }
-
-    pub fn poll_get_balance(&self, pubkey: &Pubkey) -> io::Result<u64> {
-        self.rpc_client.poll_get_balance(pubkey)
-    }
-
-    pub fn wait_for_balance(&self, pubkey: &Pubkey, expected_balance: Option<u64>) -> Option<u64> {
-        self.rpc_client.wait_for_balance(pubkey, expected_balance)
-    }
-
-    /// Check a signature in the bank. This method blocks
-    /// until the server sends a response.
-    pub fn check_signature(&self, signature: &Signature) -> bool {
-        self.rpc_client.check_signature(signature)
-    }
-
-    pub fn fullnode_exit(&self) -> io::Result<bool> {
-        self.rpc_client.fullnode_exit()
-    }
-    pub fn get_num_blocks_since_signature_confirmation(
-        &mut self,
-        sig: &Signature,
-    ) -> io::Result<usize> {
-        self.rpc_client
-            .get_num_blocks_since_signature_confirmation(sig)
-    }
-}
-
-impl Client for ThinClient {
-    fn transactions_addr(&self) -> String {
-        self.transactions_addr.to_string()
-    }
-}
-
-impl SyncClient for ThinClient {
-    fn send_message(&self, keypairs: &[&Keypair], message: Message) -> TransportResult<Signature> {
-        let blockhash = self.get_recent_blockhash()?;
-        let mut transaction = Transaction::new(&keypairs, message, blockhash);
-        let signature = self.send_and_confirm_transaction(keypairs, &mut transaction, 5, 0)?;
-        Ok(signature)
-    }
-
-    fn send_instruction(
-        &self,
-        keypair: &Keypair,
-        instruction: Instruction,
-    ) -> TransportResult<Signature> {
-        let message = Message::new(vec![instruction]);
-        self.send_message(&[keypair], message)
-    }
-
-    fn transfer(
-        &self,
-        lamports: u64,
-        keypair: &Keypair,
-        pubkey: &Pubkey,
-    ) -> TransportResult<Signature> {
-        let transfer_instruction =
-            system_instruction::transfer(&keypair.pubkey(), pubkey, lamports);
-        self.send_instruction(keypair, transfer_instruction)
-    }
-
-    fn get_account_data(&self, pubkey: &Pubkey) -> TransportResult<Option<Vec<u8>>> {
-        Ok(self.rpc_client.get_account_data(pubkey).ok())
-    }
-
-    fn get_balance(&self, pubkey: &Pubkey) -> TransportResult<u64> {
-        let balance = self.rpc_client.get_balance(pubkey)?;
-        Ok(balance)
-    }
-
-    fn get_signature_status(
-        &self,
-        signature: &Signature,
-    ) -> TransportResult<Option<transaction::Result<()>>> {
-        let status = self
-            .rpc_client
-            .get_signature_status(&signature.to_string())
-            .map_err(|err| {
-                io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("send_transaction failed with error {:?}", err),
-                )
-            })?;
-        Ok(status)
-    }
-
-    fn get_recent_blockhash(&self) -> TransportResult<Hash> {
-        let recent_blockhash = self.rpc_client.get_recent_blockhash()?;
-        Ok(recent_blockhash)
-    }
-
-    fn get_transaction_count(&self) -> TransportResult<u64> {
-        let transaction_count = self.rpc_client.get_transaction_count()?;
-        Ok(transaction_count)
-    }
-
-    /// Poll the server until the signature has been confirmed by at least `min_confirmed_blocks`
-    fn poll_for_signature_confirmation(
-        &self,
-        signature: &Signature,
-        min_confirmed_blocks: usize,
-    ) -> TransportResult<()> {
-        Ok(self
-            .rpc_client
-            .poll_for_signature_confirmation(signature, min_confirmed_blocks)?)
-    }
-
-    fn poll_for_signature(&self, signature: &Signature) -> TransportResult<()> {
-        Ok(self.rpc_client.poll_for_signature(signature)?)
-    }
-}
-
-impl AsyncClient for ThinClient {
-    fn async_send_transaction(&self, transaction: Transaction) -> io::Result<Signature> {
-        let mut buf = vec![0; serialized_size(&transaction).unwrap() as usize];
+    /// Send a signed Transaction to the server for processing. This method
+    /// does not wait for a response.
+    pub fn transfer_signed(&self, transaction: &Transaction) -> io::Result<Signature> {
+        let mut buf = vec![0; transaction.serialized_size().unwrap() as usize];
         let mut wr = std::io::Cursor::new(&mut buf[..]);
         serialize_into(&mut wr, &transaction)
             .expect("serialize Transaction in pub fn transfer_signed");
@@ -251,47 +85,327 @@ impl AsyncClient for ThinClient {
             .send_to(&buf[..], &self.transactions_addr)?;
         Ok(transaction.signatures[0])
     }
-    fn async_send_message(
-        &self,
-        keypairs: &[&Keypair],
-        message: Message,
-        recent_blockhash: Hash,
-    ) -> io::Result<Signature> {
-        let transaction = Transaction::new(&keypairs, message, recent_blockhash);
-        self.async_send_transaction(transaction)
-    }
-    fn async_send_instruction(
-        &self,
+
+    /// Retry a sending a signed Transaction to the server for processing.
+    pub fn retry_transfer(
+        &mut self,
         keypair: &Keypair,
-        instruction: Instruction,
-        recent_blockhash: Hash,
+        transaction: &mut Transaction,
+        tries: usize,
     ) -> io::Result<Signature> {
-        let message = Message::new(vec![instruction]);
-        self.async_send_message(&[keypair], message, recent_blockhash)
+        for x in 0..tries {
+            transaction.sign(&[keypair], self.get_recent_blockhash());
+            let mut buf = vec![0; transaction.serialized_size().unwrap() as usize];
+            let mut wr = std::io::Cursor::new(&mut buf[..]);
+            serialize_into(&mut wr, &transaction)
+                .expect("serialize Transaction in pub fn transfer_signed");
+            self.transactions_socket
+                .send_to(&buf[..], &self.transactions_addr)?;
+            if self.poll_for_signature(&transaction.signatures[0]).is_ok() {
+                return Ok(transaction.signatures[0]);
+            }
+            info!("{} tries failed transfer to {}", x, self.transactions_addr);
+        }
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "retry_transfer failed",
+        ))
     }
-    fn async_transfer(
+
+    /// Creates, signs, and processes a Transaction. Useful for writing unit-tests.
+    pub fn transfer(
         &self,
         lamports: u64,
         keypair: &Keypair,
-        pubkey: &Pubkey,
-        recent_blockhash: Hash,
+        to: &Pubkey,
+        blockhash: &Hash,
     ) -> io::Result<Signature> {
-        let transfer_instruction =
-            system_instruction::transfer(&keypair.pubkey(), pubkey, lamports);
-        self.async_send_instruction(keypair, transfer_instruction, recent_blockhash)
+        debug!(
+            "transfer: lamports={} from={:?} to={:?} blockhash={:?}",
+            lamports,
+            keypair.pubkey(),
+            to,
+            blockhash
+        );
+        let now = Instant::now();
+        let transaction = SystemTransaction::new_account(keypair, to, lamports, *blockhash, 0);
+        let result = self.transfer_signed(&transaction);
+        solana_metrics::submit(
+            influxdb::Point::new("thinclient")
+                .add_tag("op", influxdb::Value::String("transfer".to_string()))
+                .add_field(
+                    "duration_ms",
+                    influxdb::Value::Integer(timing::duration_as_ms(&now.elapsed()) as i64),
+                )
+                .to_owned(),
+        );
+        result
+    }
+
+    pub fn get_account_data(&mut self, pubkey: &Pubkey) -> io::Result<Option<Vec<u8>>> {
+        let params = json!([format!("{}", pubkey)]);
+        let response =
+            self.rpc_client
+                .make_rpc_request(1, RpcRequest::GetAccountInfo, Some(params));
+        match response {
+            Ok(account_json) => {
+                let account: Account =
+                    serde_json::from_value(account_json).expect("deserialize account");
+                Ok(Some(account.data))
+            }
+            Err(error) => {
+                debug!("get_account_data failed: {:?}", error);
+                Err(io::Error::new(
+                    io::ErrorKind::Other,
+                    "get_account_data failed",
+                ))
+            }
+        }
+    }
+
+    /// Request the balance of the user holding `pubkey`. This method blocks
+    /// until the server sends a response. If the response packet is dropped
+    /// by the network, this method will hang indefinitely.
+    pub fn get_balance(&mut self, pubkey: &Pubkey) -> io::Result<u64> {
+        trace!("get_balance sending request to {}", self.rpc_addr);
+        let params = json!([format!("{}", pubkey)]);
+        let response =
+            self.rpc_client
+                .make_rpc_request(1, RpcRequest::GetAccountInfo, Some(params));
+
+        response
+            .and_then(|account_json| {
+                let account: Account =
+                    serde_json::from_value(account_json).expect("deserialize account");
+                trace!("Response account {:?} {:?}", pubkey, account);
+                trace!("get_balance {:?}", account.lamports);
+                Ok(account.lamports)
+            })
+            .map_err(|error| {
+                debug!("Response account {}: None (error: {:?})", pubkey, error);
+                io::Error::new(io::ErrorKind::Other, "AccountNotFound")
+            })
+    }
+
+    /// Request the transaction count.  If the response packet is dropped by the network,
+    /// this method will try again 5 times.
+    pub fn transaction_count(&mut self) -> u64 {
+        debug!("transaction_count");
+        for _tries in 0..5 {
+            let response =
+                self.rpc_client
+                    .make_rpc_request(1, RpcRequest::GetTransactionCount, None);
+
+            match response {
+                Ok(value) => {
+                    debug!("transaction_count response: {:?}", value);
+                    let transaction_count = value.as_u64().unwrap();
+                    return transaction_count;
+                }
+                Err(error) => {
+                    debug!("transaction_count failed: {:?}", error);
+                }
+            };
+        }
+        0
+    }
+
+    /// Request the last Entry ID from the server without blocking.
+    /// Returns the blockhash Hash or None if there was no response from the server.
+    pub fn try_get_recent_blockhash(&mut self, mut num_retries: u64) -> Option<Hash> {
+        loop {
+            trace!("try_get_recent_blockhash send_to {}", &self.rpc_addr);
+            let response =
+                self.rpc_client
+                    .make_rpc_request(1, RpcRequest::GetRecentBlockhash, None);
+
+            match response {
+                Ok(value) => {
+                    let blockhash_str = value.as_str().unwrap();
+                    let blockhash_vec = bs58::decode(blockhash_str).into_vec().unwrap();
+                    return Some(Hash::new(&blockhash_vec));
+                }
+                Err(error) => {
+                    debug!("thin_client get_recent_blockhash error: {:?}", error);
+                    num_retries -= 1;
+                    if num_retries == 0 {
+                        return None;
+                    }
+                }
+            }
+        }
+    }
+
+    /// Request the last Entry ID from the server. This method blocks
+    /// until the server sends a response.
+    pub fn get_recent_blockhash(&mut self) -> Hash {
+        loop {
+            trace!("get_recent_blockhash send_to {}", &self.rpc_addr);
+            if let Some(hash) = self.try_get_recent_blockhash(10) {
+                return hash;
+            }
+        }
+    }
+
+    /// Request a new last Entry ID from the server. This method blocks
+    /// until the server sends a response.
+    pub fn get_next_blockhash(&mut self, previous_blockhash: &Hash) -> Hash {
+        self.get_next_blockhash_ext(previous_blockhash, &|| {
+            sleep(Duration::from_millis(100));
+        })
+    }
+    pub fn get_next_blockhash_ext(&mut self, previous_blockhash: &Hash, func: &Fn()) -> Hash {
+        loop {
+            let blockhash = self.get_recent_blockhash();
+            if blockhash != *previous_blockhash {
+                break blockhash;
+            }
+            debug!("Got same blockhash ({:?}), will retry...", blockhash);
+            func()
+        }
+    }
+
+    pub fn submit_poll_balance_metrics(elapsed: &Duration) {
+        solana_metrics::submit(
+            influxdb::Point::new("thinclient")
+                .add_tag("op", influxdb::Value::String("get_balance".to_string()))
+                .add_field(
+                    "duration_ms",
+                    influxdb::Value::Integer(timing::duration_as_ms(elapsed) as i64),
+                )
+                .to_owned(),
+        );
+    }
+
+    pub fn poll_balance_with_timeout(
+        &mut self,
+        pubkey: &Pubkey,
+        polling_frequency: &Duration,
+        timeout: &Duration,
+    ) -> io::Result<u64> {
+        let now = Instant::now();
+        loop {
+            match self.get_balance(&pubkey) {
+                Ok(bal) => {
+                    ThinClient::submit_poll_balance_metrics(&now.elapsed());
+                    return Ok(bal);
+                }
+                Err(e) => {
+                    sleep(*polling_frequency);
+                    if now.elapsed() > *timeout {
+                        ThinClient::submit_poll_balance_metrics(&now.elapsed());
+                        return Err(e);
+                    }
+                }
+            };
+        }
+    }
+
+    pub fn poll_get_balance(&mut self, pubkey: &Pubkey) -> io::Result<u64> {
+        self.poll_balance_with_timeout(pubkey, &Duration::from_millis(100), &Duration::from_secs(1))
+    }
+
+    /// Poll the server to confirm a transaction.
+    pub fn poll_for_signature(&mut self, signature: &Signature) -> io::Result<()> {
+        let now = Instant::now();
+        while !self.check_signature(signature) {
+            if now.elapsed().as_secs() > 15 {
+                // TODO: Return a better error.
+                return Err(io::Error::new(io::ErrorKind::Other, "signature not found"));
+            }
+            sleep(Duration::from_millis(250));
+        }
+        Ok(())
+    }
+
+    /// Check a signature in the bank. This method blocks
+    /// until the server sends a response.
+    pub fn check_signature(&mut self, signature: &Signature) -> bool {
+        trace!("check_signature: {:?}", signature);
+        let params = json!([format!("{}", signature)]);
+        let now = Instant::now();
+
+        loop {
+            let response = self.rpc_client.make_rpc_request(
+                1,
+                RpcRequest::ConfirmTransaction,
+                Some(params.clone()),
+            );
+
+            match response {
+                Ok(confirmation) => {
+                    let signature_status = confirmation.as_bool().unwrap();
+                    if signature_status {
+                        trace!("Response found signature");
+                    } else {
+                        trace!("Response signature not found");
+                    }
+                    solana_metrics::submit(
+                        influxdb::Point::new("thinclient")
+                            .add_tag("op", influxdb::Value::String("check_signature".to_string()))
+                            .add_field(
+                                "duration_ms",
+                                influxdb::Value::Integer(
+                                    timing::duration_as_ms(&now.elapsed()) as i64
+                                ),
+                            )
+                            .to_owned(),
+                    );
+                    return signature_status;
+                }
+                Err(err) => {
+                    debug!("check_signature request failed: {:?}", err);
+                }
+            };
+        }
+    }
+    pub fn fullnode_exit(&mut self) -> io::Result<bool> {
+        trace!("fullnode_exit sending request to {}", self.rpc_addr);
+        let response = self
+            .rpc_client
+            .make_rpc_request(1, RpcRequest::FullnodeExit, None)
+            .map_err(|error| {
+                debug!("Response from {} fullndoe_exit: {}", self.rpc_addr, error);
+                io::Error::new(io::ErrorKind::Other, "FullodeExit request failure")
+            })?;
+        serde_json::from_value(response).map_err(|error| {
+            debug!(
+                "ParseError: from {} fullndoe_exit: {}",
+                self.rpc_addr, error
+            );
+            io::Error::new(io::ErrorKind::Other, "FullodeExit parse failure")
+        })
     }
 }
 
-pub fn create_client((rpc, tpu): (SocketAddr, SocketAddr), range: (u16, u16)) -> ThinClient {
-    let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap();
-    ThinClient::new(rpc, tpu, transactions_socket)
+impl Drop for ThinClient {
+    fn drop(&mut self) {
+        solana_metrics::flush();
+    }
 }
 
-pub fn create_client_with_timeout(
-    (rpc, tpu): (SocketAddr, SocketAddr),
-    range: (u16, u16),
-    timeout: Duration,
-) -> ThinClient {
-    let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap();
-    ThinClient::new_socket_with_timeout(rpc, tpu, transactions_socket, timeout)
+pub fn retry_get_balance(
+    client: &mut ThinClient,
+    bob_pubkey: &Pubkey,
+    expected_balance: Option<u64>,
+) -> Option<u64> {
+    const LAST: usize = 30;
+    for run in 0..LAST {
+        let balance_result = client.poll_get_balance(bob_pubkey);
+        if expected_balance.is_none() {
+            return balance_result.ok();
+        }
+        trace!(
+            "retry_get_balance[{}] {:?} {:?}",
+            run,
+            balance_result,
+            expected_balance
+        );
+        if let (Some(expected_balance), Ok(balance_result)) = (expected_balance, balance_result) {
+            if expected_balance == balance_result {
+                return Some(balance_result);
+            }
+        }
+    }
+    None
 }

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana"
 description = "Blockchain, Rebuilt for Scale"
-version = "0.14.2"
+version = "0.12.2"
 documentation = "https://docs.rs/solana"
 homepage = "https://solana.com/"
 readme = "../README.md"
@@ -17,23 +17,21 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
 chacha = []
 cuda = []
 erasure = []
-kvstore = ["solana-kvstore"]
+kvstore = ["memmap"]
 
 [dependencies]
 bincode = "1.1.2"
 bs58 = "0.2.0"
 byteorder = "1.3.1"
 chrono = { version = "0.4.0", features = ["serde"] }
-crc = { version = "1.8.1", optional = true }
-ed25519-dalek = "1.0.0-pre.0"
-hashbrown = "0.2.0"
+hashbrown = "0.1.8"
 indexmap = "1.0"
 itertools = "0.8.0"
-jsonrpc-core = "11.0.0"
-jsonrpc-derive = "11.0.0"
-jsonrpc-http-server = "11.0.0"
-jsonrpc-pubsub = "11.0.0"
-jsonrpc-ws-server = "11.0.0"
+jsonrpc-core = "10.1.0"
+jsonrpc-derive = "10.1.0"
+jsonrpc-http-server = "10.1.0"
+jsonrpc-pubsub = "10.1.0"
+jsonrpc-ws-server = "10.1.0"
 libc = "0.2.50"
 log = "0.4.2"
 memmap = { version = "0.7.0", optional = true }
@@ -41,50 +39,29 @@ nix = "0.13.0"
 rand = "0.6.5"
 rand_chacha = "0.1.1"
 rayon = "1.0.0"
-reed-solomon-erasure = "3.1.1"
-reqwest = "0.9.11"
+ring = "0.13.2"
 rocksdb = "0.11.0"
 serde = "1.0.89"
 serde_derive = "1.0.88"
 serde_json = "1.0.39"
-solana-budget-api = { path = "../programs/budget_api", version = "0.14.2"   }
-solana-client = { path = "../client", version = "0.14.2"   }
-solana-drone = { path = "../drone", version = "0.14.2"   }
-solana-kvstore = { path = "../kvstore", version = "0.14.2" , optional = true   }
-solana-logger = { path = "../logger", version = "0.14.2"   }
-solana-metrics = { path = "../metrics", version = "0.14.2"   }
-solana-netutil = { path = "../netutil", version = "0.14.2"   }
-solana-runtime = { path = "../runtime", version = "0.14.2"   }
-solana-sdk = { path = "../sdk", version = "0.14.2"   }
-solana-storage-api = { path = "../programs/storage_api", version = "0.14.2"   }
-solana-vote-api = { path = "../programs/vote_api", version = "0.14.2"   }
-solana-vote-signer = { path = "../vote-signer", version = "0.14.2"   }
+solana-budget-api = { path = "../programs/budget_api", version = "0.12.2" }
+solana-client = { path = "../client", version = "0.12.2" }
+solana-drone = { path = "../drone", version = "0.12.2" }
+solana-logger = { path = "../logger", version = "0.12.2" }
+solana-metrics = { path = "../metrics", version = "0.12.2" }
+solana-netutil = { path = "../netutil", version = "0.12.2" }
+solana-runtime = { path = "../runtime", version = "0.12.2" }
+solana-sdk = { path = "../sdk", version = "0.12.2" }
+solana-storage-api = { path = "../programs/storage_api", version = "0.12.2" }
+solana-vote-api = { path = "../programs/vote_api", version = "0.12.2" }
+solana-vote-signer = { path = "../vote-signer", version = "0.12.2" }
 sys-info = "0.5.6"
 tokio = "0.1"
 tokio-codec = "0.1"
 untrusted = "0.6.2"
 
 [dev-dependencies]
-hex-literal = "0.1.4"
+hex-literal = "0.1.3"
 matches = "0.1.6"
-solana-vote-program = { path = "../programs/vote_program", version = "0.14.2"   }
-solana-budget-program = { path = "../programs/budget_program", version = "0.14.2"   }
-
-[[bench]]
-name = "banking_stage"
-
-[[bench]]
-name = "blocktree"
-
-[[bench]]
-name = "ledger"
-
-[[bench]]
-name = "gen_keys"
-
-[[bench]]
-name = "sigverify"
-
-[[bench]]
-required-features = ["chacha"]
-name = "chacha"
+solana-vote-program = { path = "../programs/vote", version = "0.12.2" }
+solana-budget-program = { path = "../programs/budget", version = "0.12.2" }

core/benches/kvstore.rs

@@ -1,14 +1,15 @@
+#![cfg(feature = "kvstore")]
 #![feature(test)]
 extern crate test;
 
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use rand::{self, Rng};
+use rand::{self, thread_rng, Rng};
 
 use test::Bencher;
 
-use solana_kvstore::{test::gen, Config, Key, KvStore};
+use solana::kvstore::{Config, Key, KvStore};
 
 const SMALL_SIZE: usize = 512;
 const LARGE_SIZE: usize = 32 * 1024;
@@ -44,7 +45,7 @@ fn bench_write_partitioned(bench: &mut Bencher, rows: &[(Key, Vec<u8>)], ledger_
 fn bench_write_small(bench: &mut Bencher) {
     let ledger_path = setup("bench_write_small");
     let num_entries = 32 * 1024;
-    let rows = gen::pairs(SMALL_SIZE).take(num_entries).collect::<Vec<_>>();
+    let rows = gen_pairs(SMALL_SIZE).take(num_entries).collect::<Vec<_>>();
     bench_write(bench, &rows, &ledger_path.to_string_lossy());
 }
 
@@ -53,7 +54,7 @@ fn bench_write_small(bench: &mut Bencher) {
 fn bench_write_small_partitioned(bench: &mut Bencher) {
     let ledger_path = setup("bench_write_small_partitioned");
     let num_entries = 32 * 1024;
-    let rows = gen::pairs(SMALL_SIZE).take(num_entries).collect::<Vec<_>>();
+    let rows = gen_pairs(SMALL_SIZE).take(num_entries).collect::<Vec<_>>();
     bench_write_partitioned(bench, &rows, &ledger_path.to_string_lossy());
 }
 
@@ -62,7 +63,7 @@ fn bench_write_small_partitioned(bench: &mut Bencher) {
 fn bench_write_large(bench: &mut Bencher) {
     let ledger_path = setup("bench_write_large");
     let num_entries = 32 * 1024;
-    let rows = gen::pairs(LARGE_SIZE).take(num_entries).collect::<Vec<_>>();
+    let rows = gen_pairs(LARGE_SIZE).take(num_entries).collect::<Vec<_>>();
     bench_write(bench, &rows, &ledger_path.to_string_lossy());
 }
 
@@ -71,7 +72,7 @@ fn bench_write_large(bench: &mut Bencher) {
 fn bench_write_huge(bench: &mut Bencher) {
     let ledger_path = setup("bench_write_huge");
     let num_entries = 32 * 1024;
-    let rows = gen::pairs(HUGE_SIZE).take(num_entries).collect::<Vec<_>>();
+    let rows = gen_pairs(HUGE_SIZE).take(num_entries).collect::<Vec<_>>();
     bench_write(bench, &rows, &ledger_path.to_string_lossy());
 }
 
@@ -86,8 +87,8 @@ fn bench_read_sequential(bench: &mut Bencher) {
     let num_large_blobs = 32 * 1024;
     let total_blobs = num_small_blobs + num_large_blobs;
 
-    let small = gen::data(SMALL_SIZE).take(num_small_blobs);
-    let large = gen::data(LARGE_SIZE).take(num_large_blobs);
+    let small = gen_data(SMALL_SIZE).take(num_small_blobs);
+    let large = gen_data(LARGE_SIZE).take(num_large_blobs);
     let rows = gen_seq_keys().zip(small.chain(large));
 
     let _ = store.put_many(rows);
@@ -119,8 +120,8 @@ fn bench_read_random(bench: &mut Bencher) {
     let num_large_blobs = 32 * 1024;
     let total_blobs = num_small_blobs + num_large_blobs;
 
-    let small = gen::data(SMALL_SIZE).take(num_small_blobs);
-    let large = gen::data(LARGE_SIZE).take(num_large_blobs);
+    let small = gen_data(SMALL_SIZE).take(num_small_blobs);
+    let large = gen_data(LARGE_SIZE).take(num_large_blobs);
     let rows = gen_seq_keys().zip(small.chain(large));
 
     let _ = store.put_many(rows);
@@ -165,6 +166,24 @@ fn gen_seq_keys() -> impl Iterator<Item = Key> {
     })
 }
 
+fn gen_keys() -> impl Iterator<Item = Key> {
+    let mut rng = thread_rng();
+
+    std::iter::repeat_with(move || {
+        let buf = rng.gen();
+
+        Key(buf)
+    })
+}
+
+fn gen_data(size: usize) -> impl Iterator<Item = Vec<u8>> {
+    std::iter::repeat(vec![1u8; size])
+}
+
+fn gen_pairs(data_size: usize) -> impl Iterator<Item = (Key, Vec<u8>)> {
+    gen_keys().zip(gen_data(data_size))
+}
+
 fn teardown<P: AsRef<Path>>(p: P) {
     KvStore::destroy(p).expect("Expect successful store destruction");
 }

core/build.rs

@@ -24,8 +24,9 @@ fn main() {
 
     let chacha = !env::var("CARGO_FEATURE_CHACHA").is_err();
     let cuda = !env::var("CARGO_FEATURE_CUDA").is_err();
+    let erasure = !env::var("CARGO_FEATURE_ERASURE").is_err();
 
-    if chacha || cuda {
+    if chacha || cuda || erasure {
         println!("cargo:rerun-if-changed={}", perf_libs_dir);
         println!("cargo:rustc-link-search=native={}", perf_libs_dir);
     }
@@ -45,4 +46,30 @@ fn main() {
         println!("cargo:rustc-link-lib=dylib=cuda");
         println!("cargo:rustc-link-lib=dylib=cudadevrt");
     }
+    if erasure {
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        {
+            println!(
+                "cargo:rerun-if-changed={}/libgf_complete.dylib",
+                perf_libs_dir
+            );
+            println!("cargo:rerun-if-changed={}/libJerasure.dylib", perf_libs_dir);
+        }
+        #[cfg(all(unix, not(any(target_os = "macos", target_os = "ios"))))]
+        {
+            println!("cargo:rerun-if-changed={}/libgf_complete.so", perf_libs_dir);
+            println!("cargo:rerun-if-changed={}/libJerasure.so", perf_libs_dir);
+        }
+        #[cfg(windows)]
+        {
+            println!(
+                "cargo:rerun-if-changed={}/libgf_complete.dll",
+                perf_libs_dir
+            );
+            println!("cargo:rerun-if-changed={}/libJerasure.dll", perf_libs_dir);
+        }
+
+        println!("cargo:rustc-link-lib=dylib=Jerasure");
+        println!("cargo:rustc-link-lib=dylib=gf_complete");
+    }
 }

core/src/bank_forks.rs

@@ -1,12 +1,9 @@
 //! The `bank_forks` module implments BankForks a DAG of checkpointed Banks
 
 use hashbrown::{HashMap, HashSet};
-use solana_metrics::counter::Counter;
 use solana_runtime::bank::Bank;
-use solana_sdk::timing;
 use std::ops::Index;
 use std::sync::Arc;
-use std::time::Instant;
 
 pub struct BankForks {
     banks: HashMap<u64, Arc<Bank>>,
@@ -35,8 +32,7 @@ impl BankForks {
     pub fn ancestors(&self) -> HashMap<u64, HashSet<u64>> {
         let mut ancestors = HashMap::new();
         for bank in self.banks.values() {
-            let mut set: HashSet<u64> = bank.ancestors.keys().cloned().collect();
-            set.remove(&bank.slot());
+            let set = bank.parents().into_iter().map(|b| b.slot()).collect();
             ancestors.insert(bank.slot(), set);
         }
         ancestors
@@ -47,11 +43,9 @@ impl BankForks {
         let mut descendants = HashMap::new();
         for bank in self.banks.values() {
             let _ = descendants.entry(bank.slot()).or_insert(HashSet::new());
-            let mut set: HashSet<u64> = bank.ancestors.keys().cloned().collect();
-            set.remove(&bank.slot());
-            for parent in set {
+            for parent in bank.parents() {
                 descendants
-                    .entry(parent)
+                    .entry(parent.slot())
                     .or_insert(HashSet::new())
                     .insert(bank.slot());
             }
@@ -105,23 +99,17 @@ impl BankForks {
     }
 
     pub fn set_root(&mut self, root: u64) {
-        let set_root_start = Instant::now();
         let root_bank = self
             .banks
             .get(&root)
             .expect("root bank didn't exist in bank_forks");
         root_bank.squash();
         self.prune_non_root(root);
-        inc_new_counter_info!(
-            "bank-forks_set_root_ms",
-            timing::duration_as_ms(&set_root_start.elapsed()) as usize
-        );
     }
 
     fn prune_non_root(&mut self, root: u64) {
-        let descendants = self.descendants();
         self.banks
-            .retain(|slot, _| descendants[&root].contains(slot))
+            .retain(|slot, bank| *slot >= root || bank.is_in_subtree_of(root))
     }
 }
 

core/src/blockstream.rs

@@ -4,9 +4,7 @@
 
 use crate::entry::Entry;
 use crate::result::Result;
-use bincode::serialize;
 use chrono::{SecondsFormat, Utc};
-use serde_json::json;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use std::cell::RefCell;
@@ -93,13 +91,7 @@ where
         leader_id: &Pubkey,
         entry: &Entry,
     ) -> Result<()> {
-        let transactions: Vec<Vec<u8>> = serialize_transactions(entry);
-        let stream_entry = json!({
-            "num_hashes": entry.num_hashes,
-            "hash": entry.hash,
-            "transactions": transactions
-        });
-        let json_entry = serde_json::to_string(&stream_entry)?;
+        let json_entry = serde_json::to_string(&entry)?;
         let payload = format!(
             r#"{{"dt":"{}","t":"entry","s":{},"h":{},"l":"{:?}","entry":{}}}"#,
             Utc::now().to_rfc3339_opts(SecondsFormat::Nanos, true),
@@ -156,14 +148,6 @@ impl MockBlockstream {
     }
 }
 
-fn serialize_transactions(entry: &Entry) -> Vec<Vec<u8>> {
-    entry
-        .transactions
-        .iter()
-        .map(|tx| serialize(&tx).unwrap())
-        .collect()
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
@@ -172,30 +156,8 @@ mod test {
     use serde_json::Value;
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::system_transaction;
     use std::collections::HashSet;
 
-    #[test]
-    fn test_serialize_transactions() {
-        let entry = Entry::new(&Hash::default(), 1, vec![]);
-        let empty_vec: Vec<Vec<u8>> = vec![];
-        assert_eq!(serialize_transactions(&entry), empty_vec);
-
-        let keypair0 = Keypair::new();
-        let keypair1 = Keypair::new();
-        let tx0 =
-            system_transaction::transfer(&keypair0, &keypair1.pubkey(), 1, Hash::default(), 0);
-        let tx1 =
-            system_transaction::transfer(&keypair1, &keypair0.pubkey(), 2, Hash::default(), 0);
-        let serialized_tx0 = serialize(&tx0).unwrap();
-        let serialized_tx1 = serialize(&tx1).unwrap();
-        let entry = Entry::new(&Hash::default(), 1, vec![tx0, tx1]);
-        assert_eq!(
-            serialize_transactions(&entry),
-            vec![serialized_tx0, serialized_tx1]
-        );
-    }
-
     #[test]
     fn test_blockstream() -> () {
         let blockstream = MockBlockstream::new("test_stream".to_string());
@@ -208,7 +170,7 @@ mod test {
         let tick_height_initial = 0;
         let tick_height_final = tick_height_initial + ticks_per_slot + 2;
         let mut curr_slot = 0;
-        let leader_id = Pubkey::new_rand();
+        let leader_id = Keypair::new().pubkey();
 
         for tick_height in tick_height_initial..=tick_height_final {
             if tick_height == 5 {

core/src/blockstream_service.rs

@@ -109,26 +109,25 @@ mod test {
     use super::*;
     use crate::blocktree::create_new_tmp_ledger;
     use crate::entry::{create_ticks, Entry};
-    use bincode::{deserialize, serialize};
     use chrono::{DateTime, FixedOffset};
     use serde_json::Value;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::system_transaction;
+    use solana_sdk::system_transaction::SystemTransaction;
     use std::sync::mpsc::channel;
 
     #[test]
     fn test_blockstream_service_process_entries() {
         let ticks_per_slot = 5;
-        let leader_id = Pubkey::new_rand();
+        let leader_id = Keypair::new().pubkey();
 
         // Set up genesis block and blocktree
         let (mut genesis_block, _mint_keypair) = GenesisBlock::new(1000);
         genesis_block.ticks_per_slot = ticks_per_slot;
 
         let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_block);
-        let blocktree = Blocktree::open(&ledger_path).unwrap();
+        let blocktree = Blocktree::open_config(&ledger_path, ticks_per_slot).unwrap();
 
         // Set up blockstream
         let mut blockstream = Blockstream::new("test_stream".to_string());
@@ -141,13 +140,7 @@ mod test {
 
         let keypair = Keypair::new();
         let mut blockhash = entries[3].hash;
-        let tx = system_transaction::create_user_account(
-            &keypair,
-            &keypair.pubkey(),
-            1,
-            Hash::default(),
-            0,
-        );
+        let tx = SystemTransaction::new_account(&keypair, &keypair.pubkey(), 1, Hash::default(), 0);
         let entry = Entry::new(&mut blockhash, 1, vec![tx]);
         blockhash = entry.hash;
         entries.push(entry);
@@ -157,9 +150,7 @@ mod test {
         let expected_entries = entries.clone();
         let expected_tick_heights = [5, 6, 7, 8, 8, 9];
 
-        blocktree
-            .write_entries(1, 0, 0, ticks_per_slot, &entries)
-            .unwrap();
+        blocktree.write_entries(1, 0, 0, &entries).unwrap();
 
         slot_full_sender.send((1, leader_id)).unwrap();
         BlockstreamService::process_entries(
@@ -189,34 +180,13 @@ mod test {
             assert_eq!(height, expected_tick_heights[i]);
             let entry_obj = json["entry"].clone();
             let tx = entry_obj["transactions"].as_array().unwrap();
-            let entry: Entry;
             if tx.len() == 0 {
-                entry = serde_json::from_value(entry_obj).unwrap();
-            } else {
-                let entry_json = entry_obj.as_object().unwrap();
-                entry = Entry {
-                    num_hashes: entry_json.get("num_hashes").unwrap().as_u64().unwrap(),
-                    hash: serde_json::from_value(entry_json.get("hash").unwrap().clone()).unwrap(),
-                    transactions: entry_json
-                        .get("transactions")
-                        .unwrap()
-                        .as_array()
-                        .unwrap()
-                        .into_iter()
-                        .enumerate()
-                        .map(|(j, tx)| {
-                            let tx_vec: Vec<u8> = serde_json::from_value(tx.clone()).unwrap();
-                            // Check explicitly that transaction matches bincode-serialized format
-                            assert_eq!(
-                                tx_vec,
-                                serialize(&expected_entries[i].transactions[j]).unwrap()
-                            );
-                            deserialize(&tx_vec).unwrap()
-                        })
-                        .collect(),
-                };
+                // TODO: There is a bug in Transaction deserialize methods such that
+                // `serde_json::from_str` does not work for populated Entries.
+                // Remove this `if` when fixed.
+                let entry: Entry = serde_json::from_value(entry_obj).unwrap();
+                assert_eq!(entry, expected_entries[i]);
             }
-            assert_eq!(entry, expected_entries[i]);
         }
         for json in block_events {
             let slot = json["s"].as_u64().unwrap();

core/src/blocktree/db.rs

@@ -1,3 +1,4 @@
+use crate::entry::Entry;
 use crate::result::{Error, Result};
 
 use bincode::{deserialize, serialize};
@@ -6,56 +7,24 @@ use serde::de::DeserializeOwned;
 use serde::Serialize;
 
 use std::borrow::Borrow;
-use std::collections::HashMap;
-use std::marker::PhantomData;
-use std::path::Path;
+use std::sync::Arc;
 
-pub mod columns {
-    #[derive(Debug)]
-    /// SlotMeta Column
-    pub struct SlotMeta;
-
-    #[derive(Debug)]
-    /// Orphans Column
-    pub struct Orphans;
-
-    #[derive(Debug)]
-    /// Erasure Column
-    pub struct Coding;
-
-    #[derive(Debug)]
-    /// Data Column
-    pub struct Data;
-
-    #[derive(Debug)]
-    /// The erasure meta column
-    pub struct ErasureMeta;
-}
-
-pub trait Backend: Sized + Send + Sync {
-    type Key: ?Sized + ToOwned<Owned = Self::OwnedKey>;
-    type OwnedKey: Borrow<Self::Key>;
-    type ColumnFamily: Clone;
-    type Cursor: DbCursor<Self>;
-    type Iter: Iterator<Item = (Box<Self::Key>, Box<[u8]>)>;
-    type WriteBatch: IWriteBatch<Self>;
+pub trait Database: Sized + Send + Sync {
     type Error: Into<Error>;
+    type Key: Borrow<Self::KeyRef>;
+    type KeyRef: ?Sized;
+    type ColumnFamily;
+    type Cursor: Cursor<Self>;
+    type EntryIter: Iterator<Item = Entry>;
+    type WriteBatch: IWriteBatch<Self>;
 
-    fn open(path: &Path) -> Result<Self>;
+    fn cf_handle(&self, cf: &str) -> Option<Self::ColumnFamily>;
 
-    fn columns(&self) -> Vec<&'static str>;
+    fn get_cf(&self, cf: Self::ColumnFamily, key: &Self::KeyRef) -> Result<Option<Vec<u8>>>;
 
-    fn destroy(path: &Path) -> Result<()>;
+    fn put_cf(&self, cf: Self::ColumnFamily, key: &Self::KeyRef, data: &[u8]) -> Result<()>;
 
-    fn cf_handle(&self, cf: &str) -> Self::ColumnFamily;
-
-    fn get_cf(&self, cf: Self::ColumnFamily, key: &Self::Key) -> Result<Option<Vec<u8>>>;
-
-    fn put_cf(&self, cf: Self::ColumnFamily, key: &Self::Key, value: &[u8]) -> Result<()>;
-
-    fn delete_cf(&self, cf: Self::ColumnFamily, key: &Self::Key) -> Result<()>;
-
-    fn iterator_cf(&self, cf: Self::ColumnFamily) -> Result<Self::Iter>;
+    fn delete_cf(&self, cf: Self::ColumnFamily, key: &Self::KeyRef) -> Result<()>;
 
     fn raw_iterator_cf(&self, cf: Self::ColumnFamily) -> Result<Self::Cursor>;
 
@@ -64,355 +33,163 @@ pub trait Backend: Sized + Send + Sync {
     fn batch(&self) -> Result<Self::WriteBatch>;
 }
 
-pub trait Column<B>
-where
-    B: Backend,
-{
-    const NAME: &'static str;
-    type Index;
-
-    fn key(index: Self::Index) -> B::OwnedKey;
-    fn index(key: &B::Key) -> Self::Index;
-}
-
-pub trait DbCursor<B>
-where
-    B: Backend,
-{
+pub trait Cursor<D: Database> {
     fn valid(&self) -> bool;
 
-    fn seek(&mut self, key: &B::Key);
+    fn seek(&mut self, key: &D::KeyRef);
 
     fn seek_to_first(&mut self);
 
     fn next(&mut self);
 
-    fn key(&self) -> Option<B::OwnedKey>;
+    fn key(&self) -> Option<D::Key>;
 
     fn value(&self) -> Option<Vec<u8>>;
 }
 
-pub trait IWriteBatch<B>
-where
-    B: Backend,
-{
-    fn put_cf(&mut self, cf: B::ColumnFamily, key: &B::Key, value: &[u8]) -> Result<()>;
-    fn delete_cf(&mut self, cf: B::ColumnFamily, key: &B::Key) -> Result<()>;
+pub trait IWriteBatch<D: Database> {
+    fn put_cf(&mut self, cf: D::ColumnFamily, key: &D::KeyRef, data: &[u8]) -> Result<()>;
 }
 
-pub trait TypedColumn<B>: Column<B>
-where
-    B: Backend,
-{
-    type Type: Serialize + DeserializeOwned;
-}
+pub trait IDataCf<D: Database>: LedgerColumnFamilyRaw<D> {
+    fn new(db: Arc<D>) -> Self;
 
-#[derive(Debug, Clone)]
-pub struct Database<B>
-where
-    B: Backend,
-{
-    backend: B,
-}
-
-#[derive(Debug, Clone)]
-pub struct Cursor<B, C>
-where
-    B: Backend,
-    C: Column<B>,
-{
-    db_cursor: B::Cursor,
-    column: PhantomData<C>,
-    backend: PhantomData<B>,
-}
-
-#[derive(Debug, Clone)]
-pub struct LedgerColumn<B, C>
-where
-    B: Backend,
-    C: Column<B>,
-{
-    backend: PhantomData<B>,
-    column: PhantomData<C>,
-}
-
-#[derive(Debug)]
-pub struct WriteBatch<B>
-where
-    B: Backend,
-{
-    write_batch: B::WriteBatch,
-    backend: PhantomData<B>,
-    map: HashMap<&'static str, B::ColumnFamily>,
-}
-
-impl<B> Database<B>
-where
-    B: Backend,
-{
-    pub fn open(path: &Path) -> Result<Self> {
-        let backend = B::open(path)?;
-
-        Ok(Database { backend })
+    fn get_by_slot_index(&self, slot: u64, index: u64) -> Result<Option<Vec<u8>>> {
+        let key = Self::key(slot, index);
+        self.get(key.borrow())
     }
 
-    pub fn destroy(path: &Path) -> Result<()> {
-        B::destroy(path)?;
-
-        Ok(())
+    fn delete_by_slot_index(&self, slot: u64, index: u64) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.delete(&key.borrow())
     }
 
-    pub fn get_bytes<C>(&self, key: C::Index) -> Result<Option<Vec<u8>>>
-    where
-        C: Column<B>,
-    {
-        self.backend
-            .get_cf(self.cf_handle::<C>(), C::key(key).borrow())
+    fn put_by_slot_index(&self, slot: u64, index: u64, serialized_value: &[u8]) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.put(key.borrow(), serialized_value)
     }
 
-    pub fn put_bytes<C>(&mut self, key: C::Index, data: &[u8]) -> Result<()>
-    where
-        C: Column<B>,
-    {
-        self.backend
-            .put_cf(self.cf_handle::<C>(), C::key(key).borrow(), data)
+    fn key(slot: u64, index: u64) -> D::Key;
+
+    fn slot_from_key(key: &D::KeyRef) -> Result<u64>;
+
+    fn index_from_key(key: &D::KeyRef) -> Result<u64>;
+}
+
+pub trait IErasureCf<D: Database>: LedgerColumnFamilyRaw<D> {
+    fn new(db: Arc<D>) -> Self;
+
+    fn delete_by_slot_index(&self, slot: u64, index: u64) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.delete(key.borrow())
     }
 
-    pub fn delete<C>(&mut self, key: C::Index) -> Result<()>
-    where
-        C: Column<B>,
-    {
-        self.backend
-            .delete_cf(self.cf_handle::<C>(), C::key(key).borrow())
+    fn get_by_slot_index(&self, slot: u64, index: u64) -> Result<Option<Vec<u8>>> {
+        let key = Self::key(slot, index);
+        self.get(key.borrow())
     }
 
-    pub fn get<C>(&self, key: C::Index) -> Result<Option<C::Type>>
-    where
-        C: TypedColumn<B>,
-    {
-        if let Some(serialized_value) = self
-            .backend
-            .get_cf(self.cf_handle::<C>(), C::key(key).borrow())?
-        {
-            let value = deserialize(&serialized_value)?;
+    fn put_by_slot_index(&self, slot: u64, index: u64, serialized_value: &[u8]) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.put(key.borrow(), serialized_value)
+    }
 
-            Ok(Some(value))
+    fn key(slot: u64, index: u64) -> D::Key;
+
+    fn slot_from_key(key: &D::KeyRef) -> Result<u64>;
+
+    fn index_from_key(key: &D::KeyRef) -> Result<u64>;
+}
+
+pub trait IMetaCf<D: Database>: LedgerColumnFamily<D, ValueType = super::SlotMeta> {
+    fn new(db: Arc<D>) -> Self;
+
+    fn key(slot: u64) -> D::Key;
+
+    fn get_slot_meta(&self, slot: u64) -> Result<Option<super::SlotMeta>> {
+        let key = Self::key(slot);
+        self.get(key.borrow())
+    }
+
+    fn put_slot_meta(&self, slot: u64, slot_meta: &super::SlotMeta) -> Result<()> {
+        let key = Self::key(slot);
+        self.put(key.borrow(), slot_meta)
+    }
+
+    fn index_from_key(key: &D::KeyRef) -> Result<u64>;
+}
+
+pub trait LedgerColumnFamily<D: Database> {
+    type ValueType: DeserializeOwned + Serialize;
+
+    fn get(&self, key: &D::KeyRef) -> Result<Option<Self::ValueType>> {
+        let db = self.db();
+        let data_bytes = db.get_cf(self.handle(), key)?;
+
+        if let Some(raw) = data_bytes {
+            let result: Self::ValueType = deserialize(&raw)?;
+            Ok(Some(result))
         } else {
             Ok(None)
         }
     }
 
-    pub fn put<C>(&mut self, key: C::Index, value: &C::Type) -> Result<()>
-    where
-        C: TypedColumn<B>,
-    {
-        let serialized_value = serialize(value)?;
-
-        self.backend.put_cf(
-            self.cf_handle::<C>(),
-            C::key(key).borrow(),
-            &serialized_value,
-        )
+    fn get_bytes(&self, key: &D::KeyRef) -> Result<Option<Vec<u8>>> {
+        let db = self.db();
+        let data_bytes = db.get_cf(self.handle(), key)?;
+        Ok(data_bytes.map(|x| x.to_vec()))
     }
 
-    pub fn cursor<C>(&self) -> Result<Cursor<B, C>>
-    where
-        C: Column<B>,
-    {
-        let db_cursor = self.backend.raw_iterator_cf(self.cf_handle::<C>())?;
-
-        Ok(Cursor {
-            db_cursor,
-            column: PhantomData,
-            backend: PhantomData,
-        })
+    fn put_bytes(&self, key: &D::KeyRef, serialized_value: &[u8]) -> Result<()> {
+        let db = self.db();
+        db.put_cf(self.handle(), key, &serialized_value)?;
+        Ok(())
     }
 
-    pub fn iter<C>(&self) -> Result<impl Iterator<Item = (C::Index, Vec<u8>)>>
-    where
-        C: Column<B>,
-    {
-        let iter = self
-            .backend
-            .iterator_cf(self.cf_handle::<C>())?
-            .map(|(key, value)| (C::index(&key), value.into()));
-
-        Ok(iter)
+    fn put(&self, key: &D::KeyRef, value: &Self::ValueType) -> Result<()> {
+        let db = self.db();
+        let serialized = serialize(value)?;
+        db.put_cf(self.handle(), key, &serialized)?;
+        Ok(())
     }
 
-    pub fn batch(&mut self) -> Result<WriteBatch<B>> {
-        let db_write_batch = self.backend.batch()?;
-        let map = self
-            .backend
-            .columns()
-            .into_iter()
-            .map(|desc| (desc, self.backend.cf_handle(desc)))
-            .collect();
-
-        Ok(WriteBatch {
-            write_batch: db_write_batch,
-            backend: PhantomData,
-            map,
-        })
+    fn delete(&self, key: &D::KeyRef) -> Result<()> {
+        let db = self.db();
+        db.delete_cf(self.handle(), key)?;
+        Ok(())
     }
 
-    pub fn write(&mut self, batch: WriteBatch<B>) -> Result<()> {
-        self.backend.write(batch.write_batch)
-    }
+    fn db(&self) -> &Arc<D>;
 
-    #[inline]
-    pub fn cf_handle<C>(&self) -> B::ColumnFamily
-    where
-        C: Column<B>,
-    {
-        self.backend.cf_handle(C::NAME).clone()
-    }
-
-    pub fn column<C>(&self) -> LedgerColumn<B, C>
-    where
-        C: Column<B>,
-    {
-        LedgerColumn {
-            backend: PhantomData,
-            column: PhantomData,
-        }
-    }
+    fn handle(&self) -> D::ColumnFamily;
 }
 
-impl<B, C> Cursor<B, C>
-where
-    B: Backend,
-    C: Column<B>,
-{
-    pub fn valid(&self) -> bool {
-        self.db_cursor.valid()
+pub trait LedgerColumnFamilyRaw<D: Database> {
+    fn get(&self, key: &D::KeyRef) -> Result<Option<Vec<u8>>> {
+        let db = self.db();
+        let data_bytes = db.get_cf(self.handle(), key)?;
+        Ok(data_bytes.map(|x| x.to_vec()))
     }
 
-    pub fn seek(&mut self, key: C::Index) {
-        self.db_cursor.seek(C::key(key).borrow());
+    fn put(&self, key: &D::KeyRef, serialized_value: &[u8]) -> Result<()> {
+        let db = self.db();
+        db.put_cf(self.handle(), &key, &serialized_value)?;
+        Ok(())
     }
 
-    pub fn seek_to_first(&mut self) {
-        self.db_cursor.seek_to_first();
+    fn delete(&self, key: &D::KeyRef) -> Result<()> {
+        let db = self.db();
+        db.delete_cf(self.handle(), &key)?;
+        Ok(())
     }
 
-    pub fn next(&mut self) {
-        self.db_cursor.next();
+    fn raw_iterator(&self) -> D::Cursor {
+        let db = self.db();
+        db.raw_iterator_cf(self.handle())
+            .expect("Expected to be able to open database iterator")
     }
 
-    pub fn key(&self) -> Option<C::Index> {
-        if let Some(key) = self.db_cursor.key() {
-            Some(C::index(key.borrow()))
-        } else {
-            None
-        }
-    }
+    fn handle(&self) -> D::ColumnFamily;
 
-    pub fn value_bytes(&self) -> Option<Vec<u8>> {
-        self.db_cursor.value()
-    }
-}
-
-impl<B, C> Cursor<B, C>
-where
-    B: Backend,
-    C: TypedColumn<B>,
-{
-    pub fn value(&self) -> Option<C::Type> {
-        if let Some(bytes) = self.db_cursor.value() {
-            let value = deserialize(&bytes).ok()?;
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl<B, C> LedgerColumn<B, C>
-where
-    B: Backend,
-    C: Column<B>,
-{
-    pub fn get_bytes(&self, db: &Database<B>, key: C::Index) -> Result<Option<Vec<u8>>> {
-        db.backend.get_cf(self.handle(db), C::key(key).borrow())
-    }
-
-    pub fn cursor(&self, db: &Database<B>) -> Result<Cursor<B, C>> {
-        db.cursor()
-    }
-
-    pub fn iter(&self, db: &Database<B>) -> Result<impl Iterator<Item = (C::Index, Vec<u8>)>> {
-        db.iter::<C>()
-    }
-
-    pub fn handle(&self, db: &Database<B>) -> B::ColumnFamily {
-        db.cf_handle::<C>()
-    }
-
-    pub fn is_empty(&self, db: &Database<B>) -> Result<bool> {
-        let mut cursor = self.cursor(db)?;
-        cursor.seek_to_first();
-        Ok(!cursor.valid())
-    }
-}
-
-impl<B, C> LedgerColumn<B, C>
-where
-    B: Backend,
-    C: Column<B>,
-{
-    pub fn put_bytes(&self, db: &mut Database<B>, key: C::Index, value: &[u8]) -> Result<()> {
-        db.backend
-            .put_cf(self.handle(db), C::key(key).borrow(), value)
-    }
-
-    pub fn delete(&self, db: &mut Database<B>, key: C::Index) -> Result<()> {
-        db.backend.delete_cf(self.handle(db), C::key(key).borrow())
-    }
-}
-
-impl<B, C> LedgerColumn<B, C>
-where
-    B: Backend,
-    C: TypedColumn<B>,
-{
-    pub fn get(&self, db: &Database<B>, key: C::Index) -> Result<Option<C::Type>> {
-        db.get::<C>(key)
-    }
-}
-
-impl<B, C> LedgerColumn<B, C>
-where
-    B: Backend,
-    C: TypedColumn<B>,
-{
-    pub fn put(&self, db: &mut Database<B>, key: C::Index, value: &C::Type) -> Result<()> {
-        db.put::<C>(key, value)
-    }
-}
-
-impl<B> WriteBatch<B>
-where
-    B: Backend,
-{
-    pub fn put_bytes<C: Column<B>>(&mut self, key: C::Index, bytes: &[u8]) -> Result<()> {
-        self.write_batch
-            .put_cf(self.get_cf::<C>(), C::key(key).borrow(), bytes)
-    }
-
-    pub fn delete<C: Column<B>>(&mut self, key: C::Index) -> Result<()> {
-        self.write_batch
-            .delete_cf(self.get_cf::<C>(), C::key(key).borrow())
-    }
-
-    pub fn put<C: TypedColumn<B>>(&mut self, key: C::Index, value: &C::Type) -> Result<()> {
-        let serialized_value = serialize(&value)?;
-        self.write_batch
-            .put_cf(self.get_cf::<C>(), C::key(key).borrow(), &serialized_value)
-    }
-
-    #[inline]
-    fn get_cf<C: Column<B>>(&self) -> B::ColumnFamily {
-        self.map[C::NAME].clone()
-    }
+    fn db(&self) -> &Arc<D>;
 }

core/src/blocktree/kvs.rs

@@ -1,42 +1,80 @@
-use crate::blocktree::db::columns as cf;
-use crate::blocktree::db::{Backend, Column, DbCursor, IWriteBatch, TypedColumn};
-use crate::blocktree::BlocktreeError;
+use crate::entry::Entry;
+use crate::kvstore::{self, Key};
+use crate::packet::Blob;
 use crate::result::{Error, Result};
-use byteorder::{BigEndian, ByteOrder};
-use solana_kvstore::{self as kvstore, Key, KvStore};
-use std::path::Path;
 
-type ColumnFamily = u64;
+use std::sync::Arc;
+
+use super::db::{
+    Cursor, Database, IDataCf, IErasureCf, IMetaCf, IWriteBatch, LedgerColumnFamily,
+    LedgerColumnFamilyRaw,
+};
+use super::{Blocktree, BlocktreeError};
 
 #[derive(Debug)]
-pub struct Kvs(KvStore);
+pub struct Kvs(());
 
-/// Dummy struct for now
-#[derive(Debug, Clone, Copy)]
-pub struct Dummy;
+/// The metadata column family
+#[derive(Debug)]
+pub struct MetaCf {
+    db: Arc<Kvs>,
+}
 
-impl Backend for Kvs {
-    type Key = Key;
-    type OwnedKey = Key;
-    type ColumnFamily = ColumnFamily;
-    type Cursor = Dummy;
-    type Iter = Dummy;
-    type WriteBatch = Dummy;
+/// The data column family
+#[derive(Debug)]
+pub struct DataCf {
+    db: Arc<Kvs>,
+}
+
+/// The erasure column family
+#[derive(Debug)]
+pub struct ErasureCf {
+    db: Arc<Kvs>,
+}
+
+/// Dummy struct to get things compiling
+/// TODO: all this goes away with Blocktree
+pub struct EntryIterator(i32);
+/// Dummy struct to get things compiling
+pub struct KvsCursor;
+/// Dummy struct to get things compiling
+pub struct ColumnFamily;
+/// Dummy struct to get things compiling
+pub struct KvsWriteBatch;
+
+impl Blocktree {
+    /// Opens a Ledger in directory, provides "infinite" window of blobs
+    pub fn open(_ledger_path: &str) -> Result<Blocktree> {
+        unimplemented!()
+    }
+
+    #[allow(unreachable_code)]
+    pub fn read_ledger_blobs(&self) -> impl Iterator<Item = Blob> {
+        unimplemented!();
+        self.read_ledger().unwrap().map(|_| Blob::new(&[]))
+    }
+
+    /// Return an iterator for all the entries in the given file.
+    #[allow(unreachable_code)]
+    pub fn read_ledger(&self) -> Result<impl Iterator<Item = Entry>> {
+        Ok(EntryIterator(unimplemented!()))
+    }
+
+    pub fn destroy(_ledger_path: &str) -> Result<()> {
+        unimplemented!()
+    }
+}
+
+impl Database for Kvs {
     type Error = kvstore::Error;
+    type Key = Key;
+    type KeyRef = Key;
+    type ColumnFamily = ColumnFamily;
+    type Cursor = KvsCursor;
+    type EntryIter = EntryIterator;
+    type WriteBatch = KvsWriteBatch;
 
-    fn open(_path: &Path) -> Result<Kvs> {
-        unimplemented!()
-    }
-
-    fn columns(&self) -> Vec<&'static str> {
-        unimplemented!()
-    }
-
-    fn destroy(_path: &Path) -> Result<()> {
-        unimplemented!()
-    }
-
-    fn cf_handle(&self, _cf: &str) -> ColumnFamily {
+    fn cf_handle(&self, _cf: &str) -> Option<ColumnFamily> {
         unimplemented!()
     }
 
@@ -44,123 +82,28 @@ impl Backend for Kvs {
         unimplemented!()
     }
 
-    fn put_cf(&self, _cf: ColumnFamily, _key: &Key, _value: &[u8]) -> Result<()> {
+    fn put_cf(&self, _cf: ColumnFamily, _key: &Key, _data: &[u8]) -> Result<()> {
         unimplemented!()
     }
 
-    fn delete_cf(&self, _cf: ColumnFamily, _key: &Key) -> Result<()> {
+    fn delete_cf(&self, _cf: Self::ColumnFamily, _key: &Key) -> Result<()> {
         unimplemented!()
     }
 
-    fn iterator_cf(&self, _cf: ColumnFamily) -> Result<Dummy> {
+    fn raw_iterator_cf(&self, _cf: Self::ColumnFamily) -> Result<Self::Cursor> {
         unimplemented!()
     }
 
-    fn raw_iterator_cf(&self, _cf: ColumnFamily) -> Result<Dummy> {
+    fn write(&self, _batch: Self::WriteBatch) -> Result<()> {
         unimplemented!()
     }
 
-    fn batch(&self) -> Result<Dummy> {
-        unimplemented!()
-    }
-
-    fn write(&self, _batch: Dummy) -> Result<()> {
+    fn batch(&self) -> Result<Self::WriteBatch> {
         unimplemented!()
     }
 }
 
-impl Column<Kvs> for cf::Coding {
-    const NAME: &'static str = super::ERASURE_CF;
-    type Index = (u64, u64);
-
-    fn key(index: (u64, u64)) -> Key {
-        cf::Data::key(index)
-    }
-
-    fn index(key: &Key) -> (u64, u64) {
-        cf::Data::index(key)
-    }
-}
-
-impl Column<Kvs> for cf::Data {
-    const NAME: &'static str = super::DATA_CF;
-    type Index = (u64, u64);
-
-    fn key((slot, index): (u64, u64)) -> Key {
-        let mut key = Key::default();
-        BigEndian::write_u64(&mut key.0[8..16], slot);
-        BigEndian::write_u64(&mut key.0[16..], index);
-        key
-    }
-
-    fn index(key: &Key) -> (u64, u64) {
-        let slot = BigEndian::read_u64(&key.0[8..16]);
-        let index = BigEndian::read_u64(&key.0[16..]);
-        (slot, index)
-    }
-}
-
-impl Column<Kvs> for cf::Orphans {
-    const NAME: &'static str = super::ORPHANS_CF;
-    type Index = u64;
-
-    fn key(slot: u64) -> Key {
-        let mut key = Key::default();
-        BigEndian::write_u64(&mut key.0[8..16], slot);
-        key
-    }
-
-    fn index(key: &Key) -> u64 {
-        BigEndian::read_u64(&key.0[8..16])
-    }
-}
-
-impl TypedColumn<Kvs> for cf::Orphans {
-    type Type = bool;
-}
-
-impl Column<Kvs> for cf::SlotMeta {
-    const NAME: &'static str = super::META_CF;
-    type Index = u64;
-
-    fn key(slot: u64) -> Key {
-        let mut key = Key::default();
-        BigEndian::write_u64(&mut key.0[8..16], slot);
-        key
-    }
-
-    fn index(key: &Key) -> u64 {
-        BigEndian::read_u64(&key.0[8..16])
-    }
-}
-
-impl TypedColumn<Kvs> for cf::SlotMeta {
-    type Type = super::SlotMeta;
-}
-
-impl Column<Kvs> for cf::ErasureMeta {
-    const NAME: &'static str = super::ERASURE_META_CF;
-    type Index = (u64, u64);
-
-    fn key((slot, set_index): (u64, u64)) -> Key {
-        let mut key = Key::default();
-        BigEndian::write_u64(&mut key.0[8..16], slot);
-        BigEndian::write_u64(&mut key.0[16..], set_index);
-        key
-    }
-
-    fn index(key: &Key) -> (u64, u64) {
-        let slot = BigEndian::read_u64(&key.0[8..16]);
-        let set_index = BigEndian::read_u64(&key.0[16..]);
-        (slot, set_index)
-    }
-}
-
-impl TypedColumn<Kvs> for cf::ErasureMeta {
-    type Type = super::ErasureMeta;
-}
-
-impl DbCursor<Kvs> for Dummy {
+impl Cursor<Kvs> for KvsCursor {
     fn valid(&self) -> bool {
         unimplemented!()
     }
@@ -186,22 +129,124 @@ impl DbCursor<Kvs> for Dummy {
     }
 }
 
-impl IWriteBatch<Kvs> for Dummy {
-    fn put_cf(&mut self, _cf: ColumnFamily, _key: &Key, _value: &[u8]) -> Result<()> {
-        unimplemented!()
-    }
-
-    fn delete_cf(&mut self, _cf: ColumnFamily, _key: &Key) -> Result<()> {
+impl IWriteBatch<Kvs> for KvsWriteBatch {
+    fn put_cf(&mut self, _cf: ColumnFamily, _key: &Key, _data: &[u8]) -> Result<()> {
         unimplemented!()
     }
 }
 
-impl Iterator for Dummy {
-    type Item = (Box<Key>, Box<[u8]>);
+impl IDataCf<Kvs> for DataCf {
+    fn new(db: Arc<Kvs>) -> Self {
+        DataCf { db }
+    }
 
-    fn next(&mut self) -> Option<Self::Item> {
+    fn get_by_slot_index(&self, _slot: u64, _index: u64) -> Result<Option<Vec<u8>>> {
         unimplemented!()
     }
+
+    fn delete_by_slot_index(&self, _slot: u64, _index: u64) -> Result<()> {
+        unimplemented!()
+    }
+
+    fn put_by_slot_index(&self, _slot: u64, _index: u64, _serialized_value: &[u8]) -> Result<()> {
+        unimplemented!()
+    }
+
+    fn key(_slot: u64, _index: u64) -> Key {
+        unimplemented!()
+    }
+
+    fn slot_from_key(_key: &Key) -> Result<u64> {
+        unimplemented!()
+    }
+
+    fn index_from_key(_key: &Key) -> Result<u64> {
+        unimplemented!()
+    }
+}
+
+impl IErasureCf<Kvs> for ErasureCf {
+    fn new(db: Arc<Kvs>) -> Self {
+        ErasureCf { db }
+    }
+
+    fn delete_by_slot_index(&self, _slot: u64, _index: u64) -> Result<()> {
+        unimplemented!()
+    }
+
+    fn get_by_slot_index(&self, _slot: u64, _index: u64) -> Result<Option<Vec<u8>>> {
+        unimplemented!()
+    }
+
+    fn put_by_slot_index(&self, _slot: u64, _index: u64, _serialized_value: &[u8]) -> Result<()> {
+        unimplemented!()
+    }
+
+    fn key(slot: u64, index: u64) -> Key {
+        DataCf::key(slot, index)
+    }
+
+    fn slot_from_key(key: &Key) -> Result<u64> {
+        DataCf::slot_from_key(key)
+    }
+
+    fn index_from_key(key: &Key) -> Result<u64> {
+        DataCf::index_from_key(key)
+    }
+}
+
+impl IMetaCf<Kvs> for MetaCf {
+    fn new(db: Arc<Kvs>) -> Self {
+        MetaCf { db }
+    }
+
+    fn key(_slot: u64) -> Key {
+        unimplemented!()
+    }
+
+    fn get_slot_meta(&self, _slot: u64) -> Result<Option<super::SlotMeta>> {
+        unimplemented!()
+    }
+
+    fn put_slot_meta(&self, _slot: u64, _slot_meta: &super::SlotMeta) -> Result<()> {
+        unimplemented!()
+    }
+
+    fn index_from_key(_key: &Key) -> Result<u64> {
+        unimplemented!()
+    }
+}
+
+impl LedgerColumnFamilyRaw<Kvs> for DataCf {
+    fn db(&self) -> &Arc<Kvs> {
+        &self.db
+    }
+
+    fn handle(&self) -> ColumnFamily {
+        self.db.cf_handle(super::DATA_CF).unwrap()
+    }
+}
+
+impl LedgerColumnFamilyRaw<Kvs> for ErasureCf {
+    fn db(&self) -> &Arc<Kvs> {
+        &self.db
+    }
+
+    fn handle(&self) -> ColumnFamily {
+        self.db.cf_handle(super::ERASURE_CF).unwrap()
+    }
+}
+
+impl LedgerColumnFamily<Kvs> for MetaCf {
+    type ValueType = super::SlotMeta;
+
+    fn db(&self) -> &Arc<Kvs> {
+        &self.db
+    }
+
+    fn handle(&self) -> ColumnFamily {
+        self.db.cf_handle(super::META_CF).unwrap()
+    }
 }
 
 impl std::convert::From<kvstore::Error> for Error {
@@ -209,3 +254,12 @@ impl std::convert::From<kvstore::Error> for Error {
         Error::BlocktreeError(BlocktreeError::KvsDb(e))
     }
 }
+
+/// TODO: all this goes away with Blocktree
+impl Iterator for EntryIterator {
+    type Item = Entry;
+
+    fn next(&mut self) -> Option<Entry> {
+        unimplemented!()
+    }
+}

core/src/blocktree/meta.rs

@@ -1,317 +0,0 @@
-use crate::erasure::{NUM_CODING, NUM_DATA};
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize, Eq, PartialEq)]
-// The Meta column family
-pub struct SlotMeta {
-    // The number of slots above the root (the genesis block). The first
-    // slot has slot 0.
-    pub slot: u64,
-    // The total number of consecutive blobs starting from index 0
-    // we have received for this slot.
-    pub consumed: u64,
-    // The index *plus one* of the highest blob received for this slot.  Useful
-    // for checking if the slot has received any blobs yet, and to calculate the
-    // range where there is one or more holes: `(consumed..received)`.
-    pub received: u64,
-    // The index of the blob that is flagged as the last blob for this slot.
-    pub last_index: u64,
-    // The slot height of the block this one derives from.
-    pub parent_slot: u64,
-    // The list of slot heights, each of which contains a block that derives
-    // from this one.
-    pub next_slots: Vec<u64>,
-    // True if this slot is full (consumed == last_index + 1) and if every
-    // slot that is a parent of this slot is also connected.
-    pub is_connected: bool,
-    // True if this slot is a root
-    pub is_root: bool,
-}
-
-impl SlotMeta {
-    pub fn is_full(&self) -> bool {
-        // last_index is std::u64::MAX when it has no information about how
-        // many blobs will fill this slot.
-        // Note: A full slot with zero blobs is not possible.
-        if self.last_index == std::u64::MAX {
-            return false;
-        }
-
-        // Should never happen
-        if self.consumed > self.last_index + 1 {
-            solana_metrics::submit(
-                solana_metrics::influxdb::Point::new("blocktree_error")
-                    .add_field(
-                        "error",
-                        solana_metrics::influxdb::Value::String(format!(
-                            "Observed a slot meta with consumed: {} > meta.last_index + 1: {}",
-                            self.consumed,
-                            self.last_index + 1
-                        )),
-                    )
-                    .to_owned(),
-            );
-        }
-
-        self.consumed == self.last_index + 1
-    }
-
-    pub fn is_parent_set(&self) -> bool {
-        self.parent_slot != std::u64::MAX
-    }
-
-    pub(in crate::blocktree) fn new(slot: u64, parent_slot: u64) -> Self {
-        SlotMeta {
-            slot,
-            consumed: 0,
-            received: 0,
-            parent_slot,
-            next_slots: vec![],
-            is_connected: slot == 0,
-            is_root: false,
-            last_index: std::u64::MAX,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, Eq, PartialEq)]
-/// Erasure coding information
-pub struct ErasureMeta {
-    /// Which erasure set in the slot this is
-    pub set_index: u64,
-    /// Size of shards in this erasure set
-    pub size: usize,
-    /// Bitfield representing presence/absence of data blobs
-    pub data: u64,
-    /// Bitfield representing presence/absence of coding blobs
-    pub coding: u64,
-}
-
-#[derive(Debug, PartialEq)]
-pub enum ErasureMetaStatus {
-    CanRecover,
-    DataFull,
-    StillNeed(usize),
-}
-
-impl ErasureMeta {
-    pub fn new(set_index: u64) -> ErasureMeta {
-        ErasureMeta {
-            set_index,
-            size: 0,
-            data: 0,
-            coding: 0,
-        }
-    }
-
-    pub fn status(&self) -> ErasureMetaStatus {
-        let (data_missing, coding_missing) = (
-            NUM_DATA - self.data.count_ones() as usize,
-            NUM_CODING - self.coding.count_ones() as usize,
-        );
-        if data_missing > 0 && data_missing + coding_missing <= NUM_CODING {
-            assert!(self.size != 0);
-            ErasureMetaStatus::CanRecover
-        } else if data_missing == 0 {
-            ErasureMetaStatus::DataFull
-        } else {
-            ErasureMetaStatus::StillNeed(data_missing + coding_missing - NUM_CODING)
-        }
-    }
-
-    pub fn is_coding_present(&self, index: u64) -> bool {
-        if let Some(position) = self.data_index_in_set(index) {
-            self.coding & (1 << position) != 0
-        } else {
-            false
-        }
-    }
-
-    pub fn set_size(&mut self, size: usize) {
-        self.size = size;
-    }
-
-    pub fn size(&self) -> usize {
-        self.size
-    }
-
-    pub fn set_coding_present(&mut self, index: u64, present: bool) {
-        if let Some(position) = self.data_index_in_set(index) {
-            if present {
-                self.coding |= 1 << position;
-            } else {
-                self.coding &= !(1 << position);
-            }
-        }
-    }
-
-    pub fn is_data_present(&self, index: u64) -> bool {
-        if let Some(position) = self.data_index_in_set(index) {
-            self.data & (1 << position) != 0
-        } else {
-            false
-        }
-    }
-
-    pub fn set_data_present(&mut self, index: u64, present: bool) {
-        if let Some(position) = self.data_index_in_set(index) {
-            if present {
-                self.data |= 1 << position;
-            } else {
-                self.data &= !(1 << position);
-            }
-        }
-    }
-
-    pub fn set_index_for(index: u64) -> u64 {
-        index / NUM_DATA as u64
-    }
-
-    pub fn data_index_in_set(&self, index: u64) -> Option<u64> {
-        let set_index = Self::set_index_for(index);
-
-        if set_index == self.set_index {
-            Some(index - self.start_index())
-        } else {
-            None
-        }
-    }
-
-    pub fn coding_index_in_set(&self, index: u64) -> Option<u64> {
-        self.data_index_in_set(index).map(|i| i + NUM_DATA as u64)
-    }
-
-    pub fn start_index(&self) -> u64 {
-        self.set_index * NUM_DATA as u64
-    }
-
-    /// returns a tuple of (data_end, coding_end)
-    pub fn end_indexes(&self) -> (u64, u64) {
-        let start = self.start_index();
-        (start + NUM_DATA as u64, start + NUM_CODING as u64)
-    }
-}
-
-#[test]
-fn test_meta_indexes() {
-    use rand::{thread_rng, Rng};
-    // to avoid casts everywhere
-    const NUM_DATA: u64 = crate::erasure::NUM_DATA as u64;
-
-    let mut rng = thread_rng();
-
-    for _ in 0..100 {
-        let set_index = rng.gen_range(0, 1_000);
-        let blob_index = (set_index * NUM_DATA) + rng.gen_range(0, 16);
-
-        assert_eq!(set_index, ErasureMeta::set_index_for(blob_index));
-        let e_meta = ErasureMeta::new(set_index);
-
-        assert_eq!(e_meta.start_index(), set_index * NUM_DATA);
-        let (data_end_idx, coding_end_idx) = e_meta.end_indexes();
-        assert_eq!(data_end_idx, (set_index + 1) * NUM_DATA);
-        assert_eq!(coding_end_idx, set_index * NUM_DATA + NUM_CODING as u64);
-    }
-
-    let mut e_meta = ErasureMeta::new(0);
-
-    assert_eq!(e_meta.data_index_in_set(0), Some(0));
-    assert_eq!(e_meta.data_index_in_set(NUM_DATA / 2), Some(NUM_DATA / 2));
-    assert_eq!(e_meta.data_index_in_set(NUM_DATA - 1), Some(NUM_DATA - 1));
-    assert_eq!(e_meta.data_index_in_set(NUM_DATA), None);
-    assert_eq!(e_meta.data_index_in_set(std::u64::MAX), None);
-
-    e_meta.set_index = 1;
-
-    assert_eq!(e_meta.data_index_in_set(0), None);
-    assert_eq!(e_meta.data_index_in_set(NUM_DATA - 1), None);
-    assert_eq!(e_meta.data_index_in_set(NUM_DATA), Some(0));
-    assert_eq!(
-        e_meta.data_index_in_set(NUM_DATA * 2 - 1),
-        Some(NUM_DATA - 1)
-    );
-    assert_eq!(e_meta.data_index_in_set(std::u64::MAX), None);
-}
-
-#[test]
-fn test_meta_coding_present() {
-    let mut e_meta = ErasureMeta::default();
-
-    for i in 0..NUM_CODING as u64 {
-        e_meta.set_coding_present(i, true);
-        assert_eq!(e_meta.is_coding_present(i), true);
-    }
-    for i in NUM_CODING as u64..NUM_DATA as u64 {
-        assert_eq!(e_meta.is_coding_present(i), false);
-    }
-
-    e_meta.set_index = ErasureMeta::set_index_for((NUM_DATA * 17) as u64);
-
-    for i in (NUM_DATA * 17) as u64..((NUM_DATA * 17) + NUM_CODING) as u64 {
-        e_meta.set_coding_present(i, true);
-        assert_eq!(e_meta.is_coding_present(i), true);
-    }
-    for i in (NUM_DATA * 17 + NUM_CODING) as u64..((NUM_DATA * 17) + NUM_DATA) as u64 {
-        assert_eq!(e_meta.is_coding_present(i), false);
-    }
-}
-
-#[test]
-fn test_erasure_meta_status() {
-    let mut e_meta = ErasureMeta::default();
-
-    assert_eq!(e_meta.status(), ErasureMetaStatus::StillNeed(NUM_DATA));
-
-    e_meta.data = 0b1111_1111_1111_1111;
-    e_meta.coding = 0x00;
-
-    assert_eq!(e_meta.status(), ErasureMetaStatus::DataFull);
-
-    e_meta.coding = 0x0e;
-    e_meta.size = 1;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::DataFull);
-
-    e_meta.data = 0b0111_1111_1111_1111;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::CanRecover);
-
-    e_meta.data = 0b0111_1111_1111_1110;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::CanRecover);
-
-    e_meta.data = 0b0111_1111_1011_1110;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::CanRecover);
-
-    e_meta.data = 0b0111_1011_1011_1110;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::StillNeed(1));
-
-    e_meta.data = 0b0111_1011_1011_1110;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::StillNeed(1));
-
-    e_meta.coding = 0b0000_1110;
-    e_meta.data = 0b1111_1111_1111_1100;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::CanRecover);
-
-    e_meta.data = 0b1111_1111_1111_1000;
-    assert_eq!(e_meta.status(), ErasureMetaStatus::CanRecover);
-}
-
-#[test]
-fn test_meta_data_present() {
-    let mut e_meta = ErasureMeta::default();
-
-    for i in 0..NUM_DATA as u64 {
-        e_meta.set_data_present(i, true);
-        assert_eq!(e_meta.is_data_present(i), true);
-    }
-    for i in NUM_DATA as u64..2 * NUM_DATA as u64 {
-        assert_eq!(e_meta.is_data_present(i), false);
-    }
-
-    e_meta.set_index = ErasureMeta::set_index_for((NUM_DATA * 23) as u64);
-
-    for i in (NUM_DATA * 23) as u64..(NUM_DATA * 24) as u64 {
-        e_meta.set_data_present(i, true);
-        assert_eq!(e_meta.is_data_present(i), true);
-    }
-    for i in (NUM_DATA * 22) as u64..(NUM_DATA * 23) as u64 {
-        assert_eq!(e_meta.is_data_present(i), false);
-    }
-}

core/src/blocktree/rocks.rs

@@ -1,17 +1,29 @@
-use crate::blocktree::db::columns as cf;
-use crate::blocktree::db::{Backend, Column, DbCursor, IWriteBatch, TypedColumn};
-use crate::blocktree::BlocktreeError;
+use crate::entry::Entry;
+use crate::packet::{Blob, BLOB_HEADER_SIZE};
 use crate::result::{Error, Result};
 
-use byteorder::{BigEndian, ByteOrder};
+use bincode::deserialize;
+
+use byteorder::{BigEndian, ByteOrder, ReadBytesExt};
 
 use rocksdb::{
-    self, ColumnFamily, ColumnFamilyDescriptor, DBIterator, DBRawIterator, IteratorMode, Options,
+    self, ColumnFamily, ColumnFamilyDescriptor, DBRawIterator, IteratorMode, Options,
     WriteBatch as RWriteBatch, DB,
 };
 
+use solana_sdk::hash::Hash;
+use solana_sdk::timing::DEFAULT_TICKS_PER_SLOT;
+
 use std::fs;
+use std::io;
 use std::path::Path;
+use std::sync::Arc;
+
+use super::db::{
+    Cursor, Database, IDataCf, IErasureCf, IMetaCf, IWriteBatch, LedgerColumnFamily,
+    LedgerColumnFamilyRaw,
+};
+use super::{Blocktree, BlocktreeError};
 
 // A good value for this is the number of cores on the machine
 const TOTAL_THREADS: i32 = 8;
@@ -20,213 +32,194 @@ const MAX_WRITE_BUFFER_SIZE: usize = 512 * 1024 * 1024;
 #[derive(Debug)]
 pub struct Rocks(rocksdb::DB);
 
-impl Backend for Rocks {
-    type Key = [u8];
-    type OwnedKey = Vec<u8>;
-    type ColumnFamily = ColumnFamily;
-    type Cursor = DBRawIterator;
-    type Iter = DBIterator;
-    type WriteBatch = RWriteBatch;
-    type Error = rocksdb::Error;
+/// The metadata column family
+#[derive(Debug)]
+pub struct MetaCf {
+    db: Arc<Rocks>,
+}
 
-    fn open(path: &Path) -> Result<Rocks> {
-        use crate::blocktree::db::columns::{Coding, Data, ErasureMeta, Orphans, SlotMeta};
+/// The data column family
+#[derive(Debug)]
+pub struct DataCf {
+    db: Arc<Rocks>,
+}
 
-        fs::create_dir_all(&path)?;
+/// The erasure column family
+#[derive(Debug)]
+pub struct ErasureCf {
+    db: Arc<Rocks>,
+}
+
+/// TODO: all this goes away with Blocktree
+pub struct EntryIterator {
+    db_iterator: DBRawIterator,
+
+    // TODO: remove me when replay_stage is iterating by block (Blocktree)
+    //    this verification is duplicating that of replay_stage, which
+    //    can do this in parallel
+    blockhash: Option<Hash>,
+    // https://github.com/rust-rocksdb/rust-rocksdb/issues/234
+    //   rocksdb issue: the _blocktree member must be lower in the struct to prevent a crash
+    //   when the db_iterator member above is dropped.
+    //   _blocktree is unused, but dropping _blocktree results in a broken db_iterator
+    //   you have to hold the database open in order to iterate over it, and in order
+    //   for db_iterator to be able to run Drop
+    //    _blocktree: Blocktree,
+}
+
+impl Blocktree {
+    /// Opens a Ledger in directory, provides "infinite" window of blobs
+    pub fn open(ledger_path: &str) -> Result<Blocktree> {
+        fs::create_dir_all(&ledger_path)?;
+        let ledger_path = Path::new(ledger_path).join(super::BLOCKTREE_DIRECTORY);
 
         // Use default database options
-        let db_options = get_db_options();
+        let db_options = Blocktree::get_db_options();
 
         // Column family names
-        let meta_cf_descriptor = ColumnFamilyDescriptor::new(SlotMeta::NAME, get_cf_options());
-        let data_cf_descriptor = ColumnFamilyDescriptor::new(Data::NAME, get_cf_options());
-        let erasure_cf_descriptor = ColumnFamilyDescriptor::new(Coding::NAME, get_cf_options());
-        let erasure_meta_cf_descriptor =
-            ColumnFamilyDescriptor::new(ErasureMeta::NAME, get_cf_options());
-        let orphans_cf_descriptor = ColumnFamilyDescriptor::new(Orphans::NAME, get_cf_options());
-
+        let meta_cf_descriptor =
+            ColumnFamilyDescriptor::new(super::META_CF, Blocktree::get_cf_options());
+        let data_cf_descriptor =
+            ColumnFamilyDescriptor::new(super::DATA_CF, Blocktree::get_cf_options());
+        let erasure_cf_descriptor =
+            ColumnFamilyDescriptor::new(super::ERASURE_CF, Blocktree::get_cf_options());
         let cfs = vec![
             meta_cf_descriptor,
             data_cf_descriptor,
             erasure_cf_descriptor,
-            erasure_meta_cf_descriptor,
-            orphans_cf_descriptor,
         ];
 
         // Open the database
-        let db = Rocks(DB::open_cf_descriptors(&db_options, path, cfs)?);
+        let db = Arc::new(Rocks(DB::open_cf_descriptors(
+            &db_options,
+            ledger_path,
+            cfs,
+        )?));
 
-        Ok(db)
+        // Create the metadata column family
+        let meta_cf = MetaCf::new(db.clone());
+
+        // Create the data column family
+        let data_cf = DataCf::new(db.clone());
+
+        // Create the erasure column family
+        let erasure_cf = ErasureCf::new(db.clone());
+
+        let ticks_per_slot = DEFAULT_TICKS_PER_SLOT;
+        Ok(Blocktree {
+            db,
+            meta_cf,
+            data_cf,
+            erasure_cf,
+            new_blobs_signals: vec![],
+            ticks_per_slot,
+        })
     }
 
-    fn columns(&self) -> Vec<&'static str> {
-        use crate::blocktree::db::columns::{Coding, Data, ErasureMeta, Orphans, SlotMeta};
-
-        vec![
-            Coding::NAME,
-            ErasureMeta::NAME,
-            Data::NAME,
-            Orphans::NAME,
-            SlotMeta::NAME,
-        ]
+    pub fn read_ledger_blobs(&self) -> impl Iterator<Item = Blob> {
+        self.db
+            .0
+            .iterator_cf(self.data_cf.handle(), IteratorMode::Start)
+            .unwrap()
+            .map(|(_, blob_data)| Blob::new(&blob_data))
     }
 
-    fn destroy(path: &Path) -> Result<()> {
-        DB::destroy(&Options::default(), path)?;
+    /// Return an iterator for all the entries in the given file.
+    pub fn read_ledger(&self) -> Result<impl Iterator<Item = Entry>> {
+        let mut db_iterator = self.db.raw_iterator_cf(self.data_cf.handle())?;
 
+        db_iterator.seek_to_first();
+        Ok(EntryIterator {
+            db_iterator,
+            blockhash: None,
+        })
+    }
+
+    pub fn destroy(ledger_path: &str) -> Result<()> {
+        // DB::destroy() fails if `ledger_path` doesn't exist
+        fs::create_dir_all(&ledger_path)?;
+        let ledger_path = Path::new(ledger_path).join(super::BLOCKTREE_DIRECTORY);
+        DB::destroy(&Options::default(), &ledger_path)?;
         Ok(())
     }
 
-    fn cf_handle(&self, cf: &str) -> ColumnFamily {
-        self.0
-            .cf_handle(cf)
-            .expect("should never get an unknown column")
+    fn get_cf_options() -> Options {
+        let mut options = Options::default();
+        options.set_max_write_buffer_number(32);
+        options.set_write_buffer_size(MAX_WRITE_BUFFER_SIZE);
+        options.set_max_bytes_for_level_base(MAX_WRITE_BUFFER_SIZE as u64);
+        options
+    }
+
+    fn get_db_options() -> Options {
+        let mut options = Options::default();
+        options.create_if_missing(true);
+        options.create_missing_column_families(true);
+        options.increase_parallelism(TOTAL_THREADS);
+        options.set_max_background_flushes(4);
+        options.set_max_background_compactions(4);
+        options.set_max_write_buffer_number(32);
+        options.set_write_buffer_size(MAX_WRITE_BUFFER_SIZE);
+        options.set_max_bytes_for_level_base(MAX_WRITE_BUFFER_SIZE as u64);
+        options
+    }
+}
+
+impl Database for Rocks {
+    type Error = rocksdb::Error;
+    type Key = Vec<u8>;
+    type KeyRef = [u8];
+    type ColumnFamily = ColumnFamily;
+    type Cursor = DBRawIterator;
+    type EntryIter = EntryIterator;
+    type WriteBatch = RWriteBatch;
+
+    fn cf_handle(&self, cf: &str) -> Option<ColumnFamily> {
+        self.0.cf_handle(cf)
     }
 
     fn get_cf(&self, cf: ColumnFamily, key: &[u8]) -> Result<Option<Vec<u8>>> {
-        let opt = self.0.get_cf(cf, key)?.map(|db_vec| db_vec.to_vec());
-        Ok(opt)
+        let opt = self.0.get_cf(cf, key)?;
+        Ok(opt.map(|dbvec| dbvec.to_vec()))
     }
 
-    fn put_cf(&self, cf: ColumnFamily, key: &[u8], value: &[u8]) -> Result<()> {
-        self.0.put_cf(cf, key, value)?;
+    fn put_cf(&self, cf: ColumnFamily, key: &[u8], data: &[u8]) -> Result<()> {
+        self.0.put_cf(cf, key, data)?;
         Ok(())
     }
 
-    fn delete_cf(&self, cf: ColumnFamily, key: &[u8]) -> Result<()> {
-        self.0.delete_cf(cf, key)?;
-        Ok(())
+    fn delete_cf(&self, cf: Self::ColumnFamily, key: &[u8]) -> Result<()> {
+        self.0.delete_cf(cf, key).map_err(From::from)
     }
 
-    fn iterator_cf(&self, cf: ColumnFamily) -> Result<DBIterator> {
-        let raw_iter = self.0.iterator_cf(cf, IteratorMode::Start)?;
-
-        Ok(raw_iter)
+    fn raw_iterator_cf(&self, cf: Self::ColumnFamily) -> Result<Self::Cursor> {
+        Ok(self.0.raw_iterator_cf(cf)?)
     }
 
-    fn raw_iterator_cf(&self, cf: ColumnFamily) -> Result<DBRawIterator> {
-        let raw_iter = self.0.raw_iterator_cf(cf)?;
-
-        Ok(raw_iter)
+    fn write(&self, batch: Self::WriteBatch) -> Result<()> {
+        self.0.write(batch).map_err(From::from)
     }
 
-    fn batch(&self) -> Result<RWriteBatch> {
+    fn batch(&self) -> Result<Self::WriteBatch> {
         Ok(RWriteBatch::default())
     }
-
-    fn write(&self, batch: RWriteBatch) -> Result<()> {
-        self.0.write(batch)?;
-        Ok(())
-    }
 }
 
-impl Column<Rocks> for cf::Coding {
-    const NAME: &'static str = super::ERASURE_CF;
-    type Index = (u64, u64);
-
-    fn key(index: (u64, u64)) -> Vec<u8> {
-        cf::Data::key(index)
-    }
-
-    fn index(key: &[u8]) -> (u64, u64) {
-        cf::Data::index(key)
-    }
-}
-
-impl Column<Rocks> for cf::Data {
-    const NAME: &'static str = super::DATA_CF;
-    type Index = (u64, u64);
-
-    fn key((slot, index): (u64, u64)) -> Vec<u8> {
-        let mut key = vec![0; 16];
-        BigEndian::write_u64(&mut key[..8], slot);
-        BigEndian::write_u64(&mut key[8..16], index);
-        key
-    }
-
-    fn index(key: &[u8]) -> (u64, u64) {
-        let slot = BigEndian::read_u64(&key[..8]);
-        let index = BigEndian::read_u64(&key[8..16]);
-        (slot, index)
-    }
-}
-
-impl Column<Rocks> for cf::Orphans {
-    const NAME: &'static str = super::ORPHANS_CF;
-    type Index = u64;
-
-    fn key(slot: u64) -> Vec<u8> {
-        let mut key = vec![0; 8];
-        BigEndian::write_u64(&mut key[..], slot);
-        key
-    }
-
-    fn index(key: &[u8]) -> u64 {
-        BigEndian::read_u64(&key[..8])
-    }
-}
-
-impl TypedColumn<Rocks> for cf::Orphans {
-    type Type = bool;
-}
-
-impl Column<Rocks> for cf::SlotMeta {
-    const NAME: &'static str = super::META_CF;
-    type Index = u64;
-
-    fn key(slot: u64) -> Vec<u8> {
-        let mut key = vec![0; 8];
-        BigEndian::write_u64(&mut key[..], slot);
-        key
-    }
-
-    fn index(key: &[u8]) -> u64 {
-        BigEndian::read_u64(&key[..8])
-    }
-}
-
-impl TypedColumn<Rocks> for cf::SlotMeta {
-    type Type = super::SlotMeta;
-}
-
-impl Column<Rocks> for cf::ErasureMeta {
-    const NAME: &'static str = super::ERASURE_META_CF;
-    type Index = (u64, u64);
-
-    fn index(key: &[u8]) -> (u64, u64) {
-        let slot = BigEndian::read_u64(&key[..8]);
-        let set_index = BigEndian::read_u64(&key[8..]);
-
-        (slot, set_index)
-    }
-
-    fn key((slot, set_index): (u64, u64)) -> Vec<u8> {
-        let mut key = vec![0; 16];
-        BigEndian::write_u64(&mut key[..8], slot);
-        BigEndian::write_u64(&mut key[8..], set_index);
-        key
-    }
-}
-
-impl TypedColumn<Rocks> for cf::ErasureMeta {
-    type Type = super::ErasureMeta;
-}
-
-impl DbCursor<Rocks> for DBRawIterator {
+impl Cursor<Rocks> for DBRawIterator {
     fn valid(&self) -> bool {
         DBRawIterator::valid(self)
     }
 
     fn seek(&mut self, key: &[u8]) {
-        DBRawIterator::seek(self, key);
+        DBRawIterator::seek(self, key)
     }
 
     fn seek_to_first(&mut self) {
-        DBRawIterator::seek_to_first(self);
+        DBRawIterator::seek_to_first(self)
     }
 
     fn next(&mut self) {
-        DBRawIterator::next(self);
+        DBRawIterator::next(self)
     }
 
     fn key(&self) -> Option<Vec<u8>> {
@@ -239,14 +232,141 @@ impl DbCursor<Rocks> for DBRawIterator {
 }
 
 impl IWriteBatch<Rocks> for RWriteBatch {
-    fn put_cf(&mut self, cf: ColumnFamily, key: &[u8], value: &[u8]) -> Result<()> {
-        RWriteBatch::put_cf(self, cf, key, value)?;
+    fn put_cf(&mut self, cf: ColumnFamily, key: &[u8], data: &[u8]) -> Result<()> {
+        RWriteBatch::put_cf(self, cf, key, data)?;
         Ok(())
     }
+}
 
-    fn delete_cf(&mut self, cf: ColumnFamily, key: &[u8]) -> Result<()> {
-        RWriteBatch::delete_cf(self, cf, key)?;
-        Ok(())
+impl IDataCf<Rocks> for DataCf {
+    fn new(db: Arc<Rocks>) -> Self {
+        DataCf { db }
+    }
+
+    fn get_by_slot_index(&self, slot: u64, index: u64) -> Result<Option<Vec<u8>>> {
+        let key = Self::key(slot, index);
+        self.get(&key)
+    }
+
+    fn delete_by_slot_index(&self, slot: u64, index: u64) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.delete(&key)
+    }
+
+    fn put_by_slot_index(&self, slot: u64, index: u64, serialized_value: &[u8]) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.put(&key, serialized_value)
+    }
+
+    fn key(slot: u64, index: u64) -> Vec<u8> {
+        let mut key = vec![0u8; 16];
+        BigEndian::write_u64(&mut key[0..8], slot);
+        BigEndian::write_u64(&mut key[8..16], index);
+        key
+    }
+
+    fn slot_from_key(key: &[u8]) -> Result<u64> {
+        let mut rdr = io::Cursor::new(&key[0..8]);
+        let height = rdr.read_u64::<BigEndian>()?;
+        Ok(height)
+    }
+
+    fn index_from_key(key: &[u8]) -> Result<u64> {
+        let mut rdr = io::Cursor::new(&key[8..16]);
+        let index = rdr.read_u64::<BigEndian>()?;
+        Ok(index)
+    }
+}
+
+impl IErasureCf<Rocks> for ErasureCf {
+    fn new(db: Arc<Rocks>) -> Self {
+        ErasureCf { db }
+    }
+    fn delete_by_slot_index(&self, slot: u64, index: u64) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.delete(&key)
+    }
+
+    fn get_by_slot_index(&self, slot: u64, index: u64) -> Result<Option<Vec<u8>>> {
+        let key = Self::key(slot, index);
+        self.get(&key)
+    }
+
+    fn put_by_slot_index(&self, slot: u64, index: u64, serialized_value: &[u8]) -> Result<()> {
+        let key = Self::key(slot, index);
+        self.put(&key, serialized_value)
+    }
+
+    fn key(slot: u64, index: u64) -> Vec<u8> {
+        DataCf::key(slot, index)
+    }
+
+    fn slot_from_key(key: &[u8]) -> Result<u64> {
+        DataCf::slot_from_key(key)
+    }
+
+    fn index_from_key(key: &[u8]) -> Result<u64> {
+        DataCf::index_from_key(key)
+    }
+}
+
+impl IMetaCf<Rocks> for MetaCf {
+    fn new(db: Arc<Rocks>) -> Self {
+        MetaCf { db }
+    }
+
+    fn key(slot: u64) -> Vec<u8> {
+        let mut key = vec![0u8; 8];
+        BigEndian::write_u64(&mut key[0..8], slot);
+        key
+    }
+
+    fn get_slot_meta(&self, slot: u64) -> Result<Option<super::SlotMeta>> {
+        let key = Self::key(slot);
+        self.get(&key)
+    }
+
+    fn put_slot_meta(&self, slot: u64, slot_meta: &super::SlotMeta) -> Result<()> {
+        let key = Self::key(slot);
+        self.put(&key, slot_meta)
+    }
+
+    fn index_from_key(key: &[u8]) -> Result<u64> {
+        let mut rdr = io::Cursor::new(&key[..]);
+        let index = rdr.read_u64::<BigEndian>()?;
+        Ok(index)
+    }
+}
+
+impl LedgerColumnFamilyRaw<Rocks> for DataCf {
+    fn db(&self) -> &Arc<Rocks> {
+        &self.db
+    }
+
+    fn handle(&self) -> ColumnFamily {
+        self.db.cf_handle(super::DATA_CF).unwrap()
+    }
+}
+
+impl LedgerColumnFamilyRaw<Rocks> for ErasureCf {
+    fn db(&self) -> &Arc<Rocks> {
+        &self.db
+    }
+
+    fn handle(&self) -> ColumnFamily {
+        self.db.cf_handle(super::ERASURE_CF).unwrap()
+    }
+}
+
+impl LedgerColumnFamily<Rocks> for MetaCf {
+    type ValueType = super::SlotMeta;
+
+    fn db(&self) -> &Arc<Rocks> {
+        &self.db
+    }
+
+    fn handle(&self) -> ColumnFamily {
+        self.db.cf_handle(super::META_CF).unwrap()
     }
 }
 
@@ -256,23 +376,25 @@ impl std::convert::From<rocksdb::Error> for Error {
     }
 }
 
-fn get_cf_options() -> Options {
-    let mut options = Options::default();
-    options.set_max_write_buffer_number(32);
-    options.set_write_buffer_size(MAX_WRITE_BUFFER_SIZE);
-    options.set_max_bytes_for_level_base(MAX_WRITE_BUFFER_SIZE as u64);
-    options
-}
+/// TODO: all this goes away with Blocktree
+impl Iterator for EntryIterator {
+    type Item = Entry;
 
-fn get_db_options() -> Options {
-    let mut options = Options::default();
-    options.create_if_missing(true);
-    options.create_missing_column_families(true);
-    options.increase_parallelism(TOTAL_THREADS);
-    options.set_max_background_flushes(4);
-    options.set_max_background_compactions(4);
-    options.set_max_write_buffer_number(32);
-    options.set_write_buffer_size(MAX_WRITE_BUFFER_SIZE);
-    options.set_max_bytes_for_level_base(MAX_WRITE_BUFFER_SIZE as u64);
-    options
+    fn next(&mut self) -> Option<Entry> {
+        if self.db_iterator.valid() {
+            if let Some(value) = self.db_iterator.value() {
+                if let Ok(entry) = deserialize::<Entry>(&value[BLOB_HEADER_SIZE..]) {
+                    if let Some(blockhash) = self.blockhash {
+                        if !entry.verify(&blockhash) {
+                            return None;
+                        }
+                    }
+                    self.db_iterator.next();
+                    self.blockhash = Some(entry.hash);
+                    return Some(entry);
+                }
+            }
+        }
+        None
+    }
 }

core/src/blocktree_processor.rs

@@ -1,18 +1,24 @@
 use crate::bank_forks::BankForks;
 use crate::blocktree::Blocktree;
 use crate::entry::{Entry, EntrySlice};
-use crate::leader_schedule_cache::LeaderScheduleCache;
+use crate::leader_schedule_utils;
 use rayon::prelude::*;
 use solana_metrics::counter::Counter;
-use solana_runtime::bank::Bank;
-use solana_runtime::locked_accounts_results::LockedAccountsResults;
+use solana_runtime::bank::{Bank, BankError, Result};
 use solana_sdk::genesis_block::GenesisBlock;
 use solana_sdk::timing::duration_as_ms;
 use solana_sdk::timing::MAX_RECENT_BLOCKHASHES;
-use solana_sdk::transaction::Result;
-use std::result;
 use std::sync::Arc;
-use std::time::{Duration, Instant};
+use std::time::Instant;
+
+pub fn process_entry(bank: &Bank, entry: &Entry) -> Result<()> {
+    if !entry.is_tick() {
+        first_err(&bank.process_transactions(&entry.transactions))?;
+    } else {
+        bank.register_tick(&entry.hash);
+    }
+    Ok(())
+}
 
 fn first_err(results: &[Result<()>]) -> Result<()> {
     for r in results {
@@ -21,48 +27,30 @@ fn first_err(results: &[Result<()>]) -> Result<()> {
     Ok(())
 }
 
-fn par_execute_entries(bank: &Bank, entries: &[(&Entry, LockedAccountsResults)]) -> Result<()> {
+fn par_execute_entries(bank: &Bank, entries: &[(&Entry, Vec<Result<()>>)]) -> Result<()> {
     inc_new_counter_info!("bank-par_execute_entries-count", entries.len());
     let results: Vec<Result<()>> = entries
         .into_par_iter()
-        .map(|(e, locked_accounts)| {
+        .map(|(e, lock_results)| {
             let results = bank.load_execute_and_commit_transactions(
                 &e.transactions,
-                locked_accounts,
+                lock_results.to_vec(),
                 MAX_RECENT_BLOCKHASHES,
             );
-            let mut first_err = None;
-            for r in results {
-                if let Err(ref e) = r {
-                    if first_err.is_none() {
-                        first_err = Some(r.clone());
-                    }
-                    if !Bank::can_commit(&r) {
-                        warn!("Unexpected validator error: {:?}", e);
-                        solana_metrics::submit(
-                            solana_metrics::influxdb::Point::new("validator_process_entry_error")
-                                .add_field(
-                                    "error",
-                                    solana_metrics::influxdb::Value::String(format!("{:?}", e)),
-                                )
-                                .to_owned(),
-                        )
-                    }
-                }
-            }
-            first_err.unwrap_or(Ok(()))
+            bank.unlock_accounts(&e.transactions, &results);
+            first_err(&results)
         })
         .collect();
 
     first_err(&results)
 }
 
-/// Process an ordered list of entries in parallel
+/// process entries in parallel
 /// 1. In order lock accounts for each entry while the lock succeeds, up to a Tick entry
 /// 2. Process the locked group in parallel
 /// 3. Register the `Tick` if it's available
 /// 4. Update the leader scheduler, goto 1
-pub fn process_entries(bank: &Bank, entries: &[Entry]) -> Result<()> {
+fn par_process_entries(bank: &Bank, entries: &[Entry]) -> Result<()> {
     // accumulator for entries that can be processed in parallel
     let mut mt_group = vec![];
     for entry in entries {
@@ -77,12 +65,11 @@ pub fn process_entries(bank: &Bank, entries: &[Entry]) -> Result<()> {
         let lock_results = bank.lock_accounts(&entry.transactions);
         // if any of the locks error out
         // execute the current group
-        if first_err(lock_results.locked_accounts_results()).is_err() {
+        if first_err(&lock_results).is_err() {
             par_execute_entries(bank, &mt_group)?;
-            // Drop all the locks on accounts by clearing the LockedAccountsFinalizer's in the
-            // mt_group
             mt_group = vec![];
-            drop(lock_results);
+            //reset the lock and push the entry
+            bank.unlock_accounts(&entry.transactions, &lock_results);
             let lock_results = bank.lock_accounts(&entry.transactions);
             mt_group.push((entry, lock_results));
         } else {
@@ -94,24 +81,25 @@ pub fn process_entries(bank: &Bank, entries: &[Entry]) -> Result<()> {
     Ok(())
 }
 
+/// Process an ordered list of entries.
+pub fn process_entries(bank: &Bank, entries: &[Entry]) -> Result<()> {
+    par_process_entries(bank, entries)
+}
+
 #[derive(Debug, PartialEq)]
 pub struct BankForksInfo {
     pub bank_slot: u64,
     pub entry_height: u64,
 }
 
-#[derive(Debug)]
-pub enum BlocktreeProcessorError {
-    LedgerVerificationFailed,
-}
-
 pub fn process_blocktree(
     genesis_block: &GenesisBlock,
     blocktree: &Blocktree,
     account_paths: Option<String>,
-) -> result::Result<(BankForks, Vec<BankForksInfo>, LeaderScheduleCache), BlocktreeProcessorError> {
+) -> Result<(BankForks, Vec<BankForksInfo>)> {
     let now = Instant::now();
     info!("processing ledger...");
+
     // Setup bank for slot 0
     let mut pending_slots = {
         let slot = 0;
@@ -124,30 +112,22 @@ pub fn process_blocktree(
             .meta(slot)
             .map_err(|err| {
                 warn!("Failed to load meta for slot {}: {:?}", slot, err);
-                BlocktreeProcessorError::LedgerVerificationFailed
+                BankError::LedgerVerificationFailed
             })?
             .unwrap();
 
         vec![(slot, meta, bank, entry_height, last_entry_hash)]
     };
 
-    let leader_schedule_cache = LeaderScheduleCache::new(*pending_slots[0].2.epoch_schedule());
-
     let mut fork_info = vec![];
-    let mut last_status_report = Instant::now();
     while !pending_slots.is_empty() {
         let (slot, meta, bank, mut entry_height, mut last_entry_hash) =
             pending_slots.pop().unwrap();
 
-        if last_status_report.elapsed() > Duration::from_secs(2) {
-            info!("processing ledger...block {}", slot);
-            last_status_report = Instant::now();
-        }
-
         // Fetch all entries for this slot
         let mut entries = blocktree.get_slot_entries(slot, 0, None).map_err(|err| {
             warn!("Failed to load entries for slot {}: {:?}", slot, err);
-            BlocktreeProcessorError::LedgerVerificationFailed
+            BankError::LedgerVerificationFailed
         })?;
 
         if slot == 0 {
@@ -156,12 +136,12 @@ pub fn process_blocktree(
             // processed by the bank, skip over it.
             if entries.is_empty() {
                 warn!("entry0 not present");
-                return Err(BlocktreeProcessorError::LedgerVerificationFailed);
+                return Err(BankError::LedgerVerificationFailed);
             }
             let entry0 = entries.remove(0);
             if !(entry0.is_tick() && entry0.verify(&last_entry_hash)) {
                 warn!("Ledger proof of history failed at entry0");
-                return Err(BlocktreeProcessorError::LedgerVerificationFailed);
+                return Err(BankError::LedgerVerificationFailed);
             }
             last_entry_hash = entry0.hash;
             entry_height += 1;
@@ -173,23 +153,20 @@ pub fn process_blocktree(
                     "Ledger proof of history failed at slot: {}, entry: {}",
                     slot, entry_height
                 );
-                return Err(BlocktreeProcessorError::LedgerVerificationFailed);
+                return Err(BankError::LedgerVerificationFailed);
             }
 
             process_entries(&bank, &entries).map_err(|err| {
                 warn!("Failed to process entries for slot {}: {:?}", slot, err);
-                BlocktreeProcessorError::LedgerVerificationFailed
+                BankError::LedgerVerificationFailed
             })?;
 
             last_entry_hash = entries.last().unwrap().hash;
             entry_height += entries.len() as u64;
         }
 
-        bank.freeze(); // all banks handled by this routine are created from complete slots
-
-        if blocktree.is_root(slot) {
-            bank.squash();
-        }
+        // TODO merge with locktower, voting, bank.vote_accounts()...
+        bank.squash();
 
         if meta.next_slots.is_empty() {
             // Reached the end of this fork.  Record the final entry height and last entry.hash
@@ -207,7 +184,7 @@ pub fn process_blocktree(
                 .meta(next_slot)
                 .map_err(|err| {
                     warn!("Failed to load meta for slot {}: {:?}", slot, err);
-                    BlocktreeProcessorError::LedgerVerificationFailed
+                    BankError::LedgerVerificationFailed
                 })?
                 .unwrap();
 
@@ -216,9 +193,7 @@ pub fn process_blocktree(
             if next_meta.is_full() {
                 let next_bank = Arc::new(Bank::new_from_parent(
                     &bank,
-                    &leader_schedule_cache
-                        .slot_leader_at_else_compute(next_slot, &bank)
-                        .unwrap(),
+                    &leader_schedule_utils::slot_leader_at(next_slot, &bank).unwrap(),
                     next_slot,
                 ));
                 trace!("Add child bank for slot={}", next_slot);
@@ -247,12 +222,12 @@ pub fn process_blocktree(
     let (banks, bank_forks_info): (Vec<_>, Vec<_>) = fork_info.into_iter().unzip();
     let bank_forks = BankForks::new_from_banks(&banks);
     info!(
-        "processing ledger...complete in {}ms, forks={}...",
+        "processed ledger in {}ms, forks={}...",
         duration_as_ms(&now.elapsed()),
         bank_forks_info.len(),
     );
 
-    Ok((bank_forks, bank_forks_info, leader_schedule_cache))
+    Ok((bank_forks, bank_forks_info))
 }
 
 #[cfg(test)]
@@ -260,14 +235,11 @@ mod tests {
     use super::*;
     use crate::blocktree::create_new_tmp_ledger;
     use crate::blocktree::tests::entries_to_blobs;
-    use crate::entry::{create_ticks, next_entry, next_entry_mut, Entry};
+    use crate::entry::{create_ticks, next_entry, Entry};
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::hash::Hash;
-    use solana_sdk::instruction::InstructionError;
-    use solana_sdk::pubkey::Pubkey;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::system_transaction;
-    use solana_sdk::transaction::TransactionError;
+    use solana_sdk::system_transaction::SystemTransaction;
 
     fn fill_blocktree_slot_with_ticks(
         blocktree: &Blocktree,
@@ -308,8 +280,8 @@ mod tests {
         let (ledger_path, mut blockhash) = create_new_tmp_ledger!(&genesis_block);
         debug!("ledger_path: {:?}", ledger_path);
 
-        let blocktree =
-            Blocktree::open(&ledger_path).expect("Expected to successfully open database ledger");
+        let blocktree = Blocktree::open_config(&ledger_path, ticks_per_slot)
+            .expect("Expected to successfully open database ledger");
 
         // Write slot 1
         // slot 1, points at slot 0.  Missing one tick
@@ -329,7 +301,7 @@ mod tests {
         // slot 2, points at slot 1
         fill_blocktree_slot_with_ticks(&blocktree, ticks_per_slot, 2, 1, blockhash);
 
-        let (mut _bank_forks, bank_forks_info, _) =
+        let (mut _bank_forks, bank_forks_info) =
             process_blocktree(&genesis_block, &blocktree, None).unwrap();
 
         assert_eq!(bank_forks_info.len(), 1);
@@ -359,7 +331,7 @@ mod tests {
 
                  slot 0
                    |
-                 slot 1  <-- set_root(true)
+                 slot 1
                  /   \
             slot 2   |
                /     |
@@ -368,8 +340,8 @@ mod tests {
                    slot 4
 
         */
-        let blocktree =
-            Blocktree::open(&ledger_path).expect("Expected to successfully open database ledger");
+        let blocktree = Blocktree::open_config(&ledger_path, ticks_per_slot)
+            .expect("Expected to successfully open database ledger");
 
         // Fork 1, ending at slot 3
         let last_slot1_entry_hash =
@@ -386,10 +358,7 @@ mod tests {
         info!("last_fork1_entry.hash: {:?}", last_fork1_entry_hash);
         info!("last_fork2_entry.hash: {:?}", last_fork2_entry_hash);
 
-        blocktree.set_root(0).unwrap();
-        blocktree.set_root(1).unwrap();
-
-        let (bank_forks, bank_forks_info, _) =
+        let (bank_forks, bank_forks_info) =
             process_blocktree(&genesis_block, &blocktree, None).unwrap();
 
         assert_eq!(bank_forks_info.len(), 2); // There are two forks
@@ -400,14 +369,6 @@ mod tests {
                 entry_height: ticks_per_slot * 4,
             }
         );
-        assert_eq!(
-            &bank_forks[3]
-                .parents()
-                .iter()
-                .map(|bank| bank.slot())
-                .collect::<Vec<_>>(),
-            &[2, 1]
-        );
         assert_eq!(
             bank_forks_info[1],
             BankForksInfo {
@@ -415,16 +376,9 @@ mod tests {
                 entry_height: ticks_per_slot * 3,
             }
         );
-        assert_eq!(
-            &bank_forks[4]
-                .parents()
-                .iter()
-                .map(|bank| bank.slot())
-                .collect::<Vec<_>>(),
-            &[1]
-        );
 
-        // Ensure bank_forks holds the right banks
+        // Ensure bank_forks holds the right banks, and that everything's
+        //  frozen
         for info in bank_forks_info {
             assert_eq!(bank_forks[info.bank_slot].slot(), info.bank_slot);
             assert!(bank_forks[info.bank_slot].is_frozen());
@@ -435,32 +389,32 @@ mod tests {
     fn test_first_err() {
         assert_eq!(first_err(&[Ok(())]), Ok(()));
         assert_eq!(
-            first_err(&[Ok(()), Err(TransactionError::DuplicateSignature)]),
-            Err(TransactionError::DuplicateSignature)
+            first_err(&[Ok(()), Err(BankError::DuplicateSignature)]),
+            Err(BankError::DuplicateSignature)
         );
         assert_eq!(
             first_err(&[
                 Ok(()),
-                Err(TransactionError::DuplicateSignature),
-                Err(TransactionError::AccountInUse)
+                Err(BankError::DuplicateSignature),
+                Err(BankError::AccountInUse)
             ]),
-            Err(TransactionError::DuplicateSignature)
+            Err(BankError::DuplicateSignature)
         );
         assert_eq!(
             first_err(&[
                 Ok(()),
-                Err(TransactionError::AccountInUse),
-                Err(TransactionError::DuplicateSignature)
+                Err(BankError::AccountInUse),
+                Err(BankError::DuplicateSignature)
             ]),
-            Err(TransactionError::AccountInUse)
+            Err(BankError::AccountInUse)
         );
         assert_eq!(
             first_err(&[
-                Err(TransactionError::AccountInUse),
+                Err(BankError::AccountInUse),
                 Ok(()),
-                Err(TransactionError::DuplicateSignature)
+                Err(BankError::DuplicateSignature)
             ]),
-            Err(TransactionError::AccountInUse)
+            Err(BankError::AccountInUse)
         );
     }
 
@@ -472,7 +426,7 @@ mod tests {
         let bank = Bank::new(&genesis_block);
         let keypair = Keypair::new();
         let slot_entries = create_ticks(genesis_block.ticks_per_slot - 1, genesis_block.hash());
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &mint_keypair,
             &keypair.pubkey(),
             1,
@@ -483,18 +437,18 @@ mod tests {
         // First, ensure the TX is rejected because of the unregistered last ID
         assert_eq!(
             bank.process_transaction(&tx),
-            Err(TransactionError::BlockhashNotFound)
+            Err(BankError::BlockhashNotFound)
         );
 
         // Now ensure the TX is accepted despite pointing to the ID of an empty entry.
-        process_entries(&bank, &slot_entries).unwrap();
+        par_process_entries(&bank, &slot_entries).unwrap();
         assert_eq!(bank.process_transaction(&tx), Ok(()));
     }
 
     #[test]
     fn test_process_ledger_simple() {
         solana_logger::setup();
-        let leader_pubkey = Pubkey::new_rand();
+        let leader_pubkey = Keypair::new().pubkey();
         let (genesis_block, mint_keypair) = GenesisBlock::new_with_leader(100, &leader_pubkey, 50);
         let (ledger_path, mut last_entry_hash) = create_new_tmp_ledger!(&genesis_block);
         debug!("ledger_path: {:?}", ledger_path);
@@ -504,27 +458,16 @@ mod tests {
         for _ in 0..3 {
             // Transfer one token from the mint to a random account
             let keypair = Keypair::new();
-            let tx = system_transaction::create_user_account(
-                &mint_keypair,
-                &keypair.pubkey(),
-                1,
-                blockhash,
-                0,
-            );
+            let tx =
+                SystemTransaction::new_account(&mint_keypair, &keypair.pubkey(), 1, blockhash, 0);
             let entry = Entry::new(&last_entry_hash, 1, vec![tx]);
             last_entry_hash = entry.hash;
             entries.push(entry);
 
             // Add a second Transaction that will produce a
-            // InstructionError<0, ResultWithNegativeLamports> error when processed
+            // ProgramError<0, ResultWithNegativeLamports> error when processed
             let keypair2 = Keypair::new();
-            let tx = system_transaction::create_user_account(
-                &keypair,
-                &keypair2.pubkey(),
-                42,
-                blockhash,
-                0,
-            );
+            let tx = SystemTransaction::new_account(&keypair, &keypair2.pubkey(), 42, blockhash, 0);
             let entry = Entry::new(&last_entry_hash, 1, vec![tx]);
             last_entry_hash = entry.hash;
             entries.push(entry);
@@ -535,11 +478,9 @@ mod tests {
 
         let blocktree =
             Blocktree::open(&ledger_path).expect("Expected to successfully open database ledger");
-        blocktree
-            .write_entries(1, 0, 0, genesis_block.ticks_per_slot, &entries)
-            .unwrap();
+        blocktree.write_entries(1, 0, 0, &entries).unwrap();
         let entry_height = genesis_block.ticks_per_slot + entries.len() as u64;
-        let (bank_forks, bank_forks_info, _) =
+        let (bank_forks, bank_forks_info) =
             process_blocktree(&genesis_block, &blocktree, None).unwrap();
 
         assert_eq!(bank_forks_info.len(), 1);
@@ -564,7 +505,7 @@ mod tests {
         let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_block);
 
         let blocktree = Blocktree::open(&ledger_path).unwrap();
-        let (bank_forks, bank_forks_info, _) =
+        let (bank_forks, bank_forks_info) =
             process_blocktree(&genesis_block, &blocktree, None).unwrap();
 
         assert_eq!(bank_forks_info.len(), 1);
@@ -580,19 +521,19 @@ mod tests {
     }
 
     #[test]
-    fn test_process_entries_tick() {
+    fn test_par_process_entries_tick() {
         let (genesis_block, _mint_keypair) = GenesisBlock::new(1000);
         let bank = Bank::new(&genesis_block);
 
         // ensure bank can process a tick
         assert_eq!(bank.tick_height(), 0);
         let tick = next_entry(&genesis_block.hash(), 1, vec![]);
-        assert_eq!(process_entries(&bank, &[tick.clone()]), Ok(()));
+        assert_eq!(par_process_entries(&bank, &[tick.clone()]), Ok(()));
         assert_eq!(bank.tick_height(), 1);
     }
 
     #[test]
-    fn test_process_entries_2_entries_collision() {
+    fn test_par_process_entries_2_entries_collision() {
         let (genesis_block, mint_keypair) = GenesisBlock::new(1000);
         let bank = Bank::new(&genesis_block);
         let keypair1 = Keypair::new();
@@ -601,7 +542,7 @@ mod tests {
         let blockhash = bank.last_blockhash();
 
         // ensure bank can process 2 entries that have a common account and no tick is registered
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &mint_keypair,
             &keypair1.pubkey(),
             2,
@@ -609,7 +550,7 @@ mod tests {
             0,
         );
         let entry_1 = next_entry(&blockhash, 1, vec![tx]);
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &mint_keypair,
             &keypair2.pubkey(),
             2,
@@ -617,14 +558,14 @@ mod tests {
             0,
         );
         let entry_2 = next_entry(&entry_1.hash, 1, vec![tx]);
-        assert_eq!(process_entries(&bank, &[entry_1, entry_2]), Ok(()));
+        assert_eq!(par_process_entries(&bank, &[entry_1, entry_2]), Ok(()));
         assert_eq!(bank.get_balance(&keypair1.pubkey()), 2);
         assert_eq!(bank.get_balance(&keypair2.pubkey()), 2);
         assert_eq!(bank.last_blockhash(), blockhash);
     }
 
     #[test]
-    fn test_process_entries_2_txes_collision() {
+    fn test_par_process_entries_2_txes_collision() {
         let (genesis_block, mint_keypair) = GenesisBlock::new(1000);
         let bank = Bank::new(&genesis_block);
         let keypair1 = Keypair::new();
@@ -632,14 +573,20 @@ mod tests {
         let keypair3 = Keypair::new();
 
         // fund: put 4 in each of 1 and 2
-        assert_matches!(bank.transfer(4, &mint_keypair, &keypair1.pubkey()), Ok(_));
-        assert_matches!(bank.transfer(4, &mint_keypair, &keypair2.pubkey()), Ok(_));
+        assert_matches!(
+            bank.transfer(4, &mint_keypair, &keypair1.pubkey(), bank.last_blockhash()),
+            Ok(_)
+        );
+        assert_matches!(
+            bank.transfer(4, &mint_keypair, &keypair2.pubkey(), bank.last_blockhash()),
+            Ok(_)
+        );
 
         // construct an Entry whose 2nd transaction would cause a lock conflict with previous entry
         let entry_1_to_mint = next_entry(
             &bank.last_blockhash(),
             1,
-            vec![system_transaction::create_user_account(
+            vec![SystemTransaction::new_account(
                 &keypair1,
                 &mint_keypair.pubkey(),
                 1,
@@ -652,14 +599,14 @@ mod tests {
             &entry_1_to_mint.hash,
             1,
             vec![
-                system_transaction::create_user_account(
+                SystemTransaction::new_account(
                     &keypair2,
                     &keypair3.pubkey(),
                     2,
                     bank.last_blockhash(),
                     0,
                 ), // should be fine
-                system_transaction::create_user_account(
+                SystemTransaction::new_account(
                     &keypair1,
                     &mint_keypair.pubkey(),
                     2,
@@ -670,7 +617,7 @@ mod tests {
         );
 
         assert_eq!(
-            process_entries(&bank, &[entry_1_to_mint, entry_2_to_3_mint_to_1]),
+            par_process_entries(&bank, &[entry_1_to_mint, entry_2_to_3_mint_to_1]),
             Ok(())
         );
 
@@ -680,89 +627,7 @@ mod tests {
     }
 
     #[test]
-    fn test_process_entries_2_txes_collision_and_error() {
-        let (genesis_block, mint_keypair) = GenesisBlock::new(1000);
-        let bank = Bank::new(&genesis_block);
-        let keypair1 = Keypair::new();
-        let keypair2 = Keypair::new();
-        let keypair3 = Keypair::new();
-        let keypair4 = Keypair::new();
-
-        // fund: put 4 in each of 1 and 2
-        assert_matches!(bank.transfer(4, &mint_keypair, &keypair1.pubkey()), Ok(_));
-        assert_matches!(bank.transfer(4, &mint_keypair, &keypair2.pubkey()), Ok(_));
-        assert_matches!(bank.transfer(4, &mint_keypair, &keypair4.pubkey()), Ok(_));
-
-        // construct an Entry whose 2nd transaction would cause a lock conflict with previous entry
-        let entry_1_to_mint = next_entry(
-            &bank.last_blockhash(),
-            1,
-            vec![
-                system_transaction::create_user_account(
-                    &keypair1,
-                    &mint_keypair.pubkey(),
-                    1,
-                    bank.last_blockhash(),
-                    0,
-                ),
-                system_transaction::transfer(
-                    &keypair4,
-                    &keypair4.pubkey(),
-                    1,
-                    Hash::default(), // Should cause a transaction failure with BlockhashNotFound
-                    0,
-                ),
-            ],
-        );
-
-        let entry_2_to_3_mint_to_1 = next_entry(
-            &entry_1_to_mint.hash,
-            1,
-            vec![
-                system_transaction::create_user_account(
-                    &keypair2,
-                    &keypair3.pubkey(),
-                    2,
-                    bank.last_blockhash(),
-                    0,
-                ), // should be fine
-                system_transaction::create_user_account(
-                    &keypair1,
-                    &mint_keypair.pubkey(),
-                    2,
-                    bank.last_blockhash(),
-                    0,
-                ), // will collide
-            ],
-        );
-
-        assert!(process_entries(
-            &bank,
-            &[entry_1_to_mint.clone(), entry_2_to_3_mint_to_1.clone()]
-        )
-        .is_err());
-
-        // First transaction in first entry succeeded, so keypair1 lost 1 lamport
-        assert_eq!(bank.get_balance(&keypair1.pubkey()), 3);
-        assert_eq!(bank.get_balance(&keypair2.pubkey()), 4);
-
-        // Check all accounts are unlocked
-        let txs1 = &entry_1_to_mint.transactions[..];
-        let txs2 = &entry_2_to_3_mint_to_1.transactions[..];
-        let locked_accounts1 = bank.lock_accounts(txs1);
-        for result in locked_accounts1.locked_accounts_results() {
-            assert!(result.is_ok());
-        }
-        // txs1 and txs2 have accounts that conflict, so we must drop txs1 first
-        drop(locked_accounts1);
-        let locked_accounts2 = bank.lock_accounts(txs2);
-        for result in locked_accounts2.locked_accounts_results() {
-            assert!(result.is_ok());
-        }
-    }
-
-    #[test]
-    fn test_process_entries_2_entries_par() {
+    fn test_par_process_entries_2_entries_par() {
         let (genesis_block, mint_keypair) = GenesisBlock::new(1000);
         let bank = Bank::new(&genesis_block);
         let keypair1 = Keypair::new();
@@ -771,7 +636,7 @@ mod tests {
         let keypair4 = Keypair::new();
 
         //load accounts
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &mint_keypair,
             &keypair1.pubkey(),
             1,
@@ -779,7 +644,7 @@ mod tests {
             0,
         );
         assert_eq!(bank.process_transaction(&tx), Ok(()));
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &mint_keypair,
             &keypair2.pubkey(),
             1,
@@ -790,7 +655,7 @@ mod tests {
 
         // ensure bank can process 2 entries that do not have a common account and no tick is registered
         let blockhash = bank.last_blockhash();
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &keypair1,
             &keypair3.pubkey(),
             1,
@@ -798,7 +663,7 @@ mod tests {
             0,
         );
         let entry_1 = next_entry(&blockhash, 1, vec![tx]);
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &keypair2,
             &keypair4.pubkey(),
             1,
@@ -806,14 +671,14 @@ mod tests {
             0,
         );
         let entry_2 = next_entry(&entry_1.hash, 1, vec![tx]);
-        assert_eq!(process_entries(&bank, &[entry_1, entry_2]), Ok(()));
+        assert_eq!(par_process_entries(&bank, &[entry_1, entry_2]), Ok(()));
         assert_eq!(bank.get_balance(&keypair3.pubkey()), 1);
         assert_eq!(bank.get_balance(&keypair4.pubkey()), 1);
         assert_eq!(bank.last_blockhash(), blockhash);
     }
 
     #[test]
-    fn test_process_entries_2_entries_tick() {
+    fn test_par_process_entries_2_entries_tick() {
         let (genesis_block, mint_keypair) = GenesisBlock::new(1000);
         let bank = Bank::new(&genesis_block);
         let keypair1 = Keypair::new();
@@ -822,7 +687,7 @@ mod tests {
         let keypair4 = Keypair::new();
 
         //load accounts
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &mint_keypair,
             &keypair1.pubkey(),
             1,
@@ -830,7 +695,7 @@ mod tests {
             0,
         );
         assert_eq!(bank.process_transaction(&tx), Ok(()));
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &mint_keypair,
             &keypair2.pubkey(),
             1,
@@ -845,11 +710,10 @@ mod tests {
         }
 
         // ensure bank can process 2 entries that do not have a common account and tick is registered
-        let tx =
-            system_transaction::create_user_account(&keypair2, &keypair3.pubkey(), 1, blockhash, 0);
+        let tx = SystemTransaction::new_account(&keypair2, &keypair3.pubkey(), 1, blockhash, 0);
         let entry_1 = next_entry(&blockhash, 1, vec![tx]);
         let tick = next_entry(&entry_1.hash, 1, vec![]);
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &keypair1,
             &keypair4.pubkey(),
             1,
@@ -858,14 +722,14 @@ mod tests {
         );
         let entry_2 = next_entry(&tick.hash, 1, vec![tx]);
         assert_eq!(
-            process_entries(&bank, &[entry_1.clone(), tick.clone(), entry_2.clone()]),
+            par_process_entries(&bank, &[entry_1.clone(), tick.clone(), entry_2.clone()]),
             Ok(())
         );
         assert_eq!(bank.get_balance(&keypair3.pubkey()), 1);
         assert_eq!(bank.get_balance(&keypair4.pubkey()), 1);
 
         // ensure that an error is returned for an empty account (keypair2)
-        let tx = system_transaction::create_user_account(
+        let tx = SystemTransaction::new_account(
             &keypair2,
             &keypair3.pubkey(),
             1,
@@ -874,164 +738,8 @@ mod tests {
         );
         let entry_3 = next_entry(&entry_2.hash, 1, vec![tx]);
         assert_eq!(
-            process_entries(&bank, &[entry_3]),
-            Err(TransactionError::AccountNotFound)
+            par_process_entries(&bank, &[entry_3]),
+            Err(BankError::AccountNotFound)
         );
     }
-
-    #[test]
-    fn test_update_transaction_statuses() {
-        // Make sure instruction errors still update the signature cache
-        let (genesis_block, mint_keypair) = GenesisBlock::new(11_000);
-        let bank = Bank::new(&genesis_block);
-        let pubkey = Pubkey::new_rand();
-        bank.transfer(1_000, &mint_keypair, &pubkey).unwrap();
-        assert_eq!(bank.transaction_count(), 1);
-        assert_eq!(bank.get_balance(&pubkey), 1_000);
-        assert_eq!(
-            bank.transfer(10_001, &mint_keypair, &pubkey),
-            Err(TransactionError::InstructionError(
-                0,
-                InstructionError::new_result_with_negative_lamports(),
-            ))
-        );
-        assert_eq!(
-            bank.transfer(10_001, &mint_keypair, &pubkey),
-            Err(TransactionError::DuplicateSignature)
-        );
-
-        // Make sure other errors don't update the signature cache
-        let tx = system_transaction::create_user_account(
-            &mint_keypair,
-            &pubkey,
-            1000,
-            Hash::default(),
-            0,
-        );
-        let signature = tx.signatures[0];
-
-        // Should fail with blockhash not found
-        assert_eq!(
-            bank.process_transaction(&tx).map(|_| signature),
-            Err(TransactionError::BlockhashNotFound)
-        );
-
-        // Should fail again with blockhash not found
-        assert_eq!(
-            bank.process_transaction(&tx).map(|_| signature),
-            Err(TransactionError::BlockhashNotFound)
-        );
-    }
-
-    #[test]
-    fn test_update_transaction_statuses_fail() {
-        let (genesis_block, mint_keypair) = GenesisBlock::new(11_000);
-        let bank = Bank::new(&genesis_block);
-        let keypair1 = Keypair::new();
-        let keypair2 = Keypair::new();
-        let success_tx = system_transaction::create_user_account(
-            &mint_keypair,
-            &keypair1.pubkey(),
-            1,
-            bank.last_blockhash(),
-            0,
-        );
-        let fail_tx = system_transaction::create_user_account(
-            &mint_keypair,
-            &keypair2.pubkey(),
-            2,
-            bank.last_blockhash(),
-            0,
-        );
-
-        let entry_1_to_mint = next_entry(
-            &bank.last_blockhash(),
-            1,
-            vec![
-                success_tx,
-                fail_tx.clone(), // will collide
-            ],
-        );
-
-        assert_eq!(
-            process_entries(&bank, &[entry_1_to_mint]),
-            Err(TransactionError::AccountInUse)
-        );
-
-        // Should not see duplicate signature error
-        assert_eq!(bank.process_transaction(&fail_tx), Ok(()));
-    }
-
-    #[test]
-    #[ignore]
-    fn test_process_entries_stress() {
-        // this test throws lots of rayon threads at process_entries()
-        //  finds bugs in very low-layer stuff
-        solana_logger::setup();
-        let (genesis_block, mint_keypair) = GenesisBlock::new(1_000_000_000);
-        let mut bank = Bank::new(&genesis_block);
-
-        const NUM_TRANSFERS: usize = 100;
-        let keypairs: Vec<_> = (0..NUM_TRANSFERS * 2).map(|_| Keypair::new()).collect();
-
-        // give everybody one lamport
-        for keypair in &keypairs {
-            bank.transfer(1, &mint_keypair, &keypair.pubkey())
-                .expect("funding failed");
-        }
-
-        let mut i = 0;
-        let mut hash = bank.last_blockhash();
-        loop {
-            let entries: Vec<_> = (0..NUM_TRANSFERS)
-                .map(|i| {
-                    next_entry_mut(
-                        &mut hash,
-                        0,
-                        vec![system_transaction::transfer(
-                            &keypairs[i],
-                            &keypairs[i + NUM_TRANSFERS].pubkey(),
-                            1,
-                            bank.last_blockhash(),
-                            0,
-                        )],
-                    )
-                })
-                .collect();
-            info!("paying iteration {}", i);
-            process_entries(&bank, &entries).expect("paying failed");
-
-            let entries: Vec<_> = (0..NUM_TRANSFERS)
-                .map(|i| {
-                    next_entry_mut(
-                        &mut hash,
-                        0,
-                        vec![system_transaction::transfer(
-                            &keypairs[i + NUM_TRANSFERS],
-                            &keypairs[i].pubkey(),
-                            1,
-                            bank.last_blockhash(),
-                            0,
-                        )],
-                    )
-                })
-                .collect();
-
-            info!("refunding iteration {}", i);
-            process_entries(&bank, &entries).expect("refunding failed");
-
-            // advance to next block
-            process_entries(
-                &bank,
-                &(0..bank.ticks_per_slot())
-                    .map(|_| next_entry_mut(&mut hash, 1, vec![]))
-                    .collect::<Vec<_>>(),
-            )
-            .expect("process ticks failed");
-
-            i += 1;
-            bank = Bank::new_from_parent(&Arc::new(bank), &Pubkey::default(), i as u64);
-            bank.squash();
-        }
-    }
 }

core/src/broadcast_stage.rs

@@ -1,10 +1,11 @@
 //! A stage to broadcast data from a leader node to validators
 //!
 use crate::blocktree::Blocktree;
-use crate::cluster_info::{ClusterInfo, ClusterInfoError, NEIGHBORHOOD_SIZE};
-use crate::entry::{EntrySender, EntrySlice};
+use crate::cluster_info::{ClusterInfo, ClusterInfoError, DATA_PLANE_FANOUT};
+use crate::entry::EntrySlice;
+#[cfg(feature = "erasure")]
 use crate::erasure::CodingGenerator;
-use crate::packet::index_blobs_with_genesis;
+use crate::packet::index_blobs;
 use crate::poh_recorder::WorkingBankEntries;
 use crate::result::{Error, Result};
 use crate::service::Service;
@@ -12,7 +13,6 @@ use crate::staking_utils;
 use rayon::prelude::*;
 use solana_metrics::counter::Counter;
 use solana_metrics::{influxdb, submit};
-use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::duration_as_ms;
 use std::net::UdpSocket;
@@ -29,6 +29,8 @@ pub enum BroadcastStageReturnType {
 
 struct Broadcast {
     id: Pubkey,
+
+    #[cfg(feature = "erasure")]
     coding_generator: CodingGenerator,
 }
 
@@ -39,12 +41,10 @@ impl Broadcast {
         receiver: &Receiver<WorkingBankEntries>,
         sock: &UdpSocket,
         blocktree: &Arc<Blocktree>,
-        storage_entry_sender: &EntrySender,
-        genesis_blockhash: &Hash,
     ) -> Result<()> {
         let timer = Duration::new(1, 0);
         let (mut bank, entries) = receiver.recv_timeout(timer)?;
-        let mut max_tick_height = bank.max_tick_height();
+        let mut max_tick_height = (bank.slot() + 1) * bank.ticks_per_slot() - 1;
 
         let now = Instant::now();
         let mut num_entries = entries.len();
@@ -52,7 +52,7 @@ impl Broadcast {
         let mut last_tick = entries.last().map(|v| v.1).unwrap_or(0);
         ventries.push(entries);
 
-        assert!(last_tick <= max_tick_height);
+        assert!(last_tick <= max_tick_height,);
         if last_tick != max_tick_height {
             while let Ok((same_bank, entries)) = receiver.try_recv() {
                 // If the bank changed, that implies the previous slot was interrupted and we do not have to
@@ -61,7 +61,7 @@ impl Broadcast {
                     num_entries = 0;
                     ventries.clear();
                     bank = same_bank.clone();
-                    max_tick_height = bank.max_tick_height();
+                    max_tick_height = (bank.slot() + 1) * bank.ticks_per_slot() - 1;
                 }
                 num_entries += entries.len();
                 last_tick = entries.last().map(|v| v.1).unwrap_or(0);
@@ -73,27 +73,24 @@ impl Broadcast {
             }
         }
 
-        let bank_epoch = bank.get_stakers_epoch(bank.slot());
-        let mut broadcast_table = cluster_info.read().unwrap().sorted_tvu_peers(
-            &staking_utils::delegated_stakes_at_epoch(&bank, bank_epoch).unwrap(),
-        );
-        inc_new_counter_info!("broadcast_service-num_peers", broadcast_table.len() + 1);
+        let mut broadcast_table = cluster_info
+            .read()
+            .unwrap()
+            .sorted_tvu_peers(&staking_utils::delegated_stakes(&bank));
         // Layer 1, leader nodes are limited to the fanout size.
-        broadcast_table.truncate(NEIGHBORHOOD_SIZE);
+        broadcast_table.truncate(DATA_PLANE_FANOUT);
 
+        inc_new_counter_info!("broadcast_service-num_peers", broadcast_table.len() + 1);
         inc_new_counter_info!("broadcast_service-entries_received", num_entries);
 
         let to_blobs_start = Instant::now();
 
         let blobs: Vec<_> = ventries
             .into_par_iter()
-            .map_with(storage_entry_sender.clone(), |s, p| {
+            .flat_map(|p| {
                 let entries: Vec<_> = p.into_iter().map(|e| e.0).collect();
-                let blobs = entries.to_shared_blobs();
-                let _ignored = s.send(entries);
-                blobs
+                entries.to_shared_blobs()
             })
-            .flatten()
             .collect();
 
         let blob_index = blocktree
@@ -102,10 +99,9 @@ impl Broadcast {
             .map(|meta| meta.consumed)
             .unwrap_or(0);
 
-        index_blobs_with_genesis(
+        index_blobs(
             &blobs,
             &self.id,
-            genesis_blockhash,
             blob_index,
             bank.slot(),
             bank.parent().map_or(0, |parent| parent.slot()),
@@ -119,8 +115,6 @@ impl Broadcast {
 
         blocktree.write_shared_blobs(&blobs)?;
 
-        let coding = self.coding_generator.next(&blobs);
-
         let to_blobs_elapsed = duration_as_ms(&to_blobs_start.elapsed());
 
         let broadcast_start = Instant::now();
@@ -130,8 +124,14 @@ impl Broadcast {
 
         inc_new_counter_info!("streamer-broadcast-sent", blobs.len());
 
-        // send out erasures
-        ClusterInfo::broadcast(&self.id, false, &broadcast_table, sock, &coding)?;
+        // Fill in the coding blob data from the window data blobs
+        #[cfg(feature = "erasure")]
+        {
+            let coding = self.coding_generator.next(&blobs)?;
+
+            // send out erasures
+            ClusterInfo::broadcast(&self.id, false, &broadcast_table, sock, &coding)?;
+        }
 
         let broadcast_elapsed = duration_as_ms(&broadcast_start.elapsed());
 
@@ -186,26 +186,17 @@ impl BroadcastStage {
         cluster_info: &Arc<RwLock<ClusterInfo>>,
         receiver: &Receiver<WorkingBankEntries>,
         blocktree: &Arc<Blocktree>,
-        storage_entry_sender: EntrySender,
-        genesis_blockhash: &Hash,
     ) -> BroadcastStageReturnType {
         let me = cluster_info.read().unwrap().my_data().clone();
-        let coding_generator = CodingGenerator::default();
 
         let mut broadcast = Broadcast {
             id: me.id,
-            coding_generator,
+            #[cfg(feature = "erasure")]
+            coding_generator: CodingGenerator::new(),
         };
 
         loop {
-            if let Err(e) = broadcast.run(
-                &cluster_info,
-                receiver,
-                sock,
-                blocktree,
-                &storage_entry_sender,
-                genesis_blockhash,
-            ) {
+            if let Err(e) = broadcast.run(&cluster_info, receiver, sock, blocktree) {
                 match e {
                     Error::RecvTimeoutError(RecvTimeoutError::Disconnected) | Error::SendError => {
                         return BroadcastStageReturnType::ChannelDisconnected;
@@ -243,24 +234,14 @@ impl BroadcastStage {
         receiver: Receiver<WorkingBankEntries>,
         exit_sender: &Arc<AtomicBool>,
         blocktree: &Arc<Blocktree>,
-        storage_entry_sender: EntrySender,
-        genesis_blockhash: &Hash,
     ) -> Self {
         let blocktree = blocktree.clone();
         let exit_sender = exit_sender.clone();
-        let genesis_blockhash = *genesis_blockhash;
         let thread_hdl = Builder::new()
             .name("solana-broadcaster".to_string())
             .spawn(move || {
                 let _finalizer = Finalizer::new(exit_sender);
-                Self::run(
-                    &sock,
-                    &cluster_info,
-                    &receiver,
-                    &blocktree,
-                    storage_entry_sender,
-                    &genesis_blockhash,
-                )
+                Self::run(&sock, &cluster_info, &receiver, &blocktree)
             })
             .unwrap();
 
@@ -284,9 +265,9 @@ mod test {
     use crate::entry::create_ticks;
     use crate::service::Service;
     use solana_runtime::bank::Bank;
-    use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::timing::DEFAULT_TICKS_PER_SLOT;
     use std::sync::atomic::AtomicBool;
     use std::sync::mpsc::channel;
     use std::sync::{Arc, RwLock};
@@ -320,10 +301,7 @@ mod test {
         let cluster_info = Arc::new(RwLock::new(cluster_info));
 
         let exit_sender = Arc::new(AtomicBool::new(false));
-        let (storage_sender, _receiver) = channel();
-
-        let (genesis_block, _) = GenesisBlock::new(10_000);
-        let bank = Arc::new(Bank::new(&genesis_block));
+        let bank = Arc::new(Bank::default());
 
         // Start up the broadcast stage
         let broadcast_service = BroadcastStage::new(
@@ -332,8 +310,6 @@ mod test {
             entry_receiver,
             &exit_sender,
             &blocktree,
-            storage_sender,
-            &Hash::default(),
         );
 
         MockBroadcastStage {
@@ -344,13 +320,15 @@ mod test {
     }
 
     #[test]
+    #[ignore]
+    //TODO this test won't work since broadcast stage no longer edits the ledger
     fn test_broadcast_ledger() {
-        solana_logger::setup();
         let ledger_path = get_tmp_ledger_path("test_broadcast_ledger");
-
         {
             // Create the leader scheduler
             let leader_keypair = Keypair::new();
+            let start_tick_height = 0;
+            let max_tick_height = start_tick_height + DEFAULT_TICKS_PER_SLOT;
 
             let (entry_sender, entry_receiver) = channel();
             let broadcast_service = setup_dummy_broadcast_service(
@@ -359,9 +337,6 @@ mod test {
                 entry_receiver,
             );
             let bank = broadcast_service.bank.clone();
-            let start_tick_height = bank.tick_height();
-            let max_tick_height = bank.max_tick_height();
-            let ticks_per_slot = bank.ticks_per_slot();
 
             let ticks = create_ticks(max_tick_height - start_tick_height, Hash::default());
             for (i, tick) in ticks.into_iter().enumerate() {
@@ -371,23 +346,15 @@ mod test {
             }
 
             sleep(Duration::from_millis(2000));
-
-            trace!(
-                "[broadcast_ledger] max_tick_height: {}, start_tick_height: {}, ticks_per_slot: {}",
-                max_tick_height,
-                start_tick_height,
-                ticks_per_slot,
-            );
-
             let blocktree = broadcast_service.blocktree;
             let mut blob_index = 0;
             for i in 0..max_tick_height - start_tick_height {
-                let slot = (start_tick_height + i + 1) / ticks_per_slot;
+                let slot = (start_tick_height + i + 1) / DEFAULT_TICKS_PER_SLOT;
 
                 let result = blocktree.get_data_blob(slot, blob_index).unwrap();
 
                 blob_index += 1;
-                result.expect("expect blob presence");
+                assert!(result.is_some());
             }
 
             drop(entry_sender);

core/src/chacha.rs

@@ -94,23 +94,28 @@ mod tests {
     use crate::blocktree::Blocktree;
     use crate::chacha::chacha_cbc_encrypt_ledger;
     use crate::entry::Entry;
-    use crate::gen_keys::GenKeys;
+    use ring::signature::Ed25519KeyPair;
     use solana_sdk::hash::{hash, Hash, Hasher};
     use solana_sdk::signature::KeypairUtil;
-    use solana_sdk::system_transaction;
+    use solana_sdk::system_transaction::SystemTransaction;
     use std::fs::remove_file;
     use std::fs::File;
     use std::io::Read;
     use std::path::Path;
     use std::sync::Arc;
+    use untrusted::Input;
 
     fn make_tiny_deterministic_test_entries(num: usize) -> Vec<Entry> {
         let zero = Hash::default();
         let one = hash(&zero.as_ref());
-
-        let seed = [2u8; 32];
-        let mut rnd = GenKeys::new(seed);
-        let keypair = rnd.gen_keypair();
+        let pkcs = [
+            48, 83, 2, 1, 1, 48, 5, 6, 3, 43, 101, 112, 4, 34, 4, 32, 109, 148, 235, 20, 97, 127,
+            43, 194, 109, 43, 121, 76, 54, 38, 234, 14, 108, 68, 209, 227, 137, 191, 167, 144, 177,
+            174, 57, 182, 79, 198, 196, 93, 161, 35, 3, 33, 0, 116, 121, 255, 78, 31, 95, 179, 172,
+            30, 125, 206, 87, 88, 78, 46, 145, 25, 154, 161, 252, 3, 58, 235, 116, 39, 148, 193,
+            150, 111, 61, 20, 226,
+        ];
+        let keypair = Ed25519KeyPair::from_pkcs8(Input::from(&pkcs)).unwrap();
 
         let mut id = one;
         let mut num_hashes = 0;
@@ -119,7 +124,7 @@ mod tests {
                 Entry::new_mut(
                     &mut id,
                     &mut num_hashes,
-                    vec![system_transaction::create_user_account(
+                    vec![SystemTransaction::new_account(
                         &keypair,
                         &keypair.pubkey(),
                         1,
@@ -137,13 +142,11 @@ mod tests {
         let ledger_dir = "chacha_test_encrypt_file";
         let ledger_path = get_tmp_ledger_path(ledger_dir);
         let ticks_per_slot = 16;
-        let blocktree = Arc::new(Blocktree::open(&ledger_path).unwrap());
+        let blocktree = Arc::new(Blocktree::open_config(&ledger_path, ticks_per_slot).unwrap());
         let out_path = Path::new("test_chacha_encrypt_file_output.txt.enc");
 
         let entries = make_tiny_deterministic_test_entries(32);
-        blocktree
-            .write_entries(0, 0, 0, ticks_per_slot, &entries)
-            .unwrap();
+        blocktree.write_entries(0, 0, 0, &entries).unwrap();
 
         let mut key = hex!(
             "abcd1234abcd1234abcd1234abcd1234 abcd1234abcd1234abcd1234abcd1234
@@ -159,7 +162,7 @@ mod tests {
         use bs58;
         //  golden needs to be updated if blob stuff changes....
         let golden = Hash::new(
-            &bs58::decode("5Pz5KQyNht2nqkJhVd8F9zTFxzoDvbQSzaxQbtCPiyCo")
+            &bs58::decode("B33zQ8Kc3Wr3vZAbB6GcWaB3sSGeG98nvm4QB9URpJhR")
                 .into_vec()
                 .unwrap(),
         );

core/src/chacha_cuda.rs

@@ -127,11 +127,9 @@ mod tests {
         let ledger_dir = "test_encrypt_file_many_keys_single";
         let ledger_path = get_tmp_ledger_path(ledger_dir);
         let ticks_per_slot = 16;
-        let blocktree = Arc::new(Blocktree::open(&ledger_path).unwrap());
+        let blocktree = Arc::new(Blocktree::open_config(&ledger_path, ticks_per_slot).unwrap());
 
-        blocktree
-            .write_entries(0, 0, 0, ticks_per_slot, &entries)
-            .unwrap();
+        blocktree.write_entries(0, 0, 0, &entries).unwrap();
 
         let out_path = Path::new("test_chacha_encrypt_file_many_keys_single_output.txt.enc");
 
@@ -163,10 +161,8 @@ mod tests {
         let ledger_dir = "test_encrypt_file_many_keys_multiple";
         let ledger_path = get_tmp_ledger_path(ledger_dir);
         let ticks_per_slot = 16;
-        let blocktree = Arc::new(Blocktree::open(&ledger_path).unwrap());
-        blocktree
-            .write_entries(0, 0, 0, ticks_per_slot, &entries)
-            .unwrap();
+        let blocktree = Arc::new(Blocktree::open_config(&ledger_path, ticks_per_slot).unwrap());
+        blocktree.write_entries(0, 0, 0, &entries).unwrap();
 
         let out_path = Path::new("test_chacha_encrypt_file_many_keys_multiple_output.txt.enc");
 

core/src/cluster_info_vote_listener.rs

@@ -1,13 +1,11 @@
 use crate::cluster_info::{ClusterInfo, GOSSIP_SLEEP_MILLIS};
-use crate::poh_recorder::PohRecorder;
+use crate::packet;
 use crate::result::Result;
 use crate::service::Service;
-use crate::sigverify_stage::VerifiedPackets;
-use crate::{packet, sigverify};
+use crate::streamer::PacketSender;
 use solana_metrics::counter::Counter;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex, RwLock};
+use std::sync::{Arc, RwLock};
 use std::thread::{self, sleep, Builder, JoinHandle};
 use std::time::Duration;
 
@@ -19,22 +17,13 @@ impl ClusterInfoVoteListener {
     pub fn new(
         exit: &Arc<AtomicBool>,
         cluster_info: Arc<RwLock<ClusterInfo>>,
-        sigverify_disabled: bool,
-        sender: Sender<VerifiedPackets>,
-        poh_recorder: &Arc<Mutex<PohRecorder>>,
+        sender: PacketSender,
     ) -> Self {
         let exit = exit.clone();
-        let poh_recorder = poh_recorder.clone();
         let thread = Builder::new()
             .name("solana-cluster_info_vote_listener".to_string())
             .spawn(move || {
-                let _ = Self::recv_loop(
-                    exit,
-                    &cluster_info,
-                    sigverify_disabled,
-                    &sender,
-                    poh_recorder,
-                );
+                let _ = Self::recv_loop(exit, &cluster_info, &sender);
             })
             .unwrap();
         Self {
@@ -44,9 +33,7 @@ impl ClusterInfoVoteListener {
     fn recv_loop(
         exit: Arc<AtomicBool>,
         cluster_info: &Arc<RwLock<ClusterInfo>>,
-        sigverify_disabled: bool,
-        sender: &Sender<VerifiedPackets>,
-        poh_recorder: Arc<Mutex<PohRecorder>>,
+        sender: &PacketSender,
     ) -> Result<()> {
         let mut last_ts = 0;
         loop {
@@ -54,18 +41,11 @@ impl ClusterInfoVoteListener {
                 return Ok(());
             }
             let (votes, new_ts) = cluster_info.read().unwrap().get_votes(last_ts);
-            if poh_recorder.lock().unwrap().bank().is_some() {
-                last_ts = new_ts;
-                inc_new_counter_info!("cluster_info_vote_listener-recv_count", votes.len());
-                let msgs = packet::to_packets(&votes);
-                if !msgs.is_empty() {
-                    let r = if sigverify_disabled {
-                        sigverify::ed25519_verify_disabled(&msgs)
-                    } else {
-                        sigverify::ed25519_verify_cpu(&msgs)
-                    };
-                    sender.send(msgs.into_iter().zip(r).collect())?;
-                }
+            last_ts = new_ts;
+            inc_new_counter_info!("cluster_info_vote_listener-recv_count", votes.len());
+            let msgs = packet::to_packets(&votes);
+            for m in msgs {
+                sender.send(m)?;
             }
             sleep(Duration::from_millis(GOSSIP_SLEEP_MILLIS));
         }

core/src/cluster_tests.rs

@@ -6,18 +6,15 @@ use crate::blocktree::Blocktree;
 use crate::cluster_info::FULLNODE_PORT_RANGE;
 use crate::contact_info::ContactInfo;
 use crate::entry::{Entry, EntrySlice};
-use crate::gossip_service::discover_nodes;
-use crate::locktower::VOTE_THRESHOLD_DEPTH;
+use crate::gossip_service::discover;
 use crate::poh_service::PohServiceConfig;
-use solana_client::thin_client::create_client;
-use solana_sdk::client::SyncClient;
+use solana_client::client::create_client;
 use solana_sdk::hash::Hash;
-use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
-use solana_sdk::system_transaction;
+use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::timing::{
-    duration_as_ms, DEFAULT_TICKS_PER_SLOT, NUM_CONSECUTIVE_LEADER_SLOTS, NUM_TICKS_PER_SECOND,
+    duration_as_ms, DEFAULT_SLOTS_PER_EPOCH, DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND,
 };
-use solana_sdk::transport::TransportError;
 use std::thread::sleep;
 use std::time::Duration;
 
@@ -29,46 +26,45 @@ pub fn spend_and_verify_all_nodes(
     funding_keypair: &Keypair,
     nodes: usize,
 ) {
-    let cluster_nodes = discover_nodes(&entry_point_info.gossip, nodes).unwrap();
+    let cluster_nodes = discover(&entry_point_info.gossip, nodes).unwrap();
     assert!(cluster_nodes.len() >= nodes);
     for ingress_node in &cluster_nodes {
         let random_keypair = Keypair::new();
-        let client = create_client(ingress_node.client_facing_addr(), FULLNODE_PORT_RANGE);
+        let mut client = create_client(ingress_node.client_facing_addr(), FULLNODE_PORT_RANGE);
         let bal = client
             .poll_get_balance(&funding_keypair.pubkey())
             .expect("balance in source");
         assert!(bal > 0);
-        let mut transaction = system_transaction::transfer(
+        let mut transaction = SystemTransaction::new_move(
             &funding_keypair,
             &random_keypair.pubkey(),
             1,
-            client.get_recent_blockhash().unwrap(),
+            client.get_recent_blockhash(),
             0,
         );
-        let confs = VOTE_THRESHOLD_DEPTH + 1;
         let sig = client
-            .retry_transfer_until_confirmed(&funding_keypair, &mut transaction, 5, confs)
+            .retry_transfer(&funding_keypair, &mut transaction, 5)
             .unwrap();
         for validator in &cluster_nodes {
-            let client = create_client(validator.client_facing_addr(), FULLNODE_PORT_RANGE);
-            client.poll_for_signature_confirmation(&sig, confs).unwrap();
+            let mut client = create_client(validator.client_facing_addr(), FULLNODE_PORT_RANGE);
+            client.poll_for_signature(&sig).unwrap();
         }
     }
 }
 
 pub fn send_many_transactions(node: &ContactInfo, funding_keypair: &Keypair, num_txs: u64) {
-    let client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
+    let mut client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
     for _ in 0..num_txs {
         let random_keypair = Keypair::new();
         let bal = client
             .poll_get_balance(&funding_keypair.pubkey())
             .expect("balance in source");
         assert!(bal > 0);
-        let mut transaction = system_transaction::transfer(
+        let mut transaction = SystemTransaction::new_move(
             &funding_keypair,
             &random_keypair.pubkey(),
             1,
-            client.get_recent_blockhash().unwrap(),
+            client.get_recent_blockhash(),
             0,
         );
         client
@@ -78,15 +74,15 @@ pub fn send_many_transactions(node: &ContactInfo, funding_keypair: &Keypair, num
 }
 
 pub fn fullnode_exit(entry_point_info: &ContactInfo, nodes: usize) {
-    let cluster_nodes = discover_nodes(&entry_point_info.gossip, nodes).unwrap();
+    let cluster_nodes = discover(&entry_point_info.gossip, nodes).unwrap();
     assert!(cluster_nodes.len() >= nodes);
     for node in &cluster_nodes {
-        let client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
+        let mut client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
         assert!(client.fullnode_exit().unwrap());
     }
     sleep(Duration::from_millis(SLOT_MILLIS));
     for node in &cluster_nodes {
-        let client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
+        let mut client = create_client(node.client_facing_addr(), FULLNODE_PORT_RANGE);
         assert!(client.fullnode_exit().is_err());
     }
 }
@@ -149,96 +145,47 @@ pub fn kill_entry_and_spend_and_verify_rest(
     nodes: usize,
 ) {
     solana_logger::setup();
-    let cluster_nodes = discover_nodes(&entry_point_info.gossip, nodes).unwrap();
+    let cluster_nodes = discover(&entry_point_info.gossip, nodes).unwrap();
     assert!(cluster_nodes.len() >= nodes);
-    let client = create_client(entry_point_info.client_facing_addr(), FULLNODE_PORT_RANGE);
-    info!("sleeping for 2 leader fortnights");
-    sleep(Duration::from_millis(
-        SLOT_MILLIS * NUM_CONSECUTIVE_LEADER_SLOTS * 2,
-    ));
-    info!("done sleeping for 2 fortnights");
+    let mut client = create_client(entry_point_info.client_facing_addr(), FULLNODE_PORT_RANGE);
+    info!("sleeping for an epoch");
+    sleep(Duration::from_millis(SLOT_MILLIS * DEFAULT_SLOTS_PER_EPOCH));
+    info!("done sleeping for an epoch");
     info!("killing entry point");
     assert!(client.fullnode_exit().unwrap());
-    info!("sleeping for 2 leader fortnights");
-    sleep(Duration::from_millis(
-        SLOT_MILLIS * NUM_CONSECUTIVE_LEADER_SLOTS,
-    ));
-    info!("done sleeping for 2 fortnights");
+    info!("sleeping for a slot");
+    sleep(Duration::from_millis(SLOT_MILLIS));
+    info!("done sleeping for a slot");
     for ingress_node in &cluster_nodes {
         if ingress_node.id == entry_point_info.id {
             continue;
         }
-
-        let client = create_client(ingress_node.client_facing_addr(), FULLNODE_PORT_RANGE);
+        let random_keypair = Keypair::new();
+        let mut client = create_client(ingress_node.client_facing_addr(), FULLNODE_PORT_RANGE);
         let bal = client
             .poll_get_balance(&funding_keypair.pubkey())
             .expect("balance in source");
         assert!(bal > 0);
-
-        let mut result = Ok(());
-        let mut retries = 0;
-        loop {
-            retries += 1;
-            if retries > 5 {
-                result.unwrap();
-            }
-
-            let random_keypair = Keypair::new();
-            let mut transaction = system_transaction::transfer(
-                &funding_keypair,
-                &random_keypair.pubkey(),
-                1,
-                client.get_recent_blockhash().unwrap(),
-                0,
-            );
-
-            let confs = VOTE_THRESHOLD_DEPTH + 1;
-            let sig = {
-                let sig = client.retry_transfer_until_confirmed(
-                    &funding_keypair,
-                    &mut transaction,
-                    5,
-                    confs,
-                );
-                match sig {
-                    Err(e) => {
-                        result = Err(TransportError::IoError(e));
-                        continue;
-                    }
-
-                    Ok(sig) => sig,
-                }
-            };
-
-            match poll_all_nodes_for_signature(&entry_point_info, &cluster_nodes, &sig, confs) {
-                Err(e) => {
-                    result = Err(e);
-                }
-                Ok(()) => {
-                    break;
-                }
+        let mut transaction = SystemTransaction::new_move(
+            &funding_keypair,
+            &random_keypair.pubkey(),
+            1,
+            client.get_recent_blockhash(),
+            0,
+        );
+        let sig = client
+            .retry_transfer(&funding_keypair, &mut transaction, 5)
+            .unwrap();
+        for validator in &cluster_nodes {
+            if validator.id == entry_point_info.id {
+                continue;
             }
+            let mut client = create_client(validator.client_facing_addr(), FULLNODE_PORT_RANGE);
+            client.poll_for_signature(&sig).unwrap();
         }
     }
 }
 
-fn poll_all_nodes_for_signature(
-    entry_point_info: &ContactInfo,
-    cluster_nodes: &[ContactInfo],
-    sig: &Signature,
-    confs: usize,
-) -> Result<(), TransportError> {
-    for validator in cluster_nodes {
-        if validator.id == entry_point_info.id {
-            continue;
-        }
-        let client = create_client(validator.client_facing_addr(), FULLNODE_PORT_RANGE);
-        client.poll_for_signature_confirmation(&sig, confs)?;
-    }
-
-    Ok(())
-}
-
 fn get_and_verify_slot_entries(blocktree: &Blocktree, slot: u64, last_entry: &Hash) -> Vec<Entry> {
     let entries = blocktree.get_slot_entries(slot, 0, None).unwrap();
     assert!(entries.verify(last_entry));

core/src/contact_info.rs

@@ -1,13 +1,10 @@
+use crate::rpc_service::RPC_PORT;
 use bincode::serialize;
 use solana_sdk::pubkey::Pubkey;
-#[cfg(test)]
-use solana_sdk::rpc_port;
-#[cfg(test)]
-use solana_sdk::signature::{Keypair, KeypairUtil};
-use solana_sdk::signature::{Signable, Signature};
+use solana_sdk::signature::{Keypair, KeypairUtil, Signable, Signature};
 use solana_sdk::timing::timestamp;
 use std::cmp::{Ord, Ordering, PartialEq, PartialOrd};
-use std::net::{IpAddr, SocketAddr};
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 /// Structure representing a node on the network
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -56,7 +53,7 @@ impl Eq for ContactInfo {}
 #[macro_export]
 macro_rules! socketaddr {
     ($ip:expr, $port:expr) => {
-        std::net::SocketAddr::from((std::net::Ipv4Addr::from($ip), $port))
+        std::net::SocketAddr::from((Ipv4Addr::from($ip), $port))
     };
     ($str:expr) => {{
         let a: std::net::SocketAddr = $str.parse().unwrap();
@@ -133,7 +130,7 @@ impl ContactInfo {
         let addr = socketaddr!("224.0.1.255:1000");
         assert!(addr.ip().is_multicast());
         Self::new(
-            &Pubkey::new_rand(),
+            &Keypair::new().pubkey(),
             addr,
             addr,
             addr,
@@ -144,21 +141,18 @@ impl ContactInfo {
             0,
         )
     }
-
-    #[cfg(test)]
+    fn next_port(addr: &SocketAddr, nxt: u16) -> SocketAddr {
+        let mut nxt_addr = *addr;
+        nxt_addr.set_port(addr.port() + nxt);
+        nxt_addr
+    }
     fn new_with_pubkey_socketaddr(pubkey: &Pubkey, bind_addr: &SocketAddr) -> Self {
-        fn next_port(addr: &SocketAddr, nxt: u16) -> SocketAddr {
-            let mut nxt_addr = *addr;
-            nxt_addr.set_port(addr.port() + nxt);
-            nxt_addr
-        }
-
         let tpu_addr = *bind_addr;
-        let gossip_addr = next_port(&bind_addr, 1);
-        let tvu_addr = next_port(&bind_addr, 2);
-        let tpu_via_blobs_addr = next_port(&bind_addr, 3);
-        let rpc_addr = SocketAddr::new(bind_addr.ip(), rpc_port::DEFAULT_RPC_PORT);
-        let rpc_pubsub_addr = SocketAddr::new(bind_addr.ip(), rpc_port::DEFAULT_RPC_PUBSUB_PORT);
+        let gossip_addr = Self::next_port(&bind_addr, 1);
+        let tvu_addr = Self::next_port(&bind_addr, 2);
+        let tpu_via_blobs_addr = Self::next_port(&bind_addr, 3);
+        let rpc_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT);
+        let rpc_pubsub_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT + 1);
         Self::new(
             pubkey,
             gossip_addr,
@@ -171,9 +165,7 @@ impl ContactInfo {
             timestamp(),
         )
     }
-
-    #[cfg(test)]
-    pub(crate) fn new_with_socketaddr(bind_addr: &SocketAddr) -> Self {
+    pub fn new_with_socketaddr(bind_addr: &SocketAddr) -> Self {
         let keypair = Keypair::new();
         Self::new_with_pubkey_socketaddr(&keypair.pubkey(), bind_addr)
     }
@@ -193,13 +185,11 @@ impl ContactInfo {
             timestamp(),
         )
     }
-
     fn is_valid_ip(addr: IpAddr) -> bool {
         !(addr.is_unspecified() || addr.is_multicast())
         // || (addr.is_loopback() && !cfg_test))
         // TODO: boot loopback in production networks
     }
-
     /// port must not be 0
     /// ip must be specified and not mulitcast
     /// loopback ip is only allowed in tests
@@ -224,7 +214,6 @@ impl Signable for ContactInfo {
             gossip: SocketAddr,
             tvu: SocketAddr,
             tpu: SocketAddr,
-            tpu_via_blobs: SocketAddr,
             storage_addr: SocketAddr,
             rpc: SocketAddr,
             rpc_pubsub: SocketAddr,
@@ -238,7 +227,6 @@ impl Signable for ContactInfo {
             tvu: me.tvu,
             tpu: me.tpu,
             storage_addr: me.storage_addr,
-            tpu_via_blobs: me.tpu_via_blobs,
             rpc: me.rpc,
             rpc_pubsub: me.rpc_pubsub,
             wallclock: me.wallclock,