diff options
| author | Denton Liu <liu.denton+github@gmail.com> | 2016-05-25 22:27:46 +0800 |
|---|---|---|
| committer | Denton Liu <liu.denton+github@gmail.com> | 2016-05-31 01:18:29 +0800 |
| commit | aafc65a2750fa1fc7ebb27a87d6024571e526318 (patch) | |
| tree | e01308b3ee733bb0bbe16a5a386ad148844222b4 | |
| parent | 2667874587b831fce36fc12b60a6b6588dfc463b (diff) | |
| download | dexon-solidity-aafc65a2750fa1fc7ebb27a87d6024571e526318.tar dexon-solidity-aafc65a2750fa1fc7ebb27a87d6024571e526318.tar.gz dexon-solidity-aafc65a2750fa1fc7ebb27a87d6024571e526318.tar.bz2 dexon-solidity-aafc65a2750fa1fc7ebb27a87d6024571e526318.tar.lz dexon-solidity-aafc65a2750fa1fc7ebb27a87d6024571e526318.tar.xz dexon-solidity-aafc65a2750fa1fc7ebb27a87d6024571e526318.tar.zst dexon-solidity-aafc65a2750fa1fc7ebb27a87d6024571e526318.zip | |
Made explicit that we use KECCAK-256
| -rw-r--r-- | docs/miscellaneous.rst | 2 | ||||
| -rw-r--r-- | docs/units-and-global-variables.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst index 01a7a04c..f972532c 100644 --- a/docs/miscellaneous.rst +++ b/docs/miscellaneous.rst @@ -171,7 +171,7 @@ 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 hash of the (tightly packed) arguments +- ``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 - ``ecrecover(bytes32, uint8, bytes32, bytes32) returns (address)``: recover address associated with the public key from elliptic curve signature diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst index 40cf7dac..8b6ffda7 100644 --- a/docs/units-and-global-variables.rst +++ b/docs/units-and-global-variables.rst @@ -89,7 +89,7 @@ Mathematical and Cryptographic Functions ``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``. ``sha3(...) returns (bytes32)``: - compute the Ethereum-SHA-3 hash of the (tightly packed) arguments + 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)``: |