mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Static Analysis: fix blockBlockhash, warn on modifiers

Browse Source
pull/1/head
Michael Fröwis 8 years ago committed by chriseth
parent 44327da285
commit eb84b083b1
5 changed files with 104 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      src/app/staticanalysis/modules/checksEffectsInteraction.js
  2. 12
      src/app/staticanalysis/modules/constantFunctions.js
  3. 19
      src/app/staticanalysis/modules/staticAnalysisCommon.js
  4. 85
      test/staticanalysis/staticAnalysisCommon-test.js
  5. 2
      test/staticanalysis/staticAnalysisIntegration-test.js

12
src/app/staticanalysis/modules/checksEffectsInteraction.js
Unescape View File

@ -7,19 +7,19 @@ var AbstractAst = require('./abstractAstView')
function checksEffectsInteraction () {
this.contracts = []
}
checksEffectsInteraction.prototype.visit = new AbstractAst().builder(
(node) => common.isInteraction(node) || common.isEffect(node) || common.isLocalCall(node),
this.contracts
)
checksEffectsInteraction.prototype.visit = new AbstractAst().builder(
(node) => common.isInteraction(node) || common.isEffect(node) || (common.isLocalCall(node) && !common.isBuiltinFunctionCall(node)),
this.contracts
)
}
checksEffectsInteraction.prototype.report = function (compilationResults) {
var warnings = []
var cg = callGraph.buildGlobalFuncCallGraph(this.contracts)
if (this.contracts.some((item) => item.modifiers.length > 0)) this.warning.push({ warning: `Modifiers are currently not supported by this analysis.` })
if (this.contracts.some((item) => item.modifiers.length > 0)) warnings.push({ warning: `Modifiers are currently not supported by the '${name}' static analysis.` })
this.contracts.forEach((contract) => {
contract.functions.forEach((func) => {

12
src/app/staticanalysis/modules/constantFunctions.js
Unescape View File

@ -7,19 +7,19 @@ var AbstractAst = require('./abstractAstView')
function constantFunctions () {
this.contracts = []
}
constantFunctions.prototype.visit = new AbstractAst().builder(
(node) => common.isLowLevelCall(node) || common.isExternalDirectCall(node) || common.isEffect(node) || common.isLocalCall(node) || common.isInlineAssembly(node),
this.contracts
)
constantFunctions.prototype.visit = new AbstractAst().builder(
(node) => common.isLowLevelCall(node) || common.isExternalDirectCall(node) || common.isEffect(node) || (common.isLocalCall(node) && !common.isBuiltinFunctionCall(node)) || common.isInlineAssembly(node),
this.contracts
)
}
constantFunctions.prototype.report = function (compilationResults) {
var warnings = []
var cg = callGraph.buildGlobalFuncCallGraph(this.contracts)
if (this.contracts.some((item) => item.modifiers.length > 0)) this.warning.push({ warning: `Modifiers are currently not supported by this analysis.` })
if (this.contracts.some((item) => item.modifiers.length > 0)) warnings.push({ warning: `Modifiers are currently not supported by the '${name}' static analysis.` })
this.contracts.forEach((contract) => {
if (!common.isFullyImplementedContract(contract.node)) return

19
src/app/staticanalysis/modules/staticAnalysisCommon.js
Unescape View File

@ -41,6 +41,17 @@ var basicFunctionTypes = {
DELEGATECALL: buildFunctionSignature([], [basicTypes.BOOL], false)
}
var builtinFunctions = {
'keccak256()': true,
'sha3()': true,
'sha256()': true,
'ripemd160()': true,
'ecrecover(bytes32,uint8,bytes32,bytes32)': true,
'addmod(uint256,uint256,uint256)': true,
'mulmod(uint256,uint256,uint256)': true,
'selfdestruct(address)': true
}
var lowLevelCallTypes = {
CALL: { ident: 'call', type: basicFunctionTypes.CALL },
CALLCODE: { ident: 'callcode', type: basicFunctionTypes.CALL },
@ -182,6 +193,10 @@ function isInlineAssembly (node) {
// #################### Complex Node Identification
function isBuiltinFunctionCall (node) {
return isLocalCall(node) && builtinFunctions[getLocalCallName(node) + '(' + getFunctionCallTypeParameterType(node) + ')'] === true
}
function isStorageVariableDeclaration (node) {
return isVariableDeclaration(node) && expressionType(node, basicRegex.REFTYPE)
}
@ -297,7 +312,7 @@ function isMemberAccess (node, retType, accessor, accessorType, memberName) {
}
function isSpecialVariableAccess (node, varType) {
return isMemberAccess(node, varType.type, varType.obj, varType.obj, varType.member)
return isMemberAccess(node, exactMatch(utils.escapeRegExp(varType.type)), varType.obj, varType.obj, varType.member)
}
// #################### Node Identification Primitives
@ -340,7 +355,6 @@ function exactMatch (regexStr) {
* @param {Array} returnTypes
* list of return type names
* @return {Boolean} isPayable
* CAUTION: only needed in low level call signature or message-calls (other contracts, this.)
*/
function buildFunctionSignature (paramTypes, returnTypes, isPayable) {
return 'function (' + utils.concatWithSeperator(paramTypes, ',') + ')' + ((isPayable) ? ' payable' : '') + ((returnTypes.length) ? ' returns (' + utils.concatWithSeperator(returnTypes, ',') + ')' : '')
@ -400,6 +414,7 @@ module.exports = {
isCallToNonConstLocalFunction: isCallToNonConstLocalFunction,
isPlusPlusUnaryOperation: isPlusPlusUnaryOperation,
isMinusMinusUnaryOperation: isMinusMinusUnaryOperation,
isBuiltinFunctionCall: isBuiltinFunctionCall,
// #################### Trivial Node Identification
isFunctionDefinition: isFunctionDefinition,

85
test/staticanalysis/staticAnalysisCommon-test.js
Unescape View File

@ -1066,6 +1066,59 @@ test('staticAnalysisCommon.isInlineAssembly', function (t) {
// #################### Complex Node Identification
test('staticAnalysisCommon.isBuiltinFunctionCall', function (t) {
t.plan(2)
var selfdestruct = {
'attributes': {
'type': 'tuple()',
'type_conversion': false
},
'children': [
{
'attributes': {
'type': 'function (address)',
'value': 'selfdestruct'
},
'name': 'Identifier'
},
{
'attributes': {
'type': 'address',
'value': 'a'
},
'name': 'Identifier'
}
],
'name': 'FunctionCall'
}
var localCall = {
'attributes': {
'type': 'tuple()',
'type_conversion': false
},
'children': [
{
'attributes': {
'type': 'function (struct Ballot.Voter storage pointer)',
'value': 'bli'
},
'name': 'Identifier'
},
{
'attributes': {
'type': 'struct Ballot.Voter storage pointer',
'value': 'x'
},
'name': 'Identifier'
}
],
'name': 'FunctionCall'
}
t.ok(common.isBuiltinFunctionCall(selfdestruct), 'selfdestruct is builtin')
t.notOk(common.isBuiltinFunctionCall(localCall), 'local call is not builtin')
})
test('staticAnalysisCommon.isStorageVariableDeclaration', function (t) {
t.plan(3)
var node1 = {
@ -1522,23 +1575,17 @@ test('staticAnalysisCommon.isCallToNonConstLocalFunction', function (t) {
'type': 'function (struct Ballot.Voter storage pointer)',
'value': 'bli'
},
'id': 37,
'name': 'Identifier',
'src': '540:3:0'
'name': 'Identifier'
},
{
'attributes': {
'type': 'struct Ballot.Voter storage pointer',
'value': 'x'
},
'id': 38,
'name': 'Identifier',
'src': '544:1:0'
'name': 'Identifier'
}
],
'id': 39,
'name': 'FunctionCall',
'src': '540:6:0'
'name': 'FunctionCall'
}
t.ok(common.isCallToNonConstLocalFunction(node1), 'should be call to non const Local func')
@ -1595,10 +1642,26 @@ test('staticAnalysisCommon.isBlockTimestampAccess', function (t) {
test('staticAnalysisCommon.isBlockBlockhashAccess', function (t) {
t.plan(4)
var node = { name: 'MemberAccess', children: [{attributes: { value: 'block', type: 'block' }}], attributes: { value: 'blockhash', type: 'bytes32' } }
var node = {
'attributes': {
'member_name': 'blockhash',
'type': 'function (uint256) returns (bytes32)'
},
'children': [
{
'attributes': {
'type': 'block',
'value': 'block'
},
'name': 'Identifier'
}
],
'name': 'MemberAccess'
}
t.notOk(common.isThisLocalCall(node), 'is this.local_method() used should not work')
t.notOk(common.isBlockTimestampAccess(node), 'is block.timestamp used should not work')
t.ok(common.isBlockBlockHashAccess(node), 'blockhash should work')
t.ok(common.isBlockBlockHashAccess(node), 'blockhash should work') // todo:
t.notOk(common.isNowAccess(node), 'is now used should not work')
})

2
test/staticanalysis/staticAnalysisIntegration-test.js
Unescape View File

@ -1,6 +1,6 @@
var test = require('tape')
var StatRunner = require('../../babelify-src/app/staticanalysis/staticAnalysisRunner')
var StatRunner = require('../../src/app/staticanalysis/staticAnalysisRunner')
// const util = require('util')
var solc = require('solc')

Write Preview
Loading…
Cancel
Save