Browse Source

Merge pull request #2476 from tendermint/master

Master back to develop
pull/2387/merge
Ethan Buchman 6 years ago
committed by GitHub
parent
commit
d0f6864c69
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
  1. +2
    -2
      docs/introduction/install.md
  2. +2
    -2
      docs/spec/abci/apps.md
  3. +1
    -1
      docs/tendermint-core/running-in-production.md

+ 2
- 2
docs/introduction/install.md View File

@ -95,9 +95,9 @@ wget https://github.com/google/leveldb/archive/v1.20.tar.gz && \
tar -zxvf v1.20.tar.gz && \ tar -zxvf v1.20.tar.gz && \
cd leveldb-1.20/ && \ cd leveldb-1.20/ && \
make && \ make && \
sudo scp -r out-static/lib* out-shared/lib* /usr/local/lib/ && \
cp -r out-static/lib* out-shared/lib* /usr/local/lib/ && \
cd include/ && \ cd include/ && \
sudo scp -r leveldb /usr/local/include/ && \
cp -r leveldb /usr/local/include/ && \
sudo ldconfig && \ sudo ldconfig && \
rm -f v1.20.tar.gz rm -f v1.20.tar.gz
``` ```


+ 2
- 2
docs/spec/abci/apps.md View File

@ -95,7 +95,7 @@ The `Data` field must be strictly deterministic, but can be arbitrary data.
### Gas ### Gas
Ethereum introduced the notion of `gas` as an absract representation of the
Ethereum introduced the notion of `gas` as an abstract representation of the
cost of resources used by nodes when processing transactions. Every operation in the cost of resources used by nodes when processing transactions. Every operation in the
Ethereum Virtual Machine uses some amount of gas, and gas can be accepted at a market-variable price. Ethereum Virtual Machine uses some amount of gas, and gas can be accepted at a market-variable price.
Users propose a maximum amount of gas for their transaction; if the tx uses less, they get Users propose a maximum amount of gas for their transaction; if the tx uses less, they get
@ -123,7 +123,7 @@ Note that Tendermint does not currently enforce anything about Gas in the consen
This means it does not guarantee that committed blocks satisfy these rules! This means it does not guarantee that committed blocks satisfy these rules!
It is the application's responsibility to return non-zero response codes when gas limits are exceeded. It is the application's responsibility to return non-zero response codes when gas limits are exceeded.
The `GasUsed` field is ignored compltely by Tendermint. That said, applications should enforce:
The `GasUsed` field is ignored completely by Tendermint. That said, applications should enforce:
- `GasUsed <= GasWanted` for any given transaction - `GasUsed <= GasWanted` for any given transaction
- `(sum of GasUsed in a block) <= MaxGas` for every block - `(sum of GasUsed in a block) <= MaxGas` for every block


+ 1
- 1
docs/tendermint-core/running-in-production.md View File

@ -5,7 +5,7 @@
By default, Tendermint uses the `syndtr/goleveldb` package for it's in-process By default, Tendermint uses the `syndtr/goleveldb` package for it's in-process
key-value database. Unfortunately, this implementation of LevelDB seems to suffer under heavy load (see key-value database. Unfortunately, this implementation of LevelDB seems to suffer under heavy load (see
[#226](https://github.com/syndtr/goleveldb/issues/226)). It may be best to [#226](https://github.com/syndtr/goleveldb/issues/226)). It may be best to
install the real C-implementaiton of LevelDB and compile Tendermint to use
install the real C-implementation of LevelDB and compile Tendermint to use
that using `make build_c`. See the [install instructions](../introduction/install.md) for details. that using `make build_c`. See the [install instructions](../introduction/install.md) for details.
Tendermint keeps multiple distinct LevelDB databases in the `$TMROOT/data`: Tendermint keeps multiple distinct LevelDB databases in the `$TMROOT/data`:


Loading…
Cancel
Save