Merge pull request #42 from rsksmart/development

Merge development into master
rsksmart · Mar 27, 2024 · 506ca34 · 506ca34
2 parents 13f8bf3 + 8b8feee
commit 506ca34
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 16 deletions.
diff --git a/dist/lib/compiler.js b/dist/lib/compiler.js
@@ -16,12 +16,20 @@ function Compiler({ solcCache } = {}) {
 
 
 
-    const { optimizer } = settings;
+    const { optimizer, metadata } = settings;
+
     if (optimizer) {
       let { runs } = optimizer;
       runs = runs ? parseInt(runs) : 200;
       settings.optimizer.runs = runs;
     }
+
+    if (metadata) {
+      settings.metadata.useLiteralContent = true;
+    } else {
+      settings.metadata = { useLiteralContent: true };
+    }
+
     return {
       language: 'Solidity',
       sources,

diff --git a/dist/lib/defaultConfig.js b/dist/lib/defaultConfig.js
@@ -3,4 +3,4 @@
   port: 3008,
   solcCache: '/tmp/solc',
   log: {},
-  timeout: 60000 };exports.default = _default;
+  timeout: 600000 };exports.default = _default;
diff --git a/dist/lib/verifier.js b/dist/lib/verifier.js
@@ -45,8 +45,8 @@ function Verifier(options = {}) {
 
       if (!compiled) {
         for (const path of Object.keys(contracts)) {
-          const file = path.split('/').pop();
-          if (file.split('.')[0] === KEY) {
+          const contractName = path.split('/').pop().split('.')[0];
+          if (contractName === KEY) {
             compiled = contracts[path][KEY];
           }
         }
@@ -59,18 +59,20 @@ function Verifier(options = {}) {
           const { sources } = JSON.parse(compiled.metadata);
 
           for (const [path, { content }] of Object.entries(sources)) {
-            const name = path.split('/').pop().split();
+            const name = path.split('/').pop().split('.')[0];
             const sourceObj = { path, file: path.split('/').pop() };
 
             if (name === KEY) {
               sourceObj.contents = content;
-              usedSources.unshift(sourceObj);
             } else {
               sourceObj.hash = (0, _utils.getHash)(content);
-              usedSources.push(sourceObj);
             }
+
+            usedSources.push(sourceObj);
           }
-        } catch (e) {}
+        } catch (err) {
+          return Promise.reject(err);
+        }
       }
 
       const { evm, abi } = compiled;

diff --git a/src/lib/compiler.js b/src/lib/compiler.js
@@ -16,12 +16,20 @@ export function Compiler ({ solcCache } = {}) {
         ]
       }
     }
-    const { optimizer } = settings
+    const { optimizer, metadata } = settings
+
     if (optimizer) {
       let { runs } = optimizer
       runs = (runs) ? parseInt(runs) : 200
       settings.optimizer.runs = runs
     }
+
+    if (metadata) {
+      settings.metadata.useLiteralContent = true
+    } else {
+      settings.metadata = { useLiteralContent: true }
+    }
+
     return {
       language: 'Solidity',
       sources,

diff --git a/src/lib/defaultConfig.js b/src/lib/defaultConfig.js
@@ -5,4 +5,3 @@ export default {
   log: {},
   timeout: 600000
 }
-
diff --git a/src/lib/verifier.js b/src/lib/verifier.js
@@ -45,8 +45,8 @@ export function Verifier (options = {}) {
 
       if (!compiled) {
         for (const path of Object.keys(contracts)) {
-          const file = path.split('/').pop()
-          if (file.split('.')[0] === KEY) {
+          const contractName = path.split('/').pop().split('.')[0]
+          if (contractName === KEY) {
             compiled = contracts[path][KEY]
           }
         }
@@ -59,18 +59,20 @@ export function Verifier (options = {}) {
           const { sources } = JSON.parse(compiled.metadata)
 
           for (const [path, { content }] of Object.entries(sources)) {
-            const name = path.split('/').pop().split()
+            const name = path.split('/').pop().split('.')[0]
             const sourceObj = { path, file: path.split('/').pop() }
 
             if (name === KEY) {
               sourceObj.contents = content
-              usedSources.unshift(sourceObj)
             } else {
               sourceObj.hash = getHash(content)
-              usedSources.push(sourceObj)
             }
+
+            usedSources.push(sourceObj)
           }
-        } catch (e) {}
+        } catch (err) {
+          return Promise.reject(err)
+        }
       }
 
       const { evm, abi } = compiled
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@ export default {
		log: {},
		timeout: 600000
		}