Skip to content

Commit ac5f380

Browse files
authored
Merge pull request #3485 from nymtech/feature/docs-1-1-20
removing hardcoded version numbers
2 parents cd6a725 + 4e278ca commit ac5f380

File tree

10 files changed

+908
-52
lines changed

10 files changed

+908
-52
lines changed

documentation/dev-portal/book.toml

+3-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ assets_version = "2.0.0" # do not edit: managed by `mdbook-admonish install`
4949
[preprocessor.variables.variables]
5050
# code prerequisites versions
5151
minimum_rust_version = "1.66"
52-
platform_release_version = "v1.1.19"
53-
upcoming_platform_release_version = "v1.1.20" # to use when adding 'edit on github' plugin
54-
mix_node_release_version = "v1.1.20"
55-
#
52+
# TODO remove this in place of develop in next release
53+
platform_release_version = "v1.1.20"
54+
5655
[preprocessor.last-changed]
5756
command = "mdbook-last-changed"
5857
renderer = ["html"]

documentation/docs/book.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[book]
2-
title = "Nym Docs v1.1.19"
2+
title = "Nym Docs"
33
authors = ["Max Hampshire"]
44
description = "Nym technical documentation"
55
language = "en"
@@ -48,9 +48,9 @@ assets_version = "2.0.0" # do not edit: managed by `mdbook-admonish install`
4848
# https://gitlab.com/tglman/mdbook-variables/
4949
[preprocessor.variables.variables]
5050
minimum_rust_version = "1.66"
51-
platform_release_version = "v1.1.19"
52-
upcoming_platform_release_version = "v1.1.20" # to use in 'edit page on github' plugin (coming soon)
53-
mix_node_release_version = "v1.1.20"
51+
52+
# old variables - this is still needed for links.. TODO change to develop?
53+
platform_release_version = "v1.1.20"
5454

5555
[preprocessor.last-changed]
5656
command = "mdbook-last-changed"

documentation/docs/src/clients/socks5-client.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
> The Nym socks5 client was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code on this page, go there first.
44
5+
## Current version
6+
```
7+
<!-- cmdrun ../../../../target/release/nym-socks5-client --version | grep "Build Version" | cut -b 21-26 -->
8+
```
9+
10+
## What is this client for?
511
Many existing applications are able to use either the SOCKS4, SOCKS4A, or SOCKS5 proxy protocols. If you want to send such an application's traffic through the mixnet, you can use the `nym-socks5-client` to bounce network traffic through the Nym network, like this:
612

713
```

documentation/docs/src/clients/websocket-client.md

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
> The Nym Websocket Client was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code on this page, go there first.
44
5+
## Current version
6+
```
7+
<!-- cmdrun ../../../../target/release/nym-client --version | grep "Build Version" | cut -b 21-26 -->
8+
```
9+
510
## Client setup
611
### Viewing command help
712

documentation/docs/src/nodes/gateway-setup.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
> The Nym gateway was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code, go there first.
44
5+
## Current version
6+
```
7+
<!-- cmdrun ../../../../target/release/nym-gateway --version | grep "Build Version" | cut -b 21-26 -->
8+
```
9+
10+
511
## Preliminary steps
612
There are a couple of steps that need completing before starting to set up your gateway:
713

documentation/docs/src/nodes/mix-node-setup.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
> The Nym mix node binary was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code, go there first.
44
5-
```admonish info
6-
The `nym-mixnode` binary is currently one point version ahead of the rest of the platform binaries due to a patch applied between releases.
5+
## Current version
6+
```
7+
<!-- cmdrun ../../../../target/release/nym-mixnode --version | grep "Build Version" | cut -b 21-26 -->
78
```
89

10+
The `nym-mixnode` binary is currently one point version ahead of the rest of the platform binaries due to a patch applied between releases.
11+
912
## Preliminary steps
1013

1114
There are a couple of steps that need completing before starting to set up your mix node:

documentation/docs/src/nodes/network-requester-setup.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22

33
> The Nym network requester was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code on this page, go there first.
44
5-
If you have access to a server, you can run the network requester, which allows Nym users to send outbound requests from their local machine through the mixnet to a server, which then makes the request on their behalf, shielding them (and their metadata) from clearnet, untrusted and unknown infrastructure, such as email or message client servers.
65

7-
> As of `v1.1.10`, the network requester longer requires a separate nym client instance for it to function, as it has a client embedded within the binary running as a single process.
8-
>
6+
## Current version
7+
```
8+
<!-- cmdrun ../../../../target/release/nym-network-requester --version | grep "Build Version" | cut -b 21-26 -->
9+
```
10+
11+
912
## Network Requester Whitelist
10-
The network requester is **not** an open proxy. It uses a file called `allowed.list` (located in `~/.nym/service-providers/network-requester/<network-requester-id>/`) as a whitelist for outbound requests.
13+
If you have access to a server, you can run the network requester, which allows Nym users to send outbound requests from their local machine through the mixnet to a server, which then makes the request on their behalf, shielding them (and their metadata) from clearnet, untrusted and unknown infrastructure, such as email or message client servers.
14+
15+
By default the network requester is **not** an open proxy (although it can be used as one). It uses a file called `allowed.list` (located in `~/.nym/service-providers/network-requester/<network-requester-id>/`) as a whitelist for outbound requests.
1116

1217
Any request to a URL which is not on this list will be blocked.
1318

documentation/docs/src/tools/nym-cli.md

+30-38
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
# Nym-CLI
22

3+
## What is this tool for?
34
This is a CLI tool for interacting with:
45

56
* the Nyx blockchain (account management, querying the chain state, etc)
67
* the smart contracts deployed on Nyx (bonding and unbonding mixnodes, collecting rewards, etc)
78

89
It provides a convenient wrapper around the `nymd` client, and has similar functionality to the `nyxd` binary for querying the chain or executing smart contract methods.
910

10-
## Building
11-
The `nym-cli` binary can be built by running `cargo build --release` in the `nym/tools/nym-cli` directory.
11+
## Building
12+
The `nym-cli` binary can be built by running `cargo build --release` in the `nym/tools/nym-cli` directory.
1213

13-
### Useage
14-
You can see all available commands with:
14+
### Useage
15+
You can see all available commands with:
1516

1617
```
17-
./nym-cli --help
18+
./nym-cli --help
1819
```
1920

2021
~~~admonish example collapsible=true title="Console output"
2122
```
2223
23-
nym-cli
24+
nym-cli
2425
A client for interacting with Nym smart contracts and the Nyx blockchain
2526
2627
USAGE:
@@ -67,13 +68,13 @@ subcommands:
6768
```
6869
~~~
6970

70-
## Example Usage
71-
Below we have listed some example commands for some of the features listed above.
71+
## Example Usage
72+
Below we have listed some example commands for some of the features listed above.
7273

7374
If ever in doubt what you need to type, or if you want to see alternative parameters for a command, use the `nym-cli <subcommand_name> --help` to view all available options.
7475

7576
```
76-
./nym-cli account create --help
77+
./nym-cli account create --help
7778
```
7879

7980
~~~admonish example collapsible=true title="Console output"
@@ -120,7 +121,7 @@ OPTIONS:
120121
Creates an account with a random Mnemonic and a new address.
121122

122123
```
123-
./nym-cli account create
124+
./nym-cli account create
124125
125126
# Result:
126127
# 1. Mnemonic
@@ -136,7 +137,7 @@ Queries the existing balance of an account.
136137

137138
```
138139
# Using adddress below for example purposes.
139-
./nym-cli account balance n1hzn28p2c6pzr98r85jp3h53fy8mju5w7ndd5vh
140+
./nym-cli account balance n1hzn28p2c6pzr98r85jp3h53fy8mju5w7ndd5vh
140141
141142
# Result:
142143
2022-11-10T10:28:54.009Z INFO nym_cli_commands::validator::account::balance > Getting balance for n1hzn28p2c6pzr98r85jp3h53fy8mju5w7ndd5vh...
@@ -149,7 +150,7 @@ Queries the existing balance of an account.
149150
You can also query an accounts balance by using its mnemonic:
150151

151152
```
152-
./nym-cli account balance --mnemonic <mnemonic>
153+
./nym-cli account balance --mnemonic <mnemonic>
153154
```
154155

155156
### Send tokens to an account
@@ -167,7 +168,7 @@ Queries the specified blockchain (Nyx chain by default) for the current block he
167168
```
168169
./nym-cli block current-height --mnemonic <mnemonic>
169170
170-
# Result:
171+
# Result:
171172
Current block height:
172173
<BLOCK_HEIGHT>
173174
```
@@ -183,50 +184,50 @@ Query a mix node on the mixnet.
183184

184185
### Bond a mix node
185186

186-
Bonding a mix node is a process that takes a few steps due to the need to sign a transaction with your nym address for replay attack protection.
187+
Bonding a mix node is a process that takes a few steps due to the need to sign a transaction with your nym address for replay attack protection.
187188

188-
* generate a signature payload:
189+
* generate a signature payload:
189190
```
190-
./nym-cli mixnet operators mixnode create-mixnode-bonding-sign-payload
191+
./nym-cli mixnet operators mixnode create-mixnode-bonding-sign-payload
191192
192-
# returns something like
193+
# returns something like
193194
97GEhgMrPTmQVZgHqJeqWmgQ154GLKqy8xNGtLkV8xy5xc1SuwsEnqjhtZVshBYK74n53fFkKbSrS6kxkBE3vUikbU76JZmLMFmfR7aaU2NdBnfTPPHP2nwb2hJiEueq4SvvtDtQckxv7ZJzdxyXHxUeDPhzbprxTff78U3NGNk4cg6Q2K4EFqishdaqToedsXAPvVCWNbC1iWVjEq8nJ95Eb3NJyi3KmXcNDy4i8ZXgZHu4v8F4htXq2vZUdBSbizdkNr1NRvEg6PGVQdTseyuN8JxD3yuvrqprPY2kvJaT2YiYLPgWxoQtbfwcpkX4PP1PvwuMg4W8EXhitMpM2WHqLDP5vgfDGxdDCmRS44pM8ya4hcQ4g3McHWxduGWdbCzNNEsX6oQw4LVFcWn4mhbXSgqHwNQMm2TQW6LatYZSwCczdhEwV2CXe36UGCUzozmm4nj9qfUtXqDzMrHAAS8kjbKaVNaVaRRKgauQrHnK7QGg1QpVnnaxCs14wvUb62sio8XZmMzP2SjVaRJFCyJB3UwZ6L4oXMGMXSRsiKe8ZNTaa6iX69tx54CAAHBHoiReiq7E5T2VuR5v
194195
```
195196

196-
* sign this payload:
197+
* sign this payload:
197198
```
198199
./nym-mixnode sign --id upgrade_test --contract-msg 97GEhgMrPTmQVZgHqJeqWmgQ154GLKqy8xNGtLkV8xy5xc1SuwsEnqjhtZVshBYK74n53fFkKbSrS6kxkBE3vUikbU76JZmLMFmfR7aaU2NdBnfTPPHP2nwb2hJiEueq4SvvtDtQckxv7ZJzdxyXHxUeDPhzbprxTff78U3NGNk4cg6Q2K4EFqishdaqToedsXAPvVCWNbC1iWVjEq8nJ95Eb3NJyi3KmXcNDy4i8ZXgZHu4v8F4htXq2vZUdBSbizdkNr1NRvEg6PGVQdTseyuN8JxD3yuvrqprPY2kvJaT2YiYLPgWxoQtbfwcpkX4PP1PvwuMg4W8EXhitMpM2WHqLDP5vgfDGxdDCmRS44pM8ya4hcQ4g3McHWxduGWdbCzNNEsX6oQw4LVFcWn4mhbXSgqHwNQMm2TQW6LatYZSwCczdhEwV2CXe36UGCUzozmm4nj9qfUtXqDzMrHAAS8kjbKaVNaVaRRKgauQrHnK7QGg1QpVnnaxCs14wvUb62sio8XZmMzP2SjVaRJFCyJB3UwZ6L4oXMGMXSRsiKe8ZNTaa6iX69tx54CAAHBHoiReiq7E5T2VuR5v
199200
```
200201

201-
* bond the node using the signature:
202+
* bond the node using the signature:
202203
```
203204
./nym-cli --mnemonic <mnemonic> mixnet operators mixnode bond --amount 100000000 --mix-port 1789 --version "1.1.13" --host "85.163.111.99" --identity-key "B6pWscxYb8sPAdKTci8zPy5AgMzn5Zx8KpWwQNCyUSU7" --location "nym-town" --sphinx-key "o6MmKHzRewpNzVwaV37ZX9G3BfK4AmfYvsQfyoyAFRk" --signature "2TujBZfer8r5QM639Yb8coD9xH6f5eXzjAT5dD7wMom9fH8D1u36d7UpPdVaaZrWsCynmYpobwMWqiMKr5kM6CprD"
204205
```
205206

206-
### Bond a gateway
207-
Bonding a mix node is a process that takes a few steps due to the need to sign a transaction with your nym address for replay attack protection.
207+
### Bond a gateway
208+
Bonding a mix node is a process that takes a few steps due to the need to sign a transaction with your nym address for replay attack protection.
208209

209-
* generate a signature payload:
210+
* generate a signature payload:
210211
```
211-
./nym-cli mixnet operators gateway create-gateway-bonding-sign-payload
212+
./nym-cli mixnet operators gateway create-gateway-bonding-sign-payload
212213
213-
# returns something like
214+
# returns something like
214215
97GEhgMrPTmQVZgHqJeqWmgQ154GLKqy8xNGtLkV8xy5xc1SuwsEnqjhtZVshBYK74n53fFkKbSrS6kxkBE3vUikbU76JZmLMFmfR7aaU2NdBnfTPPHP2nwb2hJiEueq4SvvtDtQckxv7ZJzdxyXHxUeDPhzbprxTff78U3NGNk4cg6Q2K4EFqishdaqToedsXAPvVCWNbC1iWVjEq8nJ95Eb3NJyi3KmXcNDy4i8ZXgZHu4v8F4htXq2vZUdBSbizdkNr1NRvEg6PGVQdTseyuN8JxD3yuvrqprPY2kvJaT2YiYLPgWxoQtbfwcpkX4PP1PvwuMg4W8EXhitMpM2WHqLDP5vgfDGxdDCmRS44pM8ya4hcQ4g3McHWxduGWdbCzNNEsX6oQw4LVFcWn4mhbXSgqHwNQMm2TQW6LatYZSwCczdhEwV2CXe36UGCUzozmm4nj9qfUtXqDzMrHAAS8kjbKaVNaVaRRKgauQrHnK7QGg1QpVnnaxCs14wvUb62sio8XZmMzP2SjVaRJFCyJB3UwZ6L4oXMGMXSRsiKe8ZNTaa6iX69tx54CAAHBHoiReiq7E5T2VuR5v
215216
```
216217

217-
* sign this payload:
218+
* sign this payload:
218219
```
219220
./nym-gateway sign --id upgrade_test --contract-msg 97GEhgMrPTmQVZgHqJeqWmgQ154GLKqy8xNGtLkV8xy5xc1SuwsEnqjhtZVshBYK74n53fFkKbSrS6kxkBE3vUikbU76JZmLMFmfR7aaU2NdBnfTPPHP2nwb2hJiEueq4SvvtDtQckxv7ZJzdxyXHxUeDPhzbprxTff78U3NGNk4cg6Q2K4EFqishdaqToedsXAPvVCWNbC1iWVjEq8nJ95Eb3NJyi3KmXcNDy4i8ZXgZHu4v8F4htXq2vZUdBSbizdkNr1NRvEg6PGVQdTseyuN8JxD3yuvrqprPY2kvJaT2YiYLPgWxoQtbfwcpkX4PP1PvwuMg4W8EXhitMpM2WHqLDP5vgfDGxdDCmRS44pM8ya4hcQ4g3McHWxduGWdbCzNNEsX6oQw4LVFcWn4mhbXSgqHwNQMm2TQW6LatYZSwCczdhEwV2CXe36UGCUzozmm4nj9qfUtXqDzMrHAAS8kjbKaVNaVaRRKgauQrHnK7QGg1QpVnnaxCs14wvUb62sio8XZmMzP2SjVaRJFCyJB3UwZ6L4oXMGMXSRsiKe8ZNTaa6iX69tx54CAAHBHoiReiq7E5T2VuR5v
220221
```
221222

222-
* bond the node using this signature:
223+
* bond the node using this signature:
223224
```
224225
./nym-cli --mnemonic <mnemonic> mixnet operators gateway bond --amount 100000000 --mix-port 1789 --version "1.1.13" --host "85.163.111.99" --identity-key "B6pWscxYb8sPAdKTci8zPy5AgMzn5Zx8KpWwQNCyUSU7" --location "nym-town" --sphinx-key "o6MmKHzRewpNzVwaV37ZX9G3BfK4AmfYvsQfyoyAFRk" --signature "2TujBZfer8r5QM639Yb8coD9xH6f5eXzjAT5dD7wMom9fH8D1u36d7UpPdVaaZrWsCynmYpobwMWqiMKr5kM6CprD"
225226
```
226227

227228
### Unbond a node
228229

229-
Unbond a mix node or gateway.
230+
Unbond a mix node or gateway.
230231
```
231232
./nym-cli mixnet operators gateway unbound --mnemonic <mnemonic>
232233
```
@@ -235,7 +236,7 @@ Unbond a mix node or gateway.
235236
236237
### Upgrade a mix node
237238

238-
Upgrade your node config.
239+
Upgrade your node config.
239240
```
240241
./nym-cli mixnet operators mixnode settings update-config --version <new_version>
241242
```
@@ -298,7 +299,7 @@ Sign a message.
298299

299300
Verify a signature.
300301
```
301-
./nym-cli signature verify --mnemonic <mnemonic> <PUBLIC_KEY_OR_ADDRESS> <SIGNATURE_AS_HEX> <MESSAGE>
302+
./nym-cli signature verify --mnemonic <mnemonic> <PUBLIC_KEY_OR_ADDRESS> <SIGNATURE_AS_HEX> <MESSAGE>
302303
```
303304

304305
### Create a Vesting Schedule
@@ -336,12 +337,3 @@ Query for staking on behlaf of someone else
336337
```
337338
./nym-cli --mnemonic <staking address mnemonic> mixnet delegators delegate --mix-id <input> --identity-key <input> --amount <input>
338339
```
339-
340-
341-
342-
343-
344-
345-
346-
347-

0 commit comments

Comments
 (0)