Metro-Byzantium Working Branch #161
+593
−185
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -298,6 +298,22 @@ module.exports = { | |
| cb(null) | ||
| }) | ||
| }, | ||
| RETURNDATASIZE: function (runState) { | ||
| return utils.intToBuffer(runState.lastReturned.length) | ||
| }, | ||
| RETURNDATACOPY: function (memOffset, returnDataOffset, length, runState) { | ||
| memOffset = utils.bufferToInt(memOffset) | ||
| returnDataOffset = utils.bufferToInt(returnDataOffset) | ||
| length = utils.bufferToInt(length) | ||
|
|
||
| if (returnDataOffset + length > runState.lastReturned.length) { | ||
| trap(ERROR.OUT_OF_GAS) | ||
|
There was a problem hiding this comment. I think There was a problem hiding this comment. @gasolin I just took this from the EIP specification, there There was a problem hiding this comment.
There was a problem hiding this comment. all EVM exceptions have the same behavior (state changes are reverted and remaining gas is consumed). The error message only determines what gets printed in the EVM trace log, though it would be good to standardize that. There was a problem hiding this comment. @cdetrio Makes a lot of sense |
||
| } | ||
|
|
||
| memStore(runState, memOffset, utils.toBuffer(runState.lastReturned), returnDataOffset, length, false) | ||
| // sub the COPY fee | ||
| subGas(runState, new BN(fees.copyGas.v).imuln(Math.ceil(length / 32))) | ||
| }, | ||
| GASPRICE: function (runState) { | ||
| return utils.setLengthLeft(runState.gasPrice, 32) | ||
| }, | ||
|
|
@@ -361,6 +377,9 @@ module.exports = { | |
| }) | ||
| }, | ||
| SSTORE: function (key, val, runState, cb) { | ||
| if (runState.static) { | ||
| trap(ERROR.STATIC_STATE_CHANGE) | ||
| } | ||
| var stateManager = runState.stateManager | ||
| var address = runState.address | ||
| key = utils.setLengthLeft(key, 32) | ||
|
|
@@ -465,6 +484,10 @@ module.exports = { | |
| LOG: function (memOffset, memLength) { | ||
| var args = Array.prototype.slice.call(arguments, 0) | ||
| var runState = args.pop() | ||
| if (runState.static) { | ||
| trap(ERROR.STATIC_STATE_CHANGE) | ||
| } | ||
|
|
||
| var topics = args.slice(2) | ||
| topics = topics.map(function (a) { | ||
| return utils.setLengthLeft(a, 32) | ||
|
|
@@ -487,6 +510,10 @@ module.exports = { | |
|
|
||
| // '0xf0' range - closures | ||
| CREATE: function (value, offset, length, runState, done) { | ||
| if (runState.static) { | ||
| trap(ERROR.STATIC_STATE_CHANGE) | ||
| } | ||
|
|
||
| value = new BN(value) | ||
| offset = utils.bufferToInt(offset) | ||
| length = utils.bufferToInt(length) | ||
|
|
@@ -519,13 +546,18 @@ module.exports = { | |
| outOffset = utils.bufferToInt(outOffset) | ||
| outLength = utils.bufferToInt(outLength) | ||
|
|
||
| if (runState.static && !value.isZero()) { | ||
| trap(ERROR.STATIC_STATE_CHANGE) | ||
| } | ||
|
|
||
| var data = memLoad(runState, inOffset, inLength) | ||
|
|
||
| var options = { | ||
| gasLimit: gasLimit, | ||
| value: value, | ||
| to: toAddress, | ||
| data: data, | ||
| static: runState.static | ||
| } | ||
|
|
||
| var localOpts = { | ||
|
|
@@ -595,7 +627,8 @@ module.exports = { | |
| gasLimit: gas, | ||
| value: value, | ||
| data: data, | ||
| to: runState.address, | ||
| static: runState.static | ||
| } | ||
|
|
||
| const localOpts = { | ||
|
|
@@ -620,7 +653,7 @@ module.exports = { | |
| // load the code | ||
| stateManager.getAccount(toAddress, function (err, account) { | ||
| if (err) return done(err) | ||
| if (runState._precompiled[toAddress.toString('hex')]) { | ||
| options.compiled = true | ||
| options.code = runState._precompiled[toAddress.toString('hex')] | ||
| makeCall(runState, options, localOpts, done) | ||
|
|
@@ -652,7 +685,8 @@ module.exports = { | |
| data: data, | ||
| to: runState.address, | ||
| caller: runState.caller, | ||
| delegatecall: true, | ||
| static: runState.static | ||
| } | ||
|
|
||
| const localOpts = { | ||
|
|
@@ -668,7 +702,7 @@ module.exports = { | |
| // load the code | ||
| stateManager.getAccount(toAddress, function (err, account) { | ||
| if (err) return done(err) | ||
| if (runState._precompiled[toAddress.toString('hex')]) { | ||
| options.compiled = true | ||
| options.code = runState._precompiled[toAddress.toString('hex')] | ||
| makeCall(runState, options, localOpts, done) | ||
|
|
@@ -682,13 +716,75 @@ module.exports = { | |
| } | ||
| }) | ||
| }, | ||
| STATICCALL: function (gasLimit, toAddress, inOffset, inLength, outOffset, outLength, runState, done) { | ||
| var stateManager = runState.stateManager | ||
| gasLimit = new BN(gasLimit) | ||
| toAddress = utils.setLengthLeft(toAddress, 20) | ||
| var value = new BN(0) | ||
| inOffset = utils.bufferToInt(inOffset) | ||
| inLength = utils.bufferToInt(inLength) | ||
| outOffset = utils.bufferToInt(outOffset) | ||
| outLength = utils.bufferToInt(outLength) | ||
|
|
||
| var data = memLoad(runState, inOffset, inLength) | ||
|
|
||
| var options = { | ||
| gasLimit: gasLimit, | ||
| value: value, | ||
| to: toAddress, | ||
| data: data, | ||
| static: true | ||
| } | ||
|
|
||
| var localOpts = { | ||
| inOffset: inOffset, | ||
| inLength: inLength, | ||
| outOffset: outOffset, | ||
| outLength: outLength | ||
| } | ||
|
|
||
| stateManager.exists(toAddress, function (err, exists) { | ||
| if (err) { | ||
| done(err) | ||
| return | ||
| } | ||
|
|
||
| stateManager.accountIsEmpty(toAddress, function (err, empty) { | ||
| if (err) { | ||
| done(err) | ||
| return | ||
| } | ||
|
|
||
| try { | ||
| checkCallMemCost(runState, options, localOpts) | ||
| checkOutOfGas(runState, options) | ||
| } catch (e) { | ||
| done(e.error) | ||
| return | ||
| } | ||
|
|
||
| makeCall(runState, options, localOpts, done) | ||
| }) | ||
| }) | ||
| }, | ||
| RETURN: function (offset, length, runState) { | ||
| offset = utils.bufferToInt(offset) | ||
| length = utils.bufferToInt(length) | ||
| runState.returnValue = memLoad(runState, offset, length) | ||
| }, | ||
| REVERT: function (offset, length, runState) { | ||
| offset = utils.bufferToInt(offset) | ||
| length = utils.bufferToInt(length) | ||
|
|
||
| runState.stopped = true | ||
| runState.returnValue = runState.lastReturned = memLoad(runState, offset, length) | ||
|
There was a problem hiding this comment. It is not necessary to set |
||
| trap(ERROR.REVERT) | ||
| }, | ||
| // '0x70', range - other | ||
| SELFDESTRUCT: function (selfdestructToAddress, runState, cb) { | ||
| if (runState.static) { | ||
| trap(ERROR.STATIC_STATE_CHANGE) | ||
| } | ||
| var stateManager = runState.stateManager | ||
| var contract = runState.contract | ||
| var contractAddress = runState.address | ||
|
|
@@ -870,11 +966,15 @@ function makeCall (runState, callOptions, localOpts, cb) { | |
| callOptions.gasPrice = runState.gasPrice | ||
| callOptions.block = runState.block | ||
| callOptions.populateCache = false | ||
| callOptions.static = callOptions.static || false | ||
| callOptions.selfdestruct = runState.selfdestruct | ||
|
|
||
| // increment the runState.depth | ||
| callOptions.depth = runState.depth + 1 | ||
|
|
||
| // empty the return data buffer | ||
| runState.lastReturned = new Buffer([]) | ||
|
|
||
| // check if account has enough ether | ||
| // Note: in the case of delegatecall, the value is persisted and doesn't need to be deducted again | ||
| if (runState.depth >= fees.stackLimit.v || (callOptions.delegatecall !== true && new BN(runState.contract.balance).lt(callOptions.value))) { | ||
|
|
@@ -906,12 +1006,25 @@ function makeCall (runState, callOptions, localOpts, cb) { | |
| // this should always be safe | ||
| runState.gasLeft.isub(results.gasUsed) | ||
|
|
||
| // save results to memory | ||
| if (results.vm.return && (!results.vm.exceptionError || results.vm.exceptionError === ERROR.REVERT)) { | ||
| memStore(runState, localOpts.outOffset, results.vm.return, 0, localOpts.outLength, false) | ||
|
|
||
| if (results.vm.exceptionError === ERROR.REVERT && runState.opName === 'CREATE') { | ||
| runState.lastReturned = results.vm.return | ||
| } | ||
|
|
||
| switch (runState.opName) { | ||
| case 'CALL': | ||
| case 'CALLCODE': | ||
| case 'DELEGATECALL': | ||
| case 'STATICCALL': | ||
| runState.lastReturned = results.vm.return | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if (!results.vm.exceptionError) { | ||
| // update stateRoot on current contract | ||
| runState.stateManager.getAccount(runState.address, function (err, account) { | ||
| if (err) return cb(err) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note, also
isPrecompiled()must be updated in ethereumjs-util.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note that we're still using ethereumjs-util v4.5, not the latest v5.0