Merge pull request #12 from tintinweb/fix/unitConstants

fixes "2 ether" not returning a value, const_int type guessing, update solc@0.8.11, minor issues

Author: tintinweb

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes will be documented in this file.
 
+## v0.0.10
+- new: update to solc@0.8.11
+- new: basic autocomplete for built-ins (configurable via `.config`) - #11
+- fix: return value of unit constants (e.g. `2 ether`) - #12
+- fix: distinguish between/ autoguess const signed and unsigned int return values - #12
+- update: minor refactoring - #11
+
 ## v0.0.9
 - new: support the `import` directive - #8
   - new: experimental support for `https` imports, i.e. `import "https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC721/IERC721.sol"`. This can be disabled by setting ` »  .config set resolveHttpImports false`.

bin/main.js

@@ -229,10 +229,12 @@ vorpal
     .command("$_")
 
 /** autocomplate built-ins (not context sensitive) */
-for (let builtin of builtIns) {
-    vorpal  //register built-in as command (1st level autocomplete, with 2nd level autocomplete for params)
-        .command(`${builtin}`)
-        .autocomplete(builtIns);
+if(config.enableAutoComplete){
+    for (let builtin of builtIns) {
+        vorpal  //register built-in as command (1st level autocomplete, with 2nd level autocomplete for params)
+            .command(`${builtin}`)
+            .autocomplete(builtIns);
+    }
 }
 
 /** start in repl mode */

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "solidity-shell",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "main": "src/index.js",
   "bin": {
@@ -29,7 +29,7 @@
     "minimist": "^1.2.5",
     "readline-sync": "^1.4.10",
     "request": "^2.88.2",
-    "solc": "^0.8.10",
+    "solc": "^0.8.11",
     "sync-request": "^6.1.0",
     "vorpal": "^1.12.0",
     "web3": "^1.5.2"

package.json

@@ -4,7 +4,7 @@
  * @license MIT
  * */
 
-//autogenerated with # npm run updateCompilerList
+//autogenerated with # npm run updateBuiltIns
 module.exports.builtIns = [
     "pragma",
     "import",

src/compiler/autogenerated/builtIns.js

@@ -13,7 +13,8 @@ const path = require('path');
 /** CONST */
 const rexTypeError = /Return argument type (.*) is not implicitly convertible to expected type \(type of first return variable\)/;
 const rexAssign = /[^=]=[^=];?/;
-const rexTypeDecl = /^([\w\[\]]+\s(memory|storage)?\s*\w+);?$/
+const rexTypeDecl = /^([\w\[\]]+\s(memory|storage)?\s*\w+);?$/;
+const rexUnits = /^(\d+\s*(wei|gwei|szabo|finney|ether|seconds|minutes|hours|days|weeks|years))\s*;?$/;
 const IGNORE_WARNINGS = [
     "Statement has no effect.",
     "Function state mutability can be restricted to ",
@@ -50,32 +51,26 @@ class SolidityStatement {
     constructor(rawCommand, scope) {
         this.rawCommand = rawCommand ? rawCommand.trim() : "";
         this.hasNoReturnValue = (rexAssign.test(this.rawCommand))
-            || (this.rawCommand.startsWith('delete'))
+            || (this.rawCommand.startsWith('delete '))
             || (this.rawCommand.startsWith('assembly'))
             || (this.rawCommand.startsWith('revert'))
-            || (rexTypeDecl.test(this.rawCommand))
+            || (rexTypeDecl.test(this.rawCommand) && !rexUnits.test(this.rawCommand))  /* looks like type decl but is not special builtin like "2 ether" */
 
         if (scope) {
-            this.scope = scope
+            this.scope = scope;
         } else {
-            if (this.rawCommand.startsWith('function ') || this.rawCommand.startsWith('modifier ')) {
-                this.scope = SCOPE.CONTRACT;
-                this.hasNoReturnValue = true;
-            } else if (this.rawCommand.startsWith('mapping ') || this.rawCommand.startsWith('event ') || this.rawCommand.startsWith('error ')) {
+            if (['function ', 'modifier ', 'mapping ', 'event ', 'error '].some(e => this.rawCommand.startsWith(e))) {
                 this.scope = SCOPE.CONTRACT;
                 this.hasNoReturnValue = true;
             } else if (this.rawCommand.startsWith('pragma solidity ')) {
                 this.scope = SCOPE.VERSION_PRAGMA;
                 this.hasNoReturnValue = true;
                 this.rawCommand = this.fixStatement(this.rawCommand);
-            } else if (this.rawCommand.startsWith('pragma ') || this.rawCommand.startsWith('import ')) {
+            } else if (['pragma ', 'import '].some(e => this.rawCommand.startsWith(e))) {
                 this.scope = SCOPE.SOURCE_UNIT;
                 this.hasNoReturnValue = true;
                 this.rawCommand = this.fixStatement(this.rawCommand);
-            } else if (this.rawCommand.startsWith('struct ')) {
-                this.scope = SCOPE.SOURCE_UNIT;
-                this.hasNoReturnValue = true;
-            } else if (this.rawCommand.startsWith('contract ') || this.rawCommand.startsWith('interface ')) {
+            } else if (['contract ', 'interface ', 'struct '].some(e => this.rawCommand.startsWith(e))) {
                 this.scope = SCOPE.SOURCE_UNIT;
                 this.hasNoReturnValue = true;
             } else {
@@ -87,6 +82,7 @@ class SolidityStatement {
             }
         }
 
+
         if (this.hasNoReturnValue) {
             // expression
             this.returnExpression = ';';
@@ -127,6 +123,7 @@ class InteractiveSolidityShell {
             ganacheArgs: [],
             debugShowContract: false,
             resolveHttpImports: true,
+            enableAutoComplete: true,
         }
 
         this.settings = {
@@ -306,14 +303,7 @@ contract ${this.settings.templateContractName} {
                 .catch(err => {
                     return reject(err);
                 });
-
-
         });
-
-
-
-
-
     }
 
     run(statement) {
@@ -359,7 +349,9 @@ contract ${this.settings.templateContractName} {
 
                 //console.log("2nd pass - detect return type")
                 let retType = matches[1];
-                if (retType.startsWith('int_const ')) {
+                if (retType.startsWith('int_const -')) {
+                    retType = 'int';
+                } else if (retType.startsWith('int_const ')) {
                     retType = 'uint';
                 } else if (retType.startsWith('contract ')) {
                     retType = retType.split("contract ", 2)[1]