aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDenton Liu <liu.denton+github@gmail.com>2016-05-25 22:37:30 +0800
committerDenton Liu <liu.denton+github@gmail.com>2016-05-31 01:18:30 +0800
commite72f819111a71ee53dcabec1bfead34fb0b9d349 (patch)
treefef54424be13c8e830c112cb931b0e421062197b /docs
parent0c03577adeb4a396d2e56c4f65d7fd4506baad7e (diff)
downloaddexon-solidity-e72f819111a71ee53dcabec1bfead34fb0b9d349.tar
dexon-solidity-e72f819111a71ee53dcabec1bfead34fb0b9d349.tar.gz
dexon-solidity-e72f819111a71ee53dcabec1bfead34fb0b9d349.tar.bz2
dexon-solidity-e72f819111a71ee53dcabec1bfead34fb0b9d349.tar.lz
dexon-solidity-e72f819111a71ee53dcabec1bfead34fb0b9d349.tar.xz
dexon-solidity-e72f819111a71ee53dcabec1bfead34fb0b9d349.tar.zst
dexon-solidity-e72f819111a71ee53dcabec1bfead34fb0b9d349.zip
Corrected descriptions of hashes
Diffstat (limited to 'docs')
-rw-r--r--docs/miscellaneous.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst
index f972532c..da35d9e1 100644
--- a/docs/miscellaneous.rst
+++ b/docs/miscellaneous.rst
@@ -171,9 +171,9 @@ Global Variables
- ``now`` (``uint``): current block timestamp (alias for ``block.timestamp``)
- ``tx.gasprice`` (``uint``): gas price of the transaction
- ``tx.origin`` (``address``): sender of the transaction (full call chain)
-- ``sha3(...) returns (bytes32)``: compute the Ethereum-SHA3 (KECCAK-256) hash of the (tightly packed) arguments
-- ``sha256(...) returns (bytes32)``: compute the SHA256 hash of the (tightly packed) arguments
-- ``ripemd160(...) returns (bytes20)``: compute RIPEMD of 256 the (tightly packed) arguments
+- ``sha3(...) returns (bytes32)``: compute the Ethereum-SHA-3 (KECCAK-256) hash of the (tightly packed) arguments
+- ``sha256(...) returns (bytes32)``: compute the SHA-256 hash of the (tightly packed) arguments
+- ``ripemd160(...) returns (bytes20)``: compute the RIPEMD-160 hash of the (tightly packed) arguments
- ``ecrecover(bytes32, uint8, bytes32, bytes32) returns (address)``: recover address associated with the public key from elliptic curve signature
- ``addmod(uint x, uint y, uint k) returns (uint)``: compute ``(x + y) % k`` where the addition is performed with arbitrary precision and does not wrap around at ``2**256``
- ``mulmod(uint x, uint y, uint k) returns (uint)``: compute ``(x * y) % k`` where the multiplication is performed with arbitrary precision and does not wrap around at ``2**256``