cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5183 from ethereum/fixCreate2

Browse Source 
Fix create2
This commit is contained in:
chriseth 2018-10-10 15:30:32 +02:00 committed by GitHub
commit d2157ae5e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/assembly.rst
View File

@ -282,14 +282,14 @@ In the grammar, opcodes are represented as pre-defined identifiers.
+-------------------------+-----+---+-----------------------------------------------------------------+ +-------------------------+-----+---+-----------------------------------------------------------------+
| extcodehash(a) | | C | code hash of address a | | 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 | | | | | and return the new address |
+-------------------------+-----+---+-----------------------------------------------------------------+ +-------------------------+-----+---+-----------------------------------------------------------------+
| create2(v, n, p, s) | | C | create new contract with code mem[p...(p+s)) at address | | create2(v, p, n, s) | | C | create new contract with code mem[p...(p+n)) at address |
| | | | keccak256(0xff . self . n . keccak256(mem[p...(p+s))) | | | | | keccak256(0xff . this . s . keccak256(mem[p...(p+n))) |
| | | | and send v wei and return the new address, where ``0xff`` is a | | | | | and send v wei and return the new address, where ``0xff`` is a |
| | | | 8 byte value, ``self`` is the current contract's address | | | | | 8 byte value, ``this`` is the current contract's address |
| | | | as a 20 byte value and ``n`` is a big-endian 256-bit value | | | | | 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)) | | 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 | | insize, out, outsize) | | | providing g gas and v wei and output area |

10
docs/yul.rst
View File

@ -415,14 +415,14 @@ The following functions must be available:
+---------------------------------------------+-----------------------------------------------------------------+ +---------------------------------------------+-----------------------------------------------------------------+
| *Execution control* | | *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 | | | 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 | | create2(v:u256, p:u256, n:u256, s:u256) | create new contract with code mem[p...(p+n)) at address |
| | keccak256(0xff . self . n . keccak256(mem[p...(p+s))) | | | keccak256(0xff . this . s . keccak256(mem[p...(p+n))) |
| | and send v wei and return the new address, where ``0xff`` is a | | | and send v wei and return the new address, where ``0xff`` is a |
| | 8 byte value, ``self`` is the current contract's address | | | 8 byte value, ``this`` is the current contract's address |
| | as a 20 byte value and ``n`` is a big-endian 256-bit value | | | 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)) | | 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 | | insize:u256, out:u256, | providing g gas and v wei and output area |