Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Community contributions 2022-10-27 #4567

Merged
merged 3 commits into from
Nov 2, 2022
Merged

Community contributions 2022-10-27 #4567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cbcc4f
Fix variable name type
Jimbo4350 Oct 27, 2022
41cc00b
Update simple-scripts.md
Jimbo4350 Oct 27, 2022
255992e
Also install libnuma-dev and llvm packages
Jimbo4350 Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,8 @@ runTransactionCmd cmd =

TxSign txinfile skfiles network txoutfile ->
runTxSign txinfile skfiles network txoutfile
TxSubmit anyConensusModeParams network txFp ->
runTxSubmit anyConensusModeParams network txFp
TxSubmit anyConsensusModeParams network txFp ->
runTxSubmit anyConsensusModeParams network txFp
TxCalculateMinFee txbody mnw pGenesisOrParamsFile nInputs nOutputs
nShelleyKeyWitnesses nByronKeyWitnesses ->
runTxCalculateMinFee txbody mnw pGenesisOrParamsFile nInputs nOutputs
Expand Down
6 changes: 4 additions & 2 deletions doc/getting-started/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ To set up your platform, you will need:


| Network | CPU Cores | Free RAM | Free storage | OS for Pasive Node | OS for Stake pool |
| :---: | :---: | :---: | :---: | :---: | :---: |
| Mainnet | 2 | 16GB | 75GB of free storage (100GB recommended for future growth | Linux / Windows** / MacOS | Linux |
| :---: | :---: | :---: | :---: | :---: | :---: |
| Mainnet | 2 | 16GB | 75GB of free storage (100GB recommended for future growth | Linux / Windows** / MacOS | Linux |
| Testnet | 2 | 4GB | 20GB | Linux / Windows** / MacOS | Linux |

****Note** If you are building on Windows, we recommend using WSL2 under Windows 10 as this provides a development and execution environment that is very similar to Ubuntu.
Expand Down Expand Up @@ -45,6 +45,8 @@ sudo apt-get update -y
sudo apt-get install automake build-essential pkg-config libffi-dev libgmp-dev libssl-dev libtinfo-dev libsystemd-dev zlib1g-dev make g++ tmux git jq wget libncursesw5 libtool autoconf liblmdb-dev -y
```

Optional dependencies that may be required: llvm libnuma-dev

If you are using a different flavor of Linux, you will need to use the correct package manager for your platform instead of `yum` or `apt-get`, and the names of the packages you need to install might differ. On MacOSX, use the Homebrew (`brew`) installer.

#### Installing the Haskell environment
Expand Down
10 changes: 4 additions & 6 deletions doc/reference/simple-scripts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@ With this in mind, we can understand the interpretation of the new expressions:
+ RequireTimeBefore: has a slot number X.

This expression evaluates to `true` if (and only if) the upper bound of the
transaction validity interval is a slot number Y, and X <= Y.
transaction validity interval is a slot number Y, and Y < X.

This condition guarantees that the actual slot number in which the transaction
is included is (strictly) less than slot number X.

+ RequireTimeAfter: has a slot number X.

This expression evaluates to `true` if (and only if) the lower bound of the
transaction validity interval is a slot number Y, and Y <= X.
transaction validity interval is a slot number Y, and Y >= X.

This condition guarantees that the actual slot number in which the transaction
is included is greater than or equal to slot number X.
Expand Down Expand Up @@ -244,7 +244,7 @@ sub-expressions could be any script type, not just type "sig".

### Type "any"

This corresponds to the "RequireAllOf" expression above. It specifies the type
This corresponds to the "RequireAnyOf" expression above. It specifies the type
"any" and a list of scripts as the sub-expressions.

This example requires signatures from any of three keys, but remember that the
Expand Down Expand Up @@ -599,8 +599,7 @@ above this means >= 1000.

```bash
cardano-cli transaction build-raw \
--invalid-hereafter 1000 \
--invalid-before 1000\
--invalid-before 1000 \
--fee 0 \
--tx-in (txin of script address)
--tx-out yourspecifiedtxout \
Expand Down Expand Up @@ -634,7 +633,6 @@ above this means <= 3000:

```bash
cardano-cli transaction build-raw \
--invalid-hereafter 1000 \
--invalid-hereafter 3000\
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a space before backslash while we're here?

--fee 0 \
--tx-in (txin of script address)
Expand Down