Skip to content

Commit 88c4ce0

Browse files
a-zorinayamkovoy
andauthored
Getting started update and overhaul (#504)
* Getting started update and overhaul Signed-off-by: a_zorina <[email protected]> Signed-off-by: a-zorina <[email protected]> * fix broken links Signed-off-by: a_zorina <[email protected]> Signed-off-by: a-zorina <[email protected]> * fix section links Signed-off-by: a_zorina <[email protected]> Signed-off-by: a-zorina <[email protected]> * Language and structure improvements Signed-off-by: a-zorina <[email protected]> * External links and crate names fixes Signed-off-by: a-zorina <[email protected]> * Switch to using cargo install for iroha binaries in getting started Signed-off-by: a-zorina <[email protected]> * Minor post-review fixes Signed-off-by: a-zorina <[email protected]> * Fixes and suggestions after review Signed-off-by: yamkovoy <[email protected]> * Changes after discussion Signed-off-by: yamkovoy <[email protected]> * Minor tweaks in instructions Signed-off-by: yamkovoy <[email protected]> * Additional post-review updates Signed-off-by: a-zorina <[email protected]> * link fixes Signed-off-by: a-zorina <[email protected]> * final post-review changes Signed-off-by: a-zorina <[email protected]> --------- Signed-off-by: a_zorina <[email protected]> Signed-off-by: a-zorina <[email protected]> Signed-off-by: yamkovoy <[email protected]> Co-authored-by: yamkovoy <[email protected]>
1 parent c1520e4 commit 88c4ce0

37 files changed

+704
-1110
lines changed

.vitepress/config.mts

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ function nav(): DefaultTheme.NavItem[] {
1414
text: 'Guide',
1515
items: [
1616
// { text: 'Get Started', link: '/guide/get-started/index' },
17-
// { text: 'Build and Install', link: '/guide/get-started/install' },
17+
// { text: 'Build and Install', link: '/guide/get-started/install-iroha' },
1818
// { text: 'Tutorials', link: '/guide/get-started/tutorials'},
1919
{
2020
text: 'Get Started',
2121
items: [
22-
{ text: 'Build and Install', link: '/guide/get-started/install' },
22+
{ text: 'Install and Build', link: '/guide/get-started/install-iroha-2' },
2323
{ text: 'SDK Tutorials', link: '/guide/get-started/tutorials' },
2424
],
2525
},
@@ -93,32 +93,23 @@ function sidebarGuide(): DefaultTheme.SidebarItem[] {
9393
return [
9494
{
9595
text: 'Get Started',
96+
link: '/guide/get-started/',
9697
items: [
9798
{
98-
text: 'About Iroha',
99-
link: '/guide/introduction',
99+
text: 'Install Iroha 2',
100+
link: '/guide/get-started/install-iroha-2',
100101
},
101102
{
102-
text: 'Iroha 2 vs. Iroha 1',
103-
link: '/guide/iroha-2',
103+
text: 'Launch Iroha 2',
104+
link: '/guide/get-started/launch-iroha-2',
104105
},
105106
{
106-
text: 'Build and Install',
107-
collapsed: true,
108-
items: [
109-
{
110-
text: 'Install Iroha',
111-
link: '/guide/get-started/install',
112-
},
113-
{
114-
text: 'Build Iroha Client',
115-
link: '/guide/get-started/build',
116-
},
117-
{
118-
text: 'Quick Start with Docker',
119-
link: '/guide/get-started/quick-start',
120-
},
121-
],
107+
text: 'Operate Iroha 2 via CLI',
108+
link: '/guide/get-started/operate-iroha-2-via-cli',
109+
},
110+
{
111+
text: 'Iroha 2 vs. Iroha 1',
112+
link: '/guide/iroha-2',
122113
},
123114
{
124115
text: 'Receive support',
@@ -174,10 +165,6 @@ function sidebarGuide(): DefaultTheme.SidebarItem[] {
174165
{
175166
text: 'Language-specific Guides',
176167
items: [
177-
{
178-
text: 'Bash',
179-
link: '/guide/get-started/bash',
180-
},
181168
{
182169
text: 'Python 3',
183170
link: '/guide/get-started/python',

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# Hyperledger Iroha 2 Tutorial
22

3-
This repository contains the source files for [Hyperledger Iroha 2 Tutorial](https://hyperledger.github.io/iroha-2-docs/).
3+
This repository contains the source files for [Hyperledger Iroha 2 Documentation](https://hyperledger.github.io/iroha-2-docs/).
44

55
The tutorial is suitable for both experienced and novice users. It explains Iroha 2 concepts and features, and also offers language-specific step-by-step guides for these programming languages:
66

7-
- [Bash](https://hyperledger.github.io/iroha-2-docs/guide/bash.html)
7+
- [CLI](https://hyperledger.github.io/iroha-2-docs/guide/operate-iroha-2-via-cli.html)
88
- [Python](https://hyperledger.github.io/iroha-2-docs/guide/python.html)
99
- [Rust](https://hyperledger.github.io/iroha-2-docs/guide/rust.html)
1010
- [Kotlin/Java](https://hyperledger.github.io/iroha-2-docs/guide/kotlin-java.html)
1111
- [Javascript (TypeScript)](https://hyperledger.github.io/iroha-2-docs/guide/javascript.html)
1212

1313
If you are already familiar with Hyperledger Iroha, we invite you to read about [how Iroha 2 is different](https://hyperledger.github.io/iroha-2-docs/guide/iroha-2.html) from its previous version.
1414

15-
Check the [Hyperledger Iroha 2](https://github.com/hyperledger/iroha/tree/iroha2-dev#hyperledger-iroha) repository for more detailed information about API and available features.
15+
Check the [Hyperledger Iroha](https://github.com/hyperledger/iroha/) repository for more detailed information about API and available features.
1616

1717
## Contribution
1818

src/documenting/snippets.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ located in other repositories, where they are built, run, and tested.
99
### Snippet Sources
1010

1111
Snippet sources are defined in
12-
[`snippet_sources.ts`](https://github.com/hyperledger/iroha-2-docs/blob/main/etc/snippet_sources.ts).
13-
The `snippet_sources.ts` file is located at the documentation repository
14-
and has the following format:
12+
[`snippet_sources.ts`](https://github.com/hyperledger/iroha-2-docs/blob/main/etc/snippet-sources.ts).
13+
The `snippet_sources.ts` file is located in the documentation repository and has the following format:
1514

1615
```ts
1716
export default [
1817
{
19-
src: 'https://raw.githubusercontent.com/hyperledger/iroha/iroha2-stable/MAINTAINERS.md',
18+
src: 'https://raw.githubusercontent.com/hyperledger/iroha/main/MAINTAINERS.md',
2019
filename: 'iroha-maintainers-at-stable.md',
2120
},
2221
{

src/guide/advanced/running-iroha-on-bare-metal.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,8 @@ ports need to be adjusted so there are no collisions. See the
353353

354354
## Deploy a minimal BFT network
355355

356-
Both of the following approaches could be messy and error-prone, which is why the [Quick Start](../get-started/quick-start.md) tutorial suggests using the `docker compose` command.
357-
However, this brings you closer to the
358-
experience of actually maintaining a functional Iroha peer.
356+
Both of the following approaches could be messy and error-prone, which is why the [Launch Iroha 2](../get-started/launch-iroha-2.md) tutorial suggests using the `docker compose` command.
357+
However, this brings you closer to the experience of actually maintaining a functional Iroha peer.
359358

360359
### Using Environment Variables
361360

src/guide/blockchain/assets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Assets can be [registered](./instructions.md#un-register),
7676
Refer to one of the language-specific guides to walk you through the
7777
process of registering and minting assets in a blockchain:
7878

79-
- [Bash](/guide/get-started/bash.md#_5-registering-and-minting-assets)
79+
- [CLI](/guide/get-started/operate-iroha-2-via-cli.md#_6-register-and-mint-assets)
8080
- [Rust](/guide/get-started/rust.md#_5-registering-and-minting-assets)
8181
- [Kotlin/Java](/guide/get-started/kotlin-java.md#_5-registering-and-minting-assets)
8282
- [Python](/guide/get-started/python.md#_5-registering-and-minting-assets)

src/guide/blockchain/consensus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ fail. The same thing happens if the peers have different instructions.
3232

3333
[^1]:
3434
For prospective wizards, the
35-
[Iroha 2 Whitepaper](https://github.com/hyperledger/iroha/blob/iroha2-dev/docs/source/iroha_2_whitepaper.md)
35+
[Iroha 2 Whitepaper](https://github.com/hyperledger/iroha/blob/main/docs/source/iroha_2_whitepaper.md)
3636
is a good start.

src/guide/blockchain/data-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ domain_looking_glass *-- account_rabbit : registered in
8787

8888
| Language | Guide |
8989
| --------------------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
90-
| Bash | Register a [domain](/guide/get-started/bash.md#_3-registering-a-domain), an [account](/guide/get-started/bash.md#_4-registering-an-account), an [asset](/guide/get-started/bash.md#_5-registering-and-minting-assets) |
90+
| CLI | Register a [domain](/guide/get-started/operate-iroha-2-via-cli.md#_3-register-a-domain), an [account](/guide/get-started/operate-iroha-2-via-cli.md#_4-register-an-account), an [asset](/guide/get-started/operate-iroha-2-via-cli.md#_6-register-and-mint-assets) |
9191
| Rust | Register a [domain](/guide/get-started/rust.md#_3-registering-a-domain), an [account](/guide/get-started/rust.md#_4-registering-an-account), an [asset](/guide/get-started/rust.md#_5-registering-and-minting-assets) |
9292
| Kotlin/Java | Register a [domain](/guide/get-started/kotlin-java.md#_3-querying-and-registering-domains), an [account](/guide/get-started/kotlin-java.md#_4-registering-an-account), an [asset](/guide/get-started/kotlin-java.md#_5-registering-and-minting-assets) |
9393
| Python | Register a [domain](/guide/get-started/python.md#_3-registering-a-domain), an [account](/guide/get-started/python.md#_4-registering-an-account), an [asset](/guide/get-started/python.md#_5-registering-and-minting-assets) |

src/guide/blockchain/how-iroha-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
To understand how Iroha operates, let's draw parallels between a blockchain
44
and a computer. If the blockchain is the computer, then in this metaphor of
5-
ours the client binary (for example: [`iroha_client_cli`](/guide/get-started/bash.md))
5+
ours the client binary (for example: [`iroha`](/guide/get-started/operate-iroha-2-via-cli.md))
66
is the keyboard, the blockchain is the hard drive, and the Iroha peer
77
software is the processor. Like a processor, Iroha accepts portable
88
instructions that modify what's written to the blockchain, allow certain

src/guide/blockchain/instructions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ process of registering objects in a blockchain:
109109

110110
| Language | Guide |
111111
| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
112-
| Bash | Register a [domain](/guide/get-started/bash.md#_3-registering-a-domain), an [account](/guide/get-started/bash.md#_4-registering-an-account), an [asset](/guide/get-started/bash.md#_5-registering-and-minting-assets) |
112+
| CLI | Register a [domain](/guide/get-started/operate-iroha-2-via-cli.md#_3-register-a-domain), an [account](/guide/get-started/operate-iroha-2-via-cli.md#_4-register-an-account), an [asset](/guide/get-started/operate-iroha-2-via-cli.md#_6-register-and-mint-assets) |
113113
| Rust | Register a [domain](/guide/get-started/rust.md#_3-registering-a-domain), an [account](/guide/get-started/rust.md#_4-registering-an-account), an [asset](/guide/get-started/rust.md#_5-registering-and-minting-assets) |
114114
| Kotlin/Java | Register a [domain](/guide/get-started/kotlin-java.md#_3-querying-and-registering-domains), an [account](/guide/get-started/kotlin-java.md#_4-registering-an-account), an [asset](/guide/get-started/kotlin-java.md#_5-registering-and-minting-assets) |
115115
| Python | Register a [domain](/guide/get-started/python.md#_3-registering-a-domain), an [account](/guide/get-started/python.md#_4-registering-an-account), an [asset](/guide/get-started/python.md#_5-registering-and-minting-assets) |
@@ -130,15 +130,15 @@ are assumed to be non-negative as well, so you can never have $-1.0$ of
130130
Refer to one of the language-specific guides to walk you through the
131131
process of minting assets in a blockchain:
132132

133-
- [Bash](/guide/get-started/bash.md#_5-registering-and-minting-assets)
133+
- [CLI](/guide/get-started/operate-iroha-2-via-cli.md#_6-register-and-mint-assets)
134134
- [Rust](/guide/get-started/rust.md#_5-registering-and-minting-assets)
135135
- [Kotlin/Java](/guide/get-started/kotlin-java.md#_5-registering-and-minting-assets)
136136
- [Python](/guide/get-started/python.md#_5-registering-and-minting-assets)
137137
- [JavaScript/TypeScript ](/guide/get-started/javascript.md#_5-registering-and-minting-assets)
138138

139139
Here are examples of burning assets:
140140

141-
- [Bash](/guide/get-started/bash.md#_7-burning-assets)
141+
- [CLI](/guide/get-started/operate-iroha-2-via-cli.md#_8-burn-assets)
142142
- [Rust](/guide/get-started/rust.md#_7-burning-assets)
143143

144144
## Transfer
@@ -149,7 +149,7 @@ can transfer assets between different accounts.
149149
To do this, an account have to be granted the
150150
[permission to transfer assets](/reference/permissions.md).
151151
Refer to an example on how to
152-
transfer assets in [Bash](/guide/get-started/bash.md#_6-transferring-assets) or [Rust](/guide/get-started/rust.md#_6-transferring-assets).
152+
transfer assets with [CLI](/guide/get-started/operate-iroha-2-via-cli.md#_7-transfer-assets) or [Rust](/guide/get-started/rust.md#_6-transferring-assets).
153153

154154
<!--TODO: add links to transferring assets example in which guide after https://github.com/hyperledger/iroha-2-docs/issues/81 is addressed -->
155155

src/guide/blockchain/triggers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ contains the necessary information:
1919
The documentation on the `EventFilter` types is under construction, as
2020
we are likely to make major changes to that particular architecture.
2121
For now, suffice it to say that you can look at the
22-
[source code](https://github.com/hyperledger/iroha/blob/iroha2-dev/data_model/src/events/data/filters.rs)
22+
[source code](https://github.com/hyperledger/iroha/blob/main/data_model/src/events/data/filters.rs)
2323
in `iroha_data_model` and see a few particularly interesting
2424
applications.
2525

0 commit comments

Comments
 (0)