Do not share the QR code that accompanied your recovery code either. This is a QR code:
"
mesh network,"A local network topology in which the infrastructure nodes (i.e. bridges, switches, and other infrastructure devices) connect directly, dynamically and non-hierarchically to as many other nodes as possible and cooperate with one another to efficiently route data from/to clients."
mining,Mining generally refers to the process of performing certain functions for a network such as adding new records to a blockchain in exchange for mining rewards; it may also refer to other mechanisms whereby rewards (usually in the form of cryptocurrency) are provided for performing other tasks helpful to the network.
mining power,"A miner’s (or group of miners’) mining power is equal to the probability it will be selected to write a new block to the blockchain. Depending on the mechanism for mining, this is usually related to the overall share of computing power or cryptoassets the miner or miners possess relative to all miners for that blockchain."
mining rewards,Mining rewards are newly issued tokens received by miners in exchange for adding new records to the blockchain or other activities beneficial to the network.
name,"An identifier or name. Names are a type of digital asset in the Blockstack network. If you have signed into the Blockstack Browser, you created a name. If an application developer registered an application within Blockstack, then they registered a name."
network operation,"A network operation is any change to the information about a digital asset (or smart contract) stored on a blockchain, including, for example, a change in the digital asset’s owner, or a change in the location at which it is stored on the network. How and when these network operations are performed for each digital asset is governed, on the Blockstack network, either by the Stacks Node software or a smart contract."
-private key,"
Private keys matches a corresponding public key. A public key also looks like a string of letters and numbers:
The exact format of the public and private key depend on the software you use to create them.
"
+private key,"
Private keys matches a corresponding public key. A public key also looks like a string of letters and numbers:
The exact format of the public and private key depend on the software you use to create them.
"
proof-of-burn mining,"The consensus algorithm used in the Stacks blockchain where miners destroy a proof-of-work-based cryptocurrency (currently Bitcoin) to get tokens; this enables the functionality where nodes can select between conflicting blockchain forks, as the blockchain fork with the most amount of cryptocurrency burned is considered to be the correct fork."
proof-of-work,"A proof-of-work system or proof-of-work mining is a mining mechanism where miners must expend computing power to solve complicated cryptographic puzzles, and prove that they have done so by writing the solution to the blockchain, in order to be allowed to add blocks to a blockchain. This is the mining system used, for example, by Bitcoin."
public key,
Public and private key pair comprise of two uniquely related cryptographic keys. It looks like a long random string of letters and numbers:
The exact format of the public and private key depend on the software you use to create them.
diff --git a/src/includes/architecture.md b/src/includes/architecture.md
deleted file mode 100644
index 2d88f1c0..00000000
--- a/src/includes/architecture.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Blockchains require consensus among large numbers of people, so they can be slow. Additionally, a blockchain is not designed to hold a lot of data. This means using a blockchain for every bit of data a user might write and store is expensive. For example, imagine if an application were storing every tweet in the chain.
-
-Blockstack addresses blockchain performance problems using a layered approach. The base layer consists of the Stacks blockchain and the Blockstack Naming System (BNS). The blockchain governs ownership of identities in the Blockstack network. Identities can be names such as domain names, usernames, or application names.
-
-When an identity is created, its creation is recorded in the Stacks blockchain. Identities make up the primary data stored into the Stacks blockchain. These identities correspond to routing data in the OSI stack. The routing data is stored in the Atlas Peer Network, the second layer. Every core node that joins the Blockstack Network is able to obtain an entire copy of this routing data. Blockstack uses the routing data to associate identities (domain names, user names, and application names) with a particular storage location in the final layer, the Gaia Storage System.
-
-A Gaia Storage System consists of a _hub service_ and storage resource on a cloud software provider. The storage provider can be any commercial provider such as Azure, DigitalOcean, Amazon EC2, and so forth. Typically the compute resource and the storage resource reside same cloud vendor, though this is not a requirement. Gaia currently has driver support for S3 and Azure Blob Storage, but the driver model allows for other backend support as well.
-
-Gaia stores data as a simple key-value store. When an identity is created, a corresponding data store is associated with that identity on Gaia. When a user logs into a dApp,
-the authentication process gives the application the URL of a Gaia hub, which
-then writes to storage on behalf of that user.
-
-Within Blockstack, then, the Stacks blockchain stores only identity data. Data created by the actions of an identity is stored in a Gaia Storage System. Each user has profile data. When a user interacts with a decentralized dApp that application stores application data on behalf of the user. Because Gaia stores user and application data off the blockchain, a Blockstack DApp is typically more performant than DApps created on other blockchains.
diff --git a/src/includes/contribute_code.md b/src/includes/contribute_code.md
deleted file mode 100644
index fa1c7396..00000000
--- a/src/includes/contribute_code.md
+++ /dev/null
@@ -1,86 +0,0 @@
-Good pull requests—patches, improvements, new features—are a fantastic help. They should remain focused in scope and avoid containing unrelated commits.
-
-**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code, porting to a different language), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project.
-
-Please adhere to the [coding guidelines](#code-guidelines) used throughout the project (indentation, accurate comments, etc.) and any other requirements (such as test coverage).
-
-When contributing to Blockstack's documentation, you should edit the documentation source files in [the `/app/` directory of the `master` branch](https://github.com/blockstack/blockstack-browser/tree/master/app).
-
-Adhering to the following process is the best way to get your work included in the project:
-
-1. [Fork](https://help.github.com/fork-a-repo/) the project, clone your fork,
- and configure the remotes:
-
- ```bash
- # Clone your fork of the repo into the current directory
- git clone https://github.com//blockstack-browser.git
- # Navigate to the newly cloned directory
- cd blockstack-browser
- # Assign the original repo to a remote called "upstream"
- git remote add upstream https://github.com/blockstack/blockstack-browser.git
- ```
-
-2. If you cloned a while ago, get the latest changes from upstream:
-
- ```bash
- git checkout master
- git pull upstream master
- ```
-
-3. Create a new topic branch (off the main project development branch) to
- contain your feature, change, or fix:
-
- ```bash
- git checkout -b
- ```
-
-4. Commit your changes in logical chunks. Please adhere to these [git commit
- message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
- or your code is unlikely be merged into the main project. Use Git's
- [interactive rebase](https://help.github.com/articles/interactive-rebase)
- feature to tidy up your commits before making them public.
-
-5. Locally merge (or rebase) the upstream development branch into your topic branch:
-
- ```bash
- git pull [--rebase] upstream master
- ```
-
-6. Push your topic branch up to your fork:
-
- ```bash
- git push origin
- ```
-
-7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
- with a clear title and description against the `master` branch.
-
-**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
-license your work under the terms of the [MPL-2.0 License](LICENSE.md) (if it
-includes code changes) and under the terms of the
-[Creative Commons Attribution 3.0 Unported License](docs/LICENSE.md)
-(if it includes documentation changes).
-
-## Code guidelines
-
-### HTML
-
-[Adhere to the Code Guide.](http://codeguide.co/#html)
-
-- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags).
-
-### JS
-
-- No semicolons (in client-side JS)
-- 2 spaces (no tabs)
-- strict mode
-- "Attractive"
-- Don't use jQuery (no "\$" allowed)
-
-### Checking code
-
-Run `npm run dev` before committing to ensure your changes follow our coding standards.
-
-## License
-
-By contributing your code, you agree to license your contribution under the [MPL-2.0 License](LICENSE.md).
diff --git a/src/includes/contribute_community.md b/src/includes/contribute_community.md
deleted file mode 100644
index 1ed134d9..00000000
--- a/src/includes/contribute_community.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## Community Rewards
-
-Blockstack Community Reward Program
-We’ve set up a community portal with all kinds of tasks you can complete to earn Stacks tokens by contributing to and supporting the community - these stay in your account and convert into tokens when the network goes live. Many are really easy and they’re all fun and helpful for the community, more information here - https://contribute.blockstack.org/.
-
-## Blockstack on Social Media
-
-Musce libero nunc, dignissim quis turpis quis, semper vehicula dolor. Suspendisse tincidunt consequat quam, ac posuere leo dapibus id. Cras fringilla convallis elit, at eleifend mi interam.
-
-- Slack
-- Twitter
-- Telegram
-- Reddit
-
-## Meeting fact to face
-
-- Events Calendar
-- Meetup
-- Blockstack Community Rewards Program
-- Request Sponsorship for your Event
-
-## Become an evangelist
-
-Musce libero nunc, dignissim quis turpis quis, semper vehicula dolor. Suspendisse tincidunt consequat quam, ac posuere leo dapibus id. Cras fringilla convallis elit, at eleifend mi interam.
-
-Nulla non sollicitudin. Morbi sit amet laoreet ipsum, vel pretium mi. Morbi varius, tellus in accumsan blandit, elit ligula eleifend velit, luctus mattis ante nulla condimentum nulla. Etiam vestibulum risus vel arcu elementum eleifend. Cras at dolor eget urna varius faucibus tempus in elit.
diff --git a/src/includes/contribute_issues.md b/src/includes/contribute_issues.md
deleted file mode 100644
index ca26f7d8..00000000
--- a/src/includes/contribute_issues.md
+++ /dev/null
@@ -1,62 +0,0 @@
-## Using the issue tracker
-
-The [issue tracker](https://github.com/blockstack/blockstack-browser/issues) is the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests) and [submitting pull requests](#pull-requests), but please respect the following
-restrictions:
-
-- Please **do not** use the issue tracker for personal support requests. Please use the [Forum](https://forum.blockstack.org) or [Slack](https://chat.blockstack.org) as they are better places to get help.
-
-- Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.
-
-- Please **do not** post comments consisting solely of "+1" or ":thumbsup:". Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) instead. We reserve the right to delete comments which violate this rule.
-
-## Issues and labels
-
-Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
-
-- `bug` - Issues where code is demonstrably a problem
-- `chore` - Issues that are not
-- `design` - Issues related to design
-- `documentation` - Issue that is specifically for addition, creation or editing of documentation
-- `enhancement` - Issues that enhance the product
-- `feature` - Issues that identify a new feature
-- `release-overview` - Overview of release
-
-For a complete look at our labels, see the [project labels page](https://github.com/blockstack/blockstack-browser/labels).
-
-## Bug reports
-
-A bug is a _demonstrable problem_ that is caused by the code in the repository. Good bug reports are extremely helpful, so thanks!
-
-Guidelines for bug reports:
-
-0. **Validate and lint your code** — [validate your HTML](https://html5.validator.nu) and [lint your HTML](https://github.com/twbs/bootlint) to ensure your problem isn't caused by a simple error in your own code.
-
-1. **Use the GitHub issue search** — check if the issue has already been reported.
-
-2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or development branch in the repository.
-
-3. **Isolate the problem** — ideally create a [reduced test case](https://css-tricks.com/reduced-test-cases/) and a live example. [This JS Bin](https://jsbin.com/lolome/edit?html,output) is a helpful template.
-
-A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report. What is your environment? What steps will reproduce the issue? What browser(s) and OS experience the problem? Do other browsers show the bug differently? What would you expect to be the outcome? All these details will help people to fix any potential bugs.
-
-Example:
-
-> Short and descriptive example bug report title
->
-> A summary of the issue and the browser/OS environment in which it occurs. If
-> suitable, include the steps required to reproduce the bug.
->
-> 1. This is the first step
-> 2. This is the second step
-> 3. Further steps, etc.
->
-> `` - a link to the reduced test case
->
-> Any other information you want to share that is relevant to the issue being
-> reported. This might include the lines of code that you have identified as
-> causing the bug, and potential solutions (and your opinions on their
-> merits).
-
-## Feature requests
-
-Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to _you_ to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible.
diff --git a/src/includes/contribute_ovr.md b/src/includes/contribute_ovr.md
deleted file mode 100644
index cb5ce239..00000000
--- a/src/includes/contribute_ovr.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Looking to contribute something to Blockstack? **Here's how you can help.**
-
-Please take a moment to review this document in order to make the contribution
-process easy and effective for everyone in the community.
-
-Following these guidelines helps to communicate that you respect the time of
-everyone involved in the Blockstack open source community. In return, the
-community will address your issue or assess patches and features as quickly as
-possible.
diff --git a/src/includes/create_id.md b/src/includes/create_id.md
deleted file mode 100644
index 1d85f616..00000000
--- a/src/includes/create_id.md
+++ /dev/null
@@ -1,72 +0,0 @@
-To create an initial Blockstack ID, do the following:
-
-1. Open the Blockstack web application in your browser.
-
- The application prompts you to create or restore an ID.
-
- 
-
-2. Choose **Create new ID**.
-
- The browser prompts you to register a unique username in the `id.blockstack`
- domain. The username must be between 8 and 38 letter longs and can only contain characters, numbers and underscore (`_`).
- This is a free Blockstack identity and the format of
- the ID is:
-
- _`username`_`.id.blockstack`
-
- You'll use this initial ID to access the Blockstack Browser and other DApps.
-
- 
-
- The **Check Availability** buttom makes sure your name is unique.
-
-3. Press **Continue** when you find an available name you like.
-
- The application prompts you to enter a password. Blockstack uses this
- password to encrypt your recovery code. You must record and save this
- initial password.
-
- 
-
- {% include note.html content="The Blockstack team cannot restore your password for you." %}
-
-4. Enter a password, confirm it, and press **Register ID**.
-
- Blockstack creates an id for you and then prompts you for an email.
-
- 
-
- Blockstack uses this email address to send you recovery information. This email is only sent once.
-
-5. Press **Next**.
-
- Blockstack presents you with the completed ID.
-
- 
-
- The system prompts you to save your **recovery code**.
-
-6. Click **Secret Recovery Key** to record your key.
-
- The system warns you to save your key:
-
- 
-
-7. Click **Secret Recovery Key** to record your key.
-
- 
-
- A recovery code is a sequence of words. These words allow you to recover
- an `id.blockstack` that you've created. You should store the words along
- with their order, for example, `#1 applied` and so forth.
-
-6) Copy your **Secret Recovery Key** and press **Continue**.
-
- The system confirms you have saved your key by asking you to select two words.
-
-7) Choose **Go to Blockstack**.
-
- It may take several moments for your username to be recorded on the blockchain. You can still use it but you may see a computer-friendly ID sequence such as `ID-1G9318bjf6FAZvD3gnaSyzUojM6f8xKWK1` until the recording is finalized.
-
-Congratulations you have created your first ID. You are now ready to start using DApps.
diff --git a/src/includes/mining-ranking.md b/src/includes/mining-ranking.md
deleted file mode 100644
index e4a93254..00000000
--- a/src/includes/mining-ranking.md
+++ /dev/null
@@ -1 +0,0 @@
-After the reviewer-partners generate reviews and scores, Blockstack uses Z-scores and Theta scores to standardize the scores across application categories. Blockstack worked with a team of Ph.D. game theorist and economists from Princeton and NYU to put together a ranking algorithm which is fair and resistant to abuse.
diff --git a/src/includes/required-fields.md b/src/includes/required-fields.md
deleted file mode 100644
index 8c1bf201..00000000
--- a/src/includes/required-fields.md
+++ /dev/null
@@ -1,14 +0,0 @@
-| Field | Description |
-| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Your Name | Your first and last name. |
-| Your Email | A valid email address. If you are submitting an example of Animal Kingdom sample,this is the email where we will send you instructions for getting your Zero to DApp t-shirt. |
-| App Name | Name of your application. If you are submitting an example of Animal Kingdom sample, enter USERNAME: Animal Kingdom. |
-| Short description | Describe your application. |
-| Website | The URL of the website where you deployed your application. |
-| App icon URL | URL_DEPLOYED_SITE/icon-192x192.png for example, https://animalkingdoms.netlify.com/icon-192x192.png |
-| Open Source URL | The URL where your source code lives. If you are submitting an example of Animal Kingdom sample, you can leave this blank for a sample application. |
-| Twitter Handle | Optionally enter a Twitter handle for your application, for example `@coolapp`. |
-| Category | If you are submitting an example of Animal Kingdom sample, make sure you choose the Sample Blockstack Apps category. |
-| Blockchain | If you are submitting an example of Animal Kingdom sample, leave this as is. |
-| Storage | Choose Gaia if you are using it. |
-| Authentication | Choose Blockstack; Blockstack Authentication is required to participate in Animal Kingdom. |
diff --git a/src/includes/scaffolding.md b/src/includes/scaffolding.md
deleted file mode 100644
index 96c19fa9..00000000
--- a/src/includes/scaffolding.md
+++ /dev/null
@@ -1,9 +0,0 @@
-You use the Blockstack App Generator to create scaffolding for a starter application. The generator can create scaffolding for any of these frameworks:
-
-| Framework | Use this command to install |
-| ---------------- | ---------------------------------- |
-| Plain Javascript | `npx generator-blockstack --plain` |
-| React | `npx generator-blockstack --react` |
-| Vue | `npx generator-blockstack --vue` |
-
-For example, to install a Vue scaffolding, you would use the `npx generator-blockstack --vue` command.
diff --git a/src/includes/sign_in.md b/src/includes/sign_in.md
deleted file mode 100644
index 5b53580c..00000000
--- a/src/includes/sign_in.md
+++ /dev/null
@@ -1,19 +0,0 @@
-For an application developer, the application flow is similar to the typical client-server flow used by centralized sign in services (e.g., OAuth). However, with Blockstack, the authentication flow happens entirely client-side.
-
-A decentralized application and [the Blockstack App](https://github.com/blockstack/ux/tree/master/packages/app) communicate during the authentication flow by passing back and forth two tokens. The requesting application sends the Blockstack App an `authRequest` token. Once a user approves a sign-in, the Blockstack App responds to the application with an `authResponse` token. These tokens are JSON Web Tokens, and they are passed via URL query strings.
-
-
-
-When a user chooses to authenticate a decentralized application, it calls the `doOpenAuth()` method which sends an `authRequest` to the Blockstack App. Blockstack passes the token in via a URL query string in the `authRequest` parameter:
-
-`https://app.blockstack.org/#/sign-up?authRequest=j902120cn829n1jnvoa...`
-
-When the Blockstack App receives the request, it generates an (`authResponse`) token to the application using an _ephemeral transit key_ . The ephemeral transit key is just used for the particular instance of the application, in this case, to sign the `authRequest`. The application stores the ephemeral transit key during the request generation. The public portion of the transit key is passed in the `authRequest` token. The Blockstack App uses the public portion of the key to encrypt an _app-private key_ which is returned via the `authResponse`.
-
-During sign in, the Blockstack App generates the app-private key from the user's _identity-address private_ key and the application's `appDomain`. The app private key serves three functions:
-
-- It is used to create the credentials that give an app access to the Gaia storage bucket for that specific app.
-- It is used in the end-to-end encryption of files stored for the app in the user's Gaia storage.
-- It serves as a cryptographic secret that apps can use to perform other cryptographic functions.
-
-Finally, the app private key is deterministic, meaning that for a given user ID and domain name, the same private key is generated each time.
diff --git a/src/pages/authentication/building-todo-app.md b/src/pages/authentication/building-todo-app.md
index e21763a6..4f6230f0 100644
--- a/src/pages/authentication/building-todo-app.md
+++ b/src/pages/authentication/building-todo-app.md
@@ -63,7 +63,7 @@ You should see output similar to the following:
You should see the app's landing page:
-
+
## Onboard into your first Blockstack app
@@ -73,7 +73,7 @@ The app displays a standardized introductory modal using
[Blockstack Connect](https://github.com/blockstack/ux/tree/master/packages/connect), a JavaScript
library that makes it easy to integrate Blockstack into the UI of any web app.
-
+
Below, you can see the relevant parts of the [React component](https://reactjs.org/docs/react-component.html)
that triggers this modal in [`src/components/Signin.jsx`](https://github.com/blockstack/blockstack-todos/blob/master/src/components/Signin.jsx):
@@ -179,7 +179,7 @@ componentDidMount() {
The app triggers a popup window in which [the Blockstack App](https://github.com/blockstack/ux/tree/master/packages/app)
is loaded from [`app.blockstack.org`](http://app.blockstack.org/) and begins generating a new _Secret Key_.
-
+
### Step 3: Choose **Copy Secret Key** to copy your _Secret Key_ to the clipboard.
@@ -190,11 +190,11 @@ all of the private data they create and manage with Blockstack apps.
_Secret Keys_ are like strong passwords. However, they can never be recovered if lost or reset if stolen.
As such, it's paramount that users handle them with great care.
-
+
### Step 4: Choose **I've saved it** to confirm you've secured your _Secret Key_ in a suitable place.
-
+
### Step 5: Enter a username value and choose **Continue**
@@ -203,7 +203,7 @@ The username will be used by the app to generate a URL for sharing your todos, s
It is registered on the Stacks blockchain with the [Blockstack Naming System (BNS)](/core/naming/introduction)
and associated with your _Secret Key_.
-
+
### Done: You've now completed onboarding into the app!
@@ -212,7 +212,7 @@ and associated with your _Secret Key_.
Once you've authenticated the app, you can can start adding todos by entering values into the "Write your to do"
field and hitting "Enter".
-
+
The data for all todos are saved as JSON to the Gaia hub linked to your Secret Key using the
[`putFile`](http://blockstack.github.io/blockstack.js/globals.html#putfile) method of the `userSession` object in the
@@ -248,7 +248,7 @@ When deleting a todo, the same `putFile` method is used to save a new JSON array
Select "Make public" to make your todos accessible to the public for sharing via URL.
-
+
This will call `saveTasks` with the `isPublic` parameter set to `true`, which is used to disable encryption when using `putFile`.
@@ -280,14 +280,14 @@ Once signed out, select "Sign in" to sign back in with your _Secret Key_.
If you've previously deauthenticated the Blockstack app, you'll see a prompt to enter your _Secret Key_:
-
+
The above screen will be ommitted if you have an active session with the Blockstack app already.
Then you'll be presented with the option to select an existing username associated with your _Secret Key_ or
create a new one if you wish to authenticate the app with a different identity and data set:
-
+
You'll now see your todos as an authenticated user for the username you've chosen.
diff --git a/src/pages/authentication/connect.md b/src/pages/authentication/connect.md
index d11fd9f8..e4617691 100644
--- a/src/pages/authentication/connect.md
+++ b/src/pages/authentication/connect.md
@@ -180,7 +180,7 @@ People will often leave apps when things are asked of them before they experienc
Many new users to your app will not be familiar with Blockstack yet and will be hesitant to click a Blockstack-branded button. Provide a generic button for users that are new to your app and Blockstack. Blockstack Connect will introduce new users to Blockstack and recognize existing users.
-
+
### Provide a quick way for existing users to sign in
diff --git a/src/pages/authentication/overview.md b/src/pages/authentication/overview.md
index 69152dcb..e5e9a4a0 100644
--- a/src/pages/authentication/overview.md
+++ b/src/pages/authentication/overview.md
@@ -13,7 +13,25 @@ On this page, you'll get an overview of authentication from a developer perspect
## Authentication flow
-@include "sign_in.md"
+For an application developer, the application flow is similar to the typical client-server flow used by centralized sign in services (e.g., OAuth). However, with Blockstack, the authentication flow happens entirely client-side.
+
+A decentralized application and [the Blockstack App](https://github.com/blockstack/ux/tree/master/packages/app) communicate during the authentication flow by passing back and forth two tokens. The requesting application sends the Blockstack App an `authRequest` token. Once a user approves a sign-in, the Blockstack App responds to the application with an `authResponse` token. These tokens are JSON Web Tokens, and they are passed via URL query strings.
+
+
+
+When a user chooses to authenticate a decentralized application, it calls the `doOpenAuth()` method which sends an `authRequest` to the Blockstack App. Blockstack passes the token in via a URL query string in the `authRequest` parameter:
+
+`https://app.blockstack.org/#/sign-up?authRequest=j902120cn829n1jnvoa...`
+
+When the Blockstack App receives the request, it generates an (`authResponse`) token to the application using an _ephemeral transit key_ . The ephemeral transit key is just used for the particular instance of the application, in this case, to sign the `authRequest`. The application stores the ephemeral transit key during the request generation. The public portion of the transit key is passed in the `authRequest` token. The Blockstack App uses the public portion of the key to encrypt an _app-private key_ which is returned via the `authResponse`.
+
+During sign in, the Blockstack App generates the app-private key from the user's _identity-address private_ key and the application's `appDomain`. The app private key serves three functions:
+
+- It is used to create the credentials that give an app access to the Gaia storage bucket for that specific app.
+- It is used in the end-to-end encryption of files stored for the app in the user's Gaia storage.
+- It serves as a cryptographic secret that apps can use to perform other cryptographic functions.
+
+Finally, the app private key is deterministic, meaning that for a given user ID and domain name, the same private key is generated each time.
## Scopes
@@ -165,7 +183,7 @@ To decode the token and see what information it holds:
1. Copy the `authRequest` string from the URL.
-
+
2. Navigate to [jwt.io](https://jwt.io/).
3. Paste the full token there.
diff --git a/src/pages/data-storage/authentication.md b/src/pages/data-storage/authentication.md
index 04512b1c..0abdbb1e 100644
--- a/src/pages/data-storage/authentication.md
+++ b/src/pages/data-storage/authentication.md
@@ -23,7 +23,7 @@ passed via URL query strings.
When a user chooses to "Sign in with Blockstack" on your DApp, the `redirectToSignIn()` method sends the user to the
Blockstack authenticator. The browser responds with an authentication token and an _app private key_.
-
+
The app private key is application-specific. It is generated from the user's identity address private key using the
`appDomain` as input. This key is deterministic, meaning that for a given Blockstack ID and domain name, the same
@@ -36,6 +36,6 @@ encrypted by the Blockstack authenticator. The key serves three functions, it:
When an application writes to a Gaia hub, the authentication token, key, and the data are passed to the Gaia hub.
-
+
The token ensures the DApp has the authorization to write to the hub on the user's behalf.
diff --git a/src/pages/data-storage/collections.md b/src/pages/data-storage/collections.md
index dbced4fe..8d079c3d 100644
--- a/src/pages/data-storage/collections.md
+++ b/src/pages/data-storage/collections.md
@@ -105,7 +105,7 @@ If you have `npm` installed, do the following to run the Contact Manager demo ap
The internet browser will display this pop-up
- 
+ 
10. Use the local browser by choosing **Open Blockstack.app**.
@@ -120,7 +120,7 @@ If you have `npm` installed, do the following to run the Contact Manager demo ap
When you have successfully created a contact, the Contact Manager displays that contact on the list. Here you can see that Josephine Baker was entered as a contact.
- 
+ 
2. Open the [collections page test](https://blockstack.github.io/blockstack-collections/page_test/) in your browser.
@@ -130,7 +130,7 @@ If you have `npm` installed, do the following to run the Contact Manager demo ap
4. Choose **List contacts**.
- 
+ 
## How to add the Contact collections to your DApp
diff --git a/src/pages/data-storage/overview.md b/src/pages/data-storage/overview.md
index 5263a724..4ace896f 100644
--- a/src/pages/data-storage/overview.md
+++ b/src/pages/data-storage/overview.md
@@ -19,14 +19,29 @@ parties.
The following diagram depicts the Blockstack architecture and Gaia's place in it:
-@include "architecture.md"
+
+
+Blockchains require consensus among large numbers of people, so they can be slow. Additionally, a blockchain is not designed to hold a lot of data. This means using a blockchain for every bit of data a user might write and store is expensive. For example, imagine if an application were storing every tweet in the chain.
+
+Blockstack addresses blockchain performance problems using a layered approach. The base layer consists of the Stacks blockchain and the Blockstack Naming System (BNS). The blockchain governs ownership of identities in the Blockstack network. Identities can be names such as domain names, usernames, or application names.
+
+When an identity is created, its creation is recorded in the Stacks blockchain. Identities make up the primary data stored into the Stacks blockchain. These identities correspond to routing data in the OSI stack. The routing data is stored in the Atlas Peer Network, the second layer. Every core node that joins the Blockstack Network is able to obtain an entire copy of this routing data. Blockstack uses the routing data to associate identities (domain names, user names, and application names) with a particular storage location in the final layer, the Gaia Storage System.
+
+A Gaia Storage System consists of a _hub service_ and storage resource on a cloud software provider. The storage provider can be any commercial provider such as Azure, DigitalOcean, Amazon EC2, and so forth. Typically the compute resource and the storage resource reside same cloud vendor, though this is not a requirement. Gaia currently has driver support for S3 and Azure Blob Storage, but the driver model allows for other backend support as well.
+
+Gaia stores data as a simple key-value store. When an identity is created, a corresponding data store is associated with that identity on Gaia. When a user logs into a dApp,
+the authentication process gives the application the URL of a Gaia hub, which
+then writes to storage on behalf of that user.
+
+Within Blockstack, then, the Stacks blockchain stores only identity data. Data created by the actions of an identity is stored in a Gaia Storage System. Each user has profile data. When a user interacts with a decentralized dApp that application stores application data on behalf of the user. Because Gaia stores user and application data off the blockchain, a Blockstack DApp is typically more performant than DApps created on other blockchains.
+
## User control or how is Gaia decentralized?
A Gaia hub runs as a service which writes to data storage. The storage itself is a simple key-value store. The hub service
writes to data storage by requiring a valid authentication token from a requestor. Typically, the hub service runs on a compute resource and the storage itself on separate, dedicated storage resource. Typically, both resources belong to the same cloud computing provider.
-
+
Gaia's approach to decentralization focuses on user control of data and its storage. Users can choose a Gaia hub provider. If a user can choose which Gaia hub provider to use, then that choice is all the decentralization required to enable user-controlled applications. Moreover, Gaia a uniform API to access for applications to access that data.
diff --git a/src/pages/ecosystem/stacks-token-holders.md b/src/pages/ecosystem/stacks-token-holders.md
index d2a6d666..cc48d483 100644
--- a/src/pages/ecosystem/stacks-token-holders.md
+++ b/src/pages/ecosystem/stacks-token-holders.md
@@ -42,7 +42,7 @@ help.
You should see a report detailing the tokens allocated to your address and when they unlock:
-
+
If you have questions or concerns about your report, please contact [hello@StacksToken.com](mailto:hello@StacksToken.com).
@@ -56,7 +56,7 @@ token holder, the dates of these events depend on the holders’s purchase date.
The general timeline for unlocking tokens and the capabilities that are
potentially possible, are as follows:
-
+
Your specific unlock date depends on when you purchased or were granted tokens.
You can use the Blockstack Explorer to discover how many tokens you have
diff --git a/src/pages/smart-contracts/hello-world-tutorial.md b/src/pages/smart-contracts/hello-world-tutorial.md
index 15db5f4a..f961dfbb 100644
--- a/src/pages/smart-contracts/hello-world-tutorial.md
+++ b/src/pages/smart-contracts/hello-world-tutorial.md
@@ -105,7 +105,7 @@ Open up the [Stacks 2.0 Explorer Sandbox view](https://testnet-explorer.blocksta
You will be asked to sign in with or sign up for a Blockstack ID, which creates a new STX address for you on the Testnet blockchain, where you can receive tokens. Follow the steps on the screen to complete the process.
-
+
Once completed, you will see the Sandbox screen and a confirmation, indicating you were provided with a new STX address for testing purposes.
@@ -117,7 +117,7 @@ On the [**STX faucet**](https://testnet-explorer.blockstack.org/sandbox?tab=fauc
A confirmation for a new transaction will pop up. If you want to see the details of your faucet request, you can click **View transaction**. However, you will to refresh the page a few times, for up to a minute or so, while the transaction completes.
-
+
## Deploy the contract
@@ -128,7 +128,7 @@ Go back to the Sandbox screen, switch to the [**Contract deploy**](https://testn
3. Ignore the **Choose from sample** drop-down for now. After completing this tutorial you can come back to the Explorer Sandbox and use this drop-down to try other sample contracts.
4. Click **Deploy contract**.
-
+
A confirmation will pop up, indicating that a new contract deploy transaction was issued. As with the faucet request, you can click **View transaction** to review the pending transaction if you like, but you'll need to keep refreshing the page until the deploy transaction completes. Once you're able to see the completed deploy transaction, you will see that every smart contract's source code is publicly verifiable through the explorer.
@@ -139,13 +139,13 @@ Go back to the Sandbox screen, switch to the [**Contract call**](https://testnet
- **Contract address**: Your generated STX address. Hover over the identity component on the right side of the screen to copy your full address and paste it in here.
- **Contract name**: Whatever you entered as your contract name in the previous step. If you forgot, you can review your recent transactions by following the link on the upper-right, and look up your contract creation transaction.
-
+
After clicking **Search**, you will see the two public methods implemented in the smart contract.
Locate the `(echo-number)` method, provide any integer for the `val` argument and click **Submit**. You will see the value you entered echoed back at you on the screen, as well as a confirmation that a contract call transaction was issued. Click on the transaction to review it. In the next seconds, your contract call should be completed and you will see a contract call success screen. Scroll down to the function summary section to verify your contract call:
-
+
**Congratulations! You just deployed your smart contract and called a public function on the Testnet.**
diff --git a/src/pages/smart-contracts/running-a-testnet-node.md b/src/pages/smart-contracts/running-a-testnet-node.md
index 9fa34d44..5afd1f3e 100644
--- a/src/pages/smart-contracts/running-a-testnet-node.md
+++ b/src/pages/smart-contracts/running-a-testnet-node.md
@@ -18,7 +18,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
If Rust is already installed, you might see this prompt. Select 'Proceed with Installation' to make sure you have the latest version installed.
-
+
In case you just installed Rust, you will be prompted to run the following command to make the `cargo` command available:
diff --git a/src/pages/stacks-wallet/install.md b/src/pages/stacks-wallet/install.md
index 92601bc5..884664e7 100644
--- a/src/pages/stacks-wallet/install.md
+++ b/src/pages/stacks-wallet/install.md
@@ -25,7 +25,7 @@ by Blockstack PBC.
To find the terminal software, enter `terminal` into the Spotlight search.
- 
+ 
4. In the terminal window, enter the command to change directory to the folder where you downloaded the wallet software.
@@ -41,7 +41,7 @@ by Blockstack PBC.
shasum -a 512 Stacks-Wallet-macOS-3.0.0.dmg
```
- 
+ 
6. Verify that the resulting hash (a string of letters and numbers) is the same as the latest hash published [on this page](https://github.com/blockstack/stacks-wallet/releases).
@@ -55,7 +55,7 @@ by Blockstack PBC.
To find the command prompt software, enter `command` into the Start menu.
- 
+ 
3. In the command prompt window, enter the command to change directory to the folder where you downloaded the wallet software.
@@ -71,7 +71,7 @@ by Blockstack PBC.
certUtil -hashfile Stacks-Wallet-win10-3.0.0.exe SHA512
```
- 
+ 
5. Verify that the resulting hash (a string of letters and numbers) is the same as the latest hash published [on this page](https://github.com/blockstack/stacks-wallet/releases).
diff --git a/src/pages/stacks-wallet/overview.md b/src/pages/stacks-wallet/overview.md
index 5f133f86..33e1d93b 100644
--- a/src/pages/stacks-wallet/overview.md
+++ b/src/pages/stacks-wallet/overview.md
@@ -25,7 +25,7 @@ books and receive crypto currency in payment. Lena sees a book she wants to buy
button and Bitbook gives her an address to send currency to. Lena uses her private key to open one of her cryptocurrency
addresses. She then sends from this address to BitBook's address.
-
+
Token exchanges are recorded by _transactions_ on a blockchain. In the case of STX, these exchanges appear on the
Stacks blockchain. The movement of tokens from Lena to Bitbook is recorded on the blockchain. The private key Lena
diff --git a/src/pages/stacks-wallet/security.md b/src/pages/stacks-wallet/security.md
index 7f270294..115c4988 100644
--- a/src/pages/stacks-wallet/security.md
+++ b/src/pages/stacks-wallet/security.md
@@ -38,11 +38,11 @@ you should _never_ share but instead keep in a secure place (**PROTECT**).
| -------------------------------------------------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Secret Recovery Key | **PROTECT** | Used to access an identity on the Blockstack blockchain. A 24-word sequence of words for example: `applied binge crisp pictorial fiery dancing agreeable frogs light finish ping apple` The early Blockstack recovery keys were 12-word sequences. |
| Identity Blockstack Identity Blockstack ID | _SHAREABLE_ | A way to identify a person or an organization on the Blockstack network. An identity is unique, both `meepers.id.blockstack` or `chad.id` are examples of IDs. |
-| Magic Recovery Code | **PROTECT** | A long encrypted string, for example: `36mWivFdy0YPH2z31EflpQz/Y0UMrOrJ++UjOA...` Do not share the QR code that accompanied your recovery code either. This is a QR code: |
+| Magic Recovery Code | **PROTECT** | A long encrypted string, for example: `36mWivFdy0YPH2z31EflpQz/Y0UMrOrJ++UjOA...` Do not share the QR code that accompanied your recovery code either. This is a QR code: |
| Blockstack Owner Address | _SHAREABLE_ | Looks like a bitcoin address but starts with `ID`, for example: `ID-1J3PUxY5uDShUnHRrMyU6yKtoHEUPhKULs...` |
| Bitcoin address BTC Address | _SHAREABLE_ | A string of letters and numbers: `3E53XjqK4Cxt71BGeP2VhpcotM8LZ853C8...` Sharing this address allows anyone to send Bitcoin to the address. |
| Stacks address / STX address | _SHAREABLE_ | A string of letters and numbers: `3E53XjqK4Cxt71BGeP2VhpcotM8LZ853C8...` Sharing this address allows anyone to send Stacks (STX) to the address. |
| Public Key | _SHAREABLE_ | Public and private key pair comprise of two uniquely related cryptographic keys. It looks like a long random string of letters and numbers: `3048 0241 00C9 18FA CF8D EB2D EFD5 FD37 89B9 E069 EA97 FC20 …` The exact format of the public and private key depend on the software you use to create them. |
-| Private Key | **PROTECT** | Private keys matches a corresponding public key. A public key also looks like a string of letters and numbers: |
+| Private Key | **PROTECT** | Private keys matches a corresponding public key. A public key also looks like a string of letters and numbers: |
| Seed Phrase | **PROTECT** | Used to access Stacks Wallet software. The seed phrase consists of 24 words in a sequence. Both the _word and its position_ in the sequence are important. Write down your seed phrase and store it in a secure location such as a safe deposit box. When you write the seed phrase down, include its position, for example: `1-frog, 2-horse, 3-building` and so on until you reach a final position: `24-ocean`. |
| Wallet Address | _SHAREABLE_ | If you created a software-only wallet with the Stacks Wallet software, the wallet has a single STX address which is also sometimes called a Stacks (STX) address. You access a software wallet with a seed phrase. |
diff --git a/src/pages/stacks-wallet/usage.md b/src/pages/stacks-wallet/usage.md
index 40a39a1b..4c7afc10 100644
--- a/src/pages/stacks-wallet/usage.md
+++ b/src/pages/stacks-wallet/usage.md
@@ -89,7 +89,7 @@ When your hardware device is ready, do the following:
This example uses a Trezor wallet.
- 
+ 
The system prompts you to connect your
device.
@@ -98,7 +98,7 @@ When your hardware device is ready, do the following:
The system prompts you to export a public key.
- 
+ 
7. Select **Export**.
@@ -136,7 +136,7 @@ If you have an existing 24 word seed phrase from this or a previous version of t
The default view for an open and loaded wallet is the **Wallet Balance** view.
-
+
Notice this view includes **Send** and **Receive** buttons.
@@ -144,13 +144,13 @@ Both balances show **Transaction History** if it exists for an address. A
transaction summary appears on the initial screen. To see details,
click on a transaction:
-
+
Not all addresses have a balance. If you are a Stacks token holder, your
address shows with both a **Balance** and **Allocation**. The **Balance** is the
Stacks you have unlocked. The **Allocation** is the amount still locked up.
-
+
## Receive Stacks
@@ -159,7 +159,7 @@ example.
1. Click the **Receive** button to display the wallet address. where others can send STX to.
- 
+ 
2. Email or text the address to the person or organization sending to you.
@@ -169,7 +169,7 @@ example.
Once the person has sent you STX, you see a **PENDING** transaction which means the transaction is still being recorded by the blockchain.
- 
+ 
Blockchain transactions take time. It may be minutes or hours before the transaction is recorded in the blockchain. When the transaction is complete, you can see a receipt for the transaction in your Stacks Wallet. The **PENDING** marker goes away once the funds are recorded on the blockchain.
@@ -183,7 +183,7 @@ You can only receive Bitcoin with Stacks Wallet; you cannot send Bitcoin. You ne
If you attempt to send STX with your wallet and you do not have enough Bitcoin to fuel the transaction, you see this dialog:
-
+
To increase your Bitcoin for transactions, do the following:
@@ -191,7 +191,7 @@ To increase your Bitcoin for transactions, do the following:
The system opens the **Settings** dialog.
- 
+ 
This dialog shows you how much BTC you currently have in your account.
@@ -199,13 +199,13 @@ To increase your Bitcoin for transactions, do the following:
The systems displays the **Top Up** dialog with a Bitcoin address.
- 
+ 
3. Record the BTC address.
4. Go to your Coinbase or similar account.
5. Send Bitcoin to the address presented by the Stacks Wallet.
- 
+ 
Review your Stacks Wallet settings to see the increase in your balance. Your BTC balance only appears in this area.
@@ -236,17 +236,17 @@ Sending stacks is a transaction you must authorize or sign. If you have connecte
Otherwise, the system prompts you to connect to your hardware wallet. Your
hardware wallet will prompt you for additional information and actions.
- 
+ 
6. Select **Continue**.
The Stacks Wallet displays a confirmation dialog.
- 
+ 
7. Select **Confirm** to complete your transaction.
- 
+ 
8. Select **Close**.
@@ -275,7 +275,7 @@ you do not restart the wallet, you can simple close it.
The system opens the **Settings** dialog.
- 
+ 
2. Select **Reset Wallet**.
diff --git a/src/pages/storage-hubs/amazon-s3-deploy.md b/src/pages/storage-hubs/amazon-s3-deploy.md
index ce732cf8..4b4bf441 100644
--- a/src/pages/storage-hubs/amazon-s3-deploy.md
+++ b/src/pages/storage-hubs/amazon-s3-deploy.md
@@ -40,11 +40,11 @@ If `watch` is not located, install it on your workstation.
1. Visit the [AWS Free Tier page](https://aws.amazon.com/free/) and choose **Sign in to the Console**.
- 
+ 
2. Make sure your region is set to one close to you.
- 
+ 
3. Under **Build a solution** choose **Launch a virtual machine**.
@@ -58,7 +58,7 @@ If `watch` is not located, install it on your workstation.
The system displays the available Gaia hub images.
- 
+ 
Each image name has this format:
@@ -78,7 +78,7 @@ If `watch` is not located, install it on your workstation.
After you select an image, the system displays **Step 2: Choose an Instance Type** page.
- 
+ 
7. Select **t2.micro** and choose **Next: Configure Instance Details**.
@@ -179,7 +179,7 @@ If `watch` is not located, install it on your workstation.
8. Choose **Next: Add Storage**.
- 
+ 
The storage is set according to the AMI you selected.
@@ -192,7 +192,7 @@ If `watch` is not located, install it on your workstation.
- **Key** of `Name` with the **Value** `gaia-hub`
- **Key** of `Version` with the **Value** `2.5.3` (This value is an example, your version may be different.)
- 
+ 
11) Choose **Next: Configure Security Group**.
12) Create a security group with the following three types:
@@ -241,11 +241,11 @@ If `watch` is not located, install it on your workstation.
The system launches your instance.
- 
+ 
During the launch process the machine starts and runs some initial setup processes. These processes take a few minutes depending on the network, typically launching does not take more than 10 minutes. While this is happening the instance **Status Checks** reflect the **Initializing** status.
-
+
## Task 2: Connect your Gaia server to your domain
@@ -253,13 +253,13 @@ Now, you are ready to test your Gaia server. This procedure ensures the Gaia ser
1. Visit the AWS Free Tier page and choose **Sign in to the Console**.
- 
+ 
2. Choose **All services > EC2**.
The system displays the **EC2 Dashboard**.
- 
+ 
3. Select **Running Instances**.
@@ -272,7 +272,7 @@ Now, you are ready to test your Gaia server. This procedure ensures the Gaia ser
5. Select the **Description** tab.
- 
+ 
6. Locate the **IPv4 Public IP** value.
@@ -286,12 +286,12 @@ Now, you are ready to test your Gaia server. This procedure ensures the Gaia ser
Do this...
-
+
You should see a message that your connection is not private.
Everything is fine, continue to the next step, step 8.
-
+
Check that your domain's DNS configuration matches the public IP address of your instance.
@@ -309,7 +309,7 @@ Everything is fine, continue to the next step, step 8.
+ 
2. Navigate to [jwt.io](https://jwt.io/).
3. Paste the full token there.
diff --git a/src/pages/data-storage/authentication.md b/src/pages/data-storage/authentication.md
index 04512b1c..0abdbb1e 100644
--- a/src/pages/data-storage/authentication.md
+++ b/src/pages/data-storage/authentication.md
@@ -23,7 +23,7 @@ passed via URL query strings.
When a user chooses to "Sign in with Blockstack" on your DApp, the `redirectToSignIn()` method sends the user to the
Blockstack authenticator. The browser responds with an authentication token and an _app private key_.
-
+
The app private key is application-specific. It is generated from the user's identity address private key using the
`appDomain` as input. This key is deterministic, meaning that for a given Blockstack ID and domain name, the same
@@ -36,6 +36,6 @@ encrypted by the Blockstack authenticator. The key serves three functions, it:
When an application writes to a Gaia hub, the authentication token, key, and the data are passed to the Gaia hub.
-
+
The token ensures the DApp has the authorization to write to the hub on the user's behalf.
diff --git a/src/pages/data-storage/collections.md b/src/pages/data-storage/collections.md
index dbced4fe..8d079c3d 100644
--- a/src/pages/data-storage/collections.md
+++ b/src/pages/data-storage/collections.md
@@ -105,7 +105,7 @@ If you have `npm` installed, do the following to run the Contact Manager demo ap
The internet browser will display this pop-up
- 
+ 
10. Use the local browser by choosing **Open Blockstack.app**.
@@ -120,7 +120,7 @@ If you have `npm` installed, do the following to run the Contact Manager demo ap
When you have successfully created a contact, the Contact Manager displays that contact on the list. Here you can see that Josephine Baker was entered as a contact.
- 
+ 
2. Open the [collections page test](https://blockstack.github.io/blockstack-collections/page_test/) in your browser.
@@ -130,7 +130,7 @@ If you have `npm` installed, do the following to run the Contact Manager demo ap
4. Choose **List contacts**.
- 
+ 
## How to add the Contact collections to your DApp
diff --git a/src/pages/data-storage/overview.md b/src/pages/data-storage/overview.md
index 5263a724..4ace896f 100644
--- a/src/pages/data-storage/overview.md
+++ b/src/pages/data-storage/overview.md
@@ -19,14 +19,29 @@ parties.
The following diagram depicts the Blockstack architecture and Gaia's place in it:
-@include "architecture.md"
+
+
+Blockchains require consensus among large numbers of people, so they can be slow. Additionally, a blockchain is not designed to hold a lot of data. This means using a blockchain for every bit of data a user might write and store is expensive. For example, imagine if an application were storing every tweet in the chain.
+
+Blockstack addresses blockchain performance problems using a layered approach. The base layer consists of the Stacks blockchain and the Blockstack Naming System (BNS). The blockchain governs ownership of identities in the Blockstack network. Identities can be names such as domain names, usernames, or application names.
+
+When an identity is created, its creation is recorded in the Stacks blockchain. Identities make up the primary data stored into the Stacks blockchain. These identities correspond to routing data in the OSI stack. The routing data is stored in the Atlas Peer Network, the second layer. Every core node that joins the Blockstack Network is able to obtain an entire copy of this routing data. Blockstack uses the routing data to associate identities (domain names, user names, and application names) with a particular storage location in the final layer, the Gaia Storage System.
+
+A Gaia Storage System consists of a _hub service_ and storage resource on a cloud software provider. The storage provider can be any commercial provider such as Azure, DigitalOcean, Amazon EC2, and so forth. Typically the compute resource and the storage resource reside same cloud vendor, though this is not a requirement. Gaia currently has driver support for S3 and Azure Blob Storage, but the driver model allows for other backend support as well.
+
+Gaia stores data as a simple key-value store. When an identity is created, a corresponding data store is associated with that identity on Gaia. When a user logs into a dApp,
+the authentication process gives the application the URL of a Gaia hub, which
+then writes to storage on behalf of that user.
+
+Within Blockstack, then, the Stacks blockchain stores only identity data. Data created by the actions of an identity is stored in a Gaia Storage System. Each user has profile data. When a user interacts with a decentralized dApp that application stores application data on behalf of the user. Because Gaia stores user and application data off the blockchain, a Blockstack DApp is typically more performant than DApps created on other blockchains.
+
## User control or how is Gaia decentralized?
A Gaia hub runs as a service which writes to data storage. The storage itself is a simple key-value store. The hub service
writes to data storage by requiring a valid authentication token from a requestor. Typically, the hub service runs on a compute resource and the storage itself on separate, dedicated storage resource. Typically, both resources belong to the same cloud computing provider.
-
+
Gaia's approach to decentralization focuses on user control of data and its storage. Users can choose a Gaia hub provider. If a user can choose which Gaia hub provider to use, then that choice is all the decentralization required to enable user-controlled applications. Moreover, Gaia a uniform API to access for applications to access that data.
diff --git a/src/pages/ecosystem/stacks-token-holders.md b/src/pages/ecosystem/stacks-token-holders.md
index d2a6d666..cc48d483 100644
--- a/src/pages/ecosystem/stacks-token-holders.md
+++ b/src/pages/ecosystem/stacks-token-holders.md
@@ -42,7 +42,7 @@ help.
You should see a report detailing the tokens allocated to your address and when they unlock:
-
+
If you have questions or concerns about your report, please contact [hello@StacksToken.com](mailto:hello@StacksToken.com).
@@ -56,7 +56,7 @@ token holder, the dates of these events depend on the holders’s purchase date.
The general timeline for unlocking tokens and the capabilities that are
potentially possible, are as follows:
-
+
Your specific unlock date depends on when you purchased or were granted tokens.
You can use the Blockstack Explorer to discover how many tokens you have
diff --git a/src/pages/smart-contracts/hello-world-tutorial.md b/src/pages/smart-contracts/hello-world-tutorial.md
index 15db5f4a..f961dfbb 100644
--- a/src/pages/smart-contracts/hello-world-tutorial.md
+++ b/src/pages/smart-contracts/hello-world-tutorial.md
@@ -105,7 +105,7 @@ Open up the [Stacks 2.0 Explorer Sandbox view](https://testnet-explorer.blocksta
You will be asked to sign in with or sign up for a Blockstack ID, which creates a new STX address for you on the Testnet blockchain, where you can receive tokens. Follow the steps on the screen to complete the process.
-
+
Once completed, you will see the Sandbox screen and a confirmation, indicating you were provided with a new STX address for testing purposes.
@@ -117,7 +117,7 @@ On the [**STX faucet**](https://testnet-explorer.blockstack.org/sandbox?tab=fauc
A confirmation for a new transaction will pop up. If you want to see the details of your faucet request, you can click **View transaction**. However, you will to refresh the page a few times, for up to a minute or so, while the transaction completes.
-
+
## Deploy the contract
@@ -128,7 +128,7 @@ Go back to the Sandbox screen, switch to the [**Contract deploy**](https://testn
3. Ignore the **Choose from sample** drop-down for now. After completing this tutorial you can come back to the Explorer Sandbox and use this drop-down to try other sample contracts.
4. Click **Deploy contract**.
-
+
A confirmation will pop up, indicating that a new contract deploy transaction was issued. As with the faucet request, you can click **View transaction** to review the pending transaction if you like, but you'll need to keep refreshing the page until the deploy transaction completes. Once you're able to see the completed deploy transaction, you will see that every smart contract's source code is publicly verifiable through the explorer.
@@ -139,13 +139,13 @@ Go back to the Sandbox screen, switch to the [**Contract call**](https://testnet
- **Contract address**: Your generated STX address. Hover over the identity component on the right side of the screen to copy your full address and paste it in here.
- **Contract name**: Whatever you entered as your contract name in the previous step. If you forgot, you can review your recent transactions by following the link on the upper-right, and look up your contract creation transaction.
-
+
After clicking **Search**, you will see the two public methods implemented in the smart contract.
Locate the `(echo-number)` method, provide any integer for the `val` argument and click **Submit**. You will see the value you entered echoed back at you on the screen, as well as a confirmation that a contract call transaction was issued. Click on the transaction to review it. In the next seconds, your contract call should be completed and you will see a contract call success screen. Scroll down to the function summary section to verify your contract call:
-
+
**Congratulations! You just deployed your smart contract and called a public function on the Testnet.**
diff --git a/src/pages/smart-contracts/running-a-testnet-node.md b/src/pages/smart-contracts/running-a-testnet-node.md
index 9fa34d44..5afd1f3e 100644
--- a/src/pages/smart-contracts/running-a-testnet-node.md
+++ b/src/pages/smart-contracts/running-a-testnet-node.md
@@ -18,7 +18,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
If Rust is already installed, you might see this prompt. Select 'Proceed with Installation' to make sure you have the latest version installed.
-
+
In case you just installed Rust, you will be prompted to run the following command to make the `cargo` command available:
diff --git a/src/pages/stacks-wallet/install.md b/src/pages/stacks-wallet/install.md
index 92601bc5..884664e7 100644
--- a/src/pages/stacks-wallet/install.md
+++ b/src/pages/stacks-wallet/install.md
@@ -25,7 +25,7 @@ by Blockstack PBC.
To find the terminal software, enter `terminal` into the Spotlight search.
- 
+ 
4. In the terminal window, enter the command to change directory to the folder where you downloaded the wallet software.
@@ -41,7 +41,7 @@ by Blockstack PBC.
shasum -a 512 Stacks-Wallet-macOS-3.0.0.dmg
```
- 
+ 
6. Verify that the resulting hash (a string of letters and numbers) is the same as the latest hash published [on this page](https://github.com/blockstack/stacks-wallet/releases).
@@ -55,7 +55,7 @@ by Blockstack PBC.
To find the command prompt software, enter `command` into the Start menu.
- 
+ 
3. In the command prompt window, enter the command to change directory to the folder where you downloaded the wallet software.
@@ -71,7 +71,7 @@ by Blockstack PBC.
certUtil -hashfile Stacks-Wallet-win10-3.0.0.exe SHA512
```
- 
+ 
5. Verify that the resulting hash (a string of letters and numbers) is the same as the latest hash published [on this page](https://github.com/blockstack/stacks-wallet/releases).
diff --git a/src/pages/stacks-wallet/overview.md b/src/pages/stacks-wallet/overview.md
index 5f133f86..33e1d93b 100644
--- a/src/pages/stacks-wallet/overview.md
+++ b/src/pages/stacks-wallet/overview.md
@@ -25,7 +25,7 @@ books and receive crypto currency in payment. Lena sees a book she wants to buy
button and Bitbook gives her an address to send currency to. Lena uses her private key to open one of her cryptocurrency
addresses. She then sends from this address to BitBook's address.
-
+
Token exchanges are recorded by _transactions_ on a blockchain. In the case of STX, these exchanges appear on the
Stacks blockchain. The movement of tokens from Lena to Bitbook is recorded on the blockchain. The private key Lena
diff --git a/src/pages/stacks-wallet/security.md b/src/pages/stacks-wallet/security.md
index 7f270294..115c4988 100644
--- a/src/pages/stacks-wallet/security.md
+++ b/src/pages/stacks-wallet/security.md
@@ -38,11 +38,11 @@ you should _never_ share but instead keep in a secure place (**PROTECT**).
| -------------------------------------------------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Secret Recovery Key | **PROTECT** | Used to access an identity on the Blockstack blockchain. A 24-word sequence of words for example: 
|
+| Magic Recovery Code | **PROTECT** | A long encrypted string, for example:
|
| Blockstack Owner Address | _SHAREABLE_ | Looks like a bitcoin address but starts with `ID`, for example: `ID-1J3PUxY5uDShUnHRrMyU6yKtoHEUPhKULs...` |
| Bitcoin address 
|
+| Private Key | **PROTECT** | Private keys matches a corresponding public key. A public key also looks like a string of letters and numbers: 
|
| Seed Phrase | **PROTECT** | Used to access Stacks Wallet software. The seed phrase consists of 24 words in a sequence. Both the _word and its position_ in the sequence are important. 
 +  2. **Choose a datacenter region** section. @@ -150,15 +150,15 @@ In this task, you add a droplet to your account. The droplet is a droplet is a c 1. Log into DigitalOcean. 2. Go to your DigitalOcean dashboard. -  +  3. Click the **Create > Droplets** button in the top right. -  +  4. Select the **Marketplace** tab. -  +  5. Select the **Docker** app from the options presented. @@ -194,7 +194,7 @@ A droplet console emulates the access you would have if you were sitting down wi 2. Click on the droplet name to open the control panel. -  +  3. Choose **Access** from the control panel. 4. Select **Reset Root Password** to have DigitalOcean send you the root password. @@ -211,7 +211,7 @@ A droplet console emulates the access you would have if you were sitting down wi The system displays a message telling you to change the `root` password. -  +  And prompts you for the current password. @@ -258,7 +258,7 @@ A droplet console emulates the access you would have if you were sitting down wi The system creates your key and displays both the key and its secret. -  +  6. Save your secret in a secure password manager. @@ -356,7 +356,7 @@ You should have the console open as `root` on your Droplet. In this section, you 11. In the DigitalOcean dashboard, choose the Spaces page. 12. Copy the section of your space URL that follows the name. -  +  In this example, you would copy the `sfo2.digitaloceanspaces.com` section. @@ -538,14 +538,14 @@ Now, you are ready to test your Gaia server and make sure it is up and running. 1. Click on **Droplets** in the sidebar. 2. Find your Droplet running Gaia. -  +  3. Copy the IP address for it. 4. In your browser, visit the page `MY_DROPLET_IP/hub_info`. You should see a response from your Gaia hub! -  +  The `read_url_prefix` should be combine from the bucket and endpoint create in your `config.json` file, for example, @@ -573,11 +573,11 @@ These instructions assume you have already created a free](https://www.f
At this point, your DNS management should look similar to the following except that with your domain rather than the `maryhub.ga` domain.
- 
+ 
7. After your changes propagate, visit your new domain at the `hub_info` page.
- 
+ 
If you receive another **Your connection is not private** dialogs, take the option to proceed to your domain. The _Not secure_ message should no longer appear in the browser bar. If the message does appear, try waiting a few minutes for your recent changes to propagate across the net domain servers. Then, refresh the page.
@@ -350,7 +350,7 @@ These instructions assume you have already created a free <a href=){kind=link}