From 5c3a80ab5bac2dd5faf19416a640990af3da0a31 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 22 Mar 2017 20:56:44 +0100
Subject: Also generate optimized code.

---
 scripts/bytecodecompare/prepare_report.py | 24 ++++++++++++++----------
 scripts/bytecodecompare/storebytecode.sh  | 29 ++++++++++++++++-------------
 2 files changed, 30 insertions(+), 23 deletions(-)

(limited to 'scripts/bytecodecompare')

diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index 68793927..5a770981 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -8,13 +8,17 @@ import json
 solc = sys.argv[1]
 report = open("report.txt", "w")
 
-for f in sorted(glob.glob("*.sol")):
-    proc = subprocess.Popen([solc, '--combined-json', 'bin,metadata', f], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    (out, err) = proc.communicate()
-    try:
-        result = json.loads(out.strip())
-        for contractName in sorted(result['contracts'].keys()):
-            report.write(contractName + ' ' + result['contracts'][contractName]['bin'] + '\n')
-            report.write(contractName + ' ' + result['contracts'][contractName]['metadata'] + '\n')
-    except:
-        report.write(f + ": ERROR\n")
+for optimize in [False, True]:
+    for f in sorted(glob.glob("*.sol")):
+        args = [solc, '--combined-json', 'bin,metadata', f]
+        if optimize:
+            args += ['--optimize']
+        proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        (out, err) = proc.communicate()
+        try:
+            result = json.loads(out.strip())
+            for contractName in sorted(result['contracts'].keys()):
+                report.write(contractName + ' ' + result['contracts'][contractName]['bin'] + '\n')
+                report.write(contractName + ' ' + result['contracts'][contractName]['metadata'] + '\n')
+        except:
+            report.write(f + ": ERROR\n")
diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 8a3953c3..cdf376a6 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -49,23 +49,26 @@ var fs = require('fs')
 
 var compiler = require('solc/wrapper.js')(require('./soljson.js'))
 
-for (var filename of process.argv.slice(2))
+for (var optimize of [false, true])
 {
-    if (filename !== undefined)
+    for (var filename of process.argv.slice(2))
     {
-        var inputs = {}
-        inputs[filename] = fs.readFileSync(filename).toString()
-        var result = compiler.compile({sources: inputs})
-        if (!('contracts' in result) || Object.keys(result['contracts']).length === 0)
+        if (filename !== undefined)
         {
-            console.log(filename + ': ERROR')
-        }
-        else
-        {
-            for (var contractName in result['contracts'])
+            var inputs = {}
+            inputs[filename] = fs.readFileSync(filename).toString()
+            var result = compiler.compile({sources: inputs}, optimize)
+            if (!('contracts' in result) || Object.keys(result['contracts']).length === 0)
+            {
+                console.log(filename + ': ERROR')
+            }
+            else
             {
-                console.log(contractName + ' ' + result['contracts'][contractName].bytecode)
-                console.log(contractName + ' ' + result['contracts'][contractName].metadata)
+                for (var contractName in result['contracts'])
+                {
+                    console.log(contractName + ' ' + result['contracts'][contractName].bytecode)
+                    console.log(contractName + ' ' + result['contracts'][contractName].metadata)
+                }
             }
         }
     }
-- 
cgit