diff options
| author | chriseth <chris@ethereum.org> | 2018-10-10 21:30:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 21:30:32 +0800 |
| commit | d2157ae5e93f02b9fde466420b814e760b53f9a8 (patch) | |
| tree | 63f7dffdd9a746592bc3417cb43a6ef04bf4e088 /docs | |
| parent | c6048b68430d3c68c8abc987590fbc91d3ffa23f (diff) | |
| parent | 3bbb1ee2c062d72feffd969b2d1850023f73b67f (diff) | |
| download | dexon-solidity-d2157ae5e93f02b9fde466420b814e760b53f9a8.tar.gz dexon-solidity-d2157ae5e93f02b9fde466420b814e760b53f9a8.tar.zst dexon-solidity-d2157ae5e93f02b9fde466420b814e760b53f9a8.zip | |
Merge pull request #5183 from ethereum/fixCreate2
Fix create2
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assembly.rst | 10 | ||||
| -rw-r--r-- | docs/yul.rst | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/docs/assembly.rst b/docs/assembly.rst index 20fb0cd5..5bb9825a 100644 --- a/docs/assembly.rst +++ b/docs/assembly.rst @@ -282,14 +282,14 @@ In the grammar, opcodes are represented as pre-defined identifiers. +-------------------------+-----+---+-----------------------------------------------------------------+ | extcodehash(a) | | C | code hash of address a | +-------------------------+-----+---+-----------------------------------------------------------------+ -| create(v, p, s) | | F | create new contract with code mem[p...(p+s)) and send v wei | +| create(v, p, n) | | F | create new contract with code mem[p...(p+n)) and send v wei | | | | | and return the new address | +-------------------------+-----+---+-----------------------------------------------------------------+ -| create2(v, n, p, s) | | C | create new contract with code mem[p...(p+s)) at address | -| | | | keccak256(0xff . self . n . keccak256(mem[p...(p+s))) | +| create2(v, p, n, s) | | C | create new contract with code mem[p...(p+n)) at address | +| | | | keccak256(0xff . this . s . keccak256(mem[p...(p+n))) | | | | | and send v wei and return the new address, where ``0xff`` is a | -| | | | 8 byte value, ``self`` is the current contract's address | -| | | | as a 20 byte value and ``n`` is a big-endian 256-bit value | +| | | | 8 byte value, ``this`` is the current contract's address | +| | | | as a 20 byte value and ``s`` is a big-endian 256-bit value | +-------------------------+-----+---+-----------------------------------------------------------------+ | call(g, a, v, in, | | F | call contract at address a with input mem[in...(in+insize)) | | insize, out, outsize) | | | providing g gas and v wei and output area | diff --git a/docs/yul.rst b/docs/yul.rst index cfeec4db..a55445f3 100644 --- a/docs/yul.rst +++ b/docs/yul.rst @@ -415,14 +415,14 @@ The following functions must be available: +---------------------------------------------+-----------------------------------------------------------------+ | *Execution control* | +---------------------------------------------+-----------------------------------------------------------------+ -| create(v:u256, p:u256, s:u256) | create new contract with code mem[p..(p+s)) and send v wei | +| create(v:u256, p:u256, n:u256) | create new contract with code mem[p..(p+n)) and send v wei | | | and return the new address | +---------------------------------------------+-----------------------------------------------------------------+ -| create2(v:u256, n:u256, p:u256, s:u256) | create new contract with code mem[p...(p+s)) at address | -| | keccak256(0xff . self . n . keccak256(mem[p...(p+s))) | +| create2(v:u256, p:u256, n:u256, s:u256) | create new contract with code mem[p...(p+n)) at address | +| | keccak256(0xff . this . s . keccak256(mem[p...(p+n))) | | | and send v wei and return the new address, where ``0xff`` is a | -| | 8 byte value, ``self`` is the current contract's address | -| | as a 20 byte value and ``n`` is a big-endian 256-bit value | +| | 8 byte value, ``this`` is the current contract's address | +| | as a 20 byte value and ``s`` is a big-endian 256-bit value | +---------------------------------------------+-----------------------------------------------------------------+ | call(g:u256, a:u256, v:u256, in:u256, | call contract at address a with input mem[in..(in+insize)) | | insize:u256, out:u256, | providing g gas and v wei and output area | |