diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py index cd5ee7491..4f231d2d1 100755 --- a/scripts/bytecodecompare/prepare_report.py +++ b/scripts/bytecodecompare/prepare_report.py @@ -8,13 +8,10 @@ import json SOLC_BIN = sys.argv[1] REPORT_FILE = open("report.txt", mode="w", encoding='utf8', newline='\n') -def removeSMT(source): - return source.replace('pragma experimental SMTChecker;', '') - for optimize in [False, True]: for f in sorted(glob.glob("*.sol")): sources = {} - sources[f] = {'content': removeSMT(open(f, mode='r', encoding='utf8').read())} + sources[f] = {'content': open(f, mode='r', encoding='utf8').read()} input_json = { 'language': 'Solidity', 'sources': sources, @@ -23,6 +20,9 @@ for optimize in [False, True]: 'enabled': optimize }, 'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}} + }, + 'modelCheckerSettings': { + "engine": 'none' } } args = [SOLC_BIN, '--standard-json'] diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh index 13e320960..9bfce7c29 100755 --- a/scripts/bytecodecompare/storebytecode.sh +++ b/scripts/bytecodecompare/storebytecode.sh @@ -57,11 +57,6 @@ var fs = require('fs') var compiler = require('./solc-js/wrapper.js')(require('./solc-js/soljson.js')) -function removeSMT(source) -{ - return source.replace('pragma experimental SMTChecker;', ''); -} - for (var optimize of [false, true]) { for (var filename of process.argv.slice(2)) @@ -69,13 +64,16 @@ for (var optimize of [false, true]) if (filename !== undefined) { var inputs = {} - inputs[filename] = { content: removeSMT(fs.readFileSync(filename).toString()) } + inputs[filename] = { content: fs.readFileSync(filename).toString() } var input = { language: 'Solidity', sources: inputs, settings: { optimizer: { enabled: optimize }, outputSelection: { '*': { '*': ['evm.bytecode.object', 'metadata'] } } + }, + "modelCheckerSettings": { + "engine": "none" } } var result = JSON.parse(compiler.compile(JSON.stringify(input)))