Skip to content

Commit

Permalink
Merge PR #272, #285, and #291 into main (#296)
Browse files Browse the repository at this point in the history
  • Loading branch information
katomm authored Sep 15, 2021
1 parent 3a21bf9 commit c017c15
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ To maintain the quality of content on the developer portal, we use pull requests

Please follow these steps to have your contribution considered by the maintainers:

1. Follow all instructions in [the template](PULL_REQUEST_TEMPLATE.md)
1. Follow all instructions in [the template](.github/PULL_REQUEST_TEMPLATE.md)
2. Follow the [styleguides](https://developers.cardano.org/docs/portal-style-guide/)
3. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing <details><summary>What if the status checks are failing?</summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track and resolve that problem.</details>

Expand Down
14 changes: 9 additions & 5 deletions docs/get-started/running-cardano.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ The `cardano-node` application requires at least four configuration files to run
- **Main Config**: It contains general node settings such as **logging** and **versioning**. It also points to the **Byron Genesis** and the **Shelly Genesis** file.
- **Byron Genesis**: It contains the initial protocol parameters and instructs the `cardano-node` on how to bootstrap the **Byron Era** of the **Cardano** blockchain.
- **Shelly Genesis**: It contains the initial protocol parameters and instructs the `cardano-node` on how to bootstrap the **Shelly Era** of the **Cardano** blockchain.
- **Alonzo Genesis**: It contains the initial protocol parameters and instructs the `cardano-node` on how to bootstrap the **Shelly Era** of the **Cardano** blockchain.
- **Topology**: It contains the list of network peers (**`IP Address` and `Port` of other nodes running the blockchain network**) that your node will connect to.

:::important
Expand All @@ -40,10 +41,11 @@ You can obtain the current **Cardano** blockchain network configuration files he
**NetworkMagic**: `764824073`

```
https://hydra.iohk.io/build/7191656/download/1/mainnet-config.json
https://hydra.iohk.io/build/7191656/download/1/mainnet-byron-genesis.json
https://hydra.iohk.io/build/7191656/download/1/mainnet-shelley-genesis.json
https://hydra.iohk.io/build/7191656/download/1/mainnet-topology.json
https://hydra.iohk.io/build/7370192/download/1/mainnet-config.json
https://hydra.iohk.io/build/7370192/download/1/mainnet-byron-genesis.json
https://hydra.iohk.io/build/7370192/download/1/mainnet-shelley-genesis.json
https://hydra.iohk.io/build/7370192/download/1/mainnet-alonzo-genesis.json
https://hydra.iohk.io/build/7370192/download/1/mainnet-topology.json
```

#### Testnet / Sandbox
Expand All @@ -54,6 +56,7 @@ https://hydra.iohk.io/build/7191656/download/1/mainnet-topology.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-config.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-byron-genesis.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-shelley-genesis.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-alonzo-genesis.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-topology.json
```

Expand Down Expand Up @@ -147,6 +150,7 @@ We will focus on six key command-line parameters for running a node:
```
/home/user/cardano/
├── db
├── testnet-alonzo-genesis.json
├── testnet-byron-genesis.json
├── testnet-config.json
├── testnet-shelley-genesis.json
Expand Down Expand Up @@ -195,7 +199,7 @@ We will focus on six key command-line parameters for running a node:
```
--config /home/user/cardano/testnet-config.json
```
> Please make sure that the `byron-genesis.json` and `shelley-genesis.json` are in the same directory as the `config.json`.
> Please make sure that the `alonzo-genesis.json`, `byron-genesis.json` and `shelley-genesis.json` are in the same directory as the `config.json`.

Here is a realistic example for running `cardano-node`:

Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2477,11 +2477,11 @@ autoprefixer@^10.2.0, autoprefixer@^10.2.5:
postcss-value-parser "^4.1.0"

axios@^0.21.1:
version "0.21.1"
resolved "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
version "0.21.4"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
dependencies:
follow-redirects "^1.10.0"
follow-redirects "^1.14.0"

babel-loader@^8.2.2:
version "8.2.2"
Expand Down Expand Up @@ -4407,10 +4407,10 @@ flux@^4.0.1:
fbemitter "^3.0.0"
fbjs "^3.0.0"

follow-redirects@^1.0.0, follow-redirects@^1.10.0:
version "1.13.2"
resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"
integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
follow-redirects@^1.0.0, follow-redirects@^1.14.0:
version "1.14.3"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==

for-in@^1.0.2:
version "1.0.2"
Expand Down

0 comments on commit c017c15

Please sign in to comment.