Merge branch 'master' into solc_require_fix

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2
 jobs:
   remix-lib:
     docker:
-        - image: circleci/node:7.10
+        - image: circleci/node:9.11.2
     environment:
     working_directory: ~/repo
     steps:
@@ -14,31 +14,30 @@ jobs:
       - run: npm install && npm run bootstrap
       - run: cd remix-lib && npm test
 
-  remix-solidity:
+  remix-debug:
      docker:
-        - image: circleci/node:7.10
+        - image: circleci/node:9.11.2
      environment:
      working_directory: ~/repo
      steps:
       - checkout
       - run: npm install && npm run bootstrap
-      - run: cd remix-solidity && npm test
+      - run: cd remix-debug && npm test
  
-  remix-debug:
+  remix-analyzer:
     docker:
-        - image: circleci/node:7.10
+        - image: circleci/node:9.11.2
     environment:
     working_directory: ~/repo
     steps:
       - checkout
       - run: npm install && npm run bootstrap
-      - run: cd remix-debug && npm test
+      - run: cd remix-analyzer && npm test
 
 workflows:
   version: 2
   build_all:
     jobs:
       - remix-lib
-      - remix-solidity
       - remix-debug
-
+      - remix-analyzer

README.md

@@ -35,9 +35,11 @@ Those commands will run the RPC server on `localhost:8545`, which is the default
 
 See [here](remix-debugger/README.md) how to install, run and use the debugger locally.
 
+The debugger itself contains several controls that allow stepping over the trace and seeing the current state of a selected step.
+
 ## <a name="modules"></a>Remix Modules
 
-Remix is built out of 4 different modules:
+Remix is built out of 3 different modules:
 
 + [`remix-solidity`](remix-solidity/README.md) provides Solidity analysis and decoding functions.
 + [`remix-lib`](remix-lib/README.md)

docs/index.rst

@@ -9,7 +9,7 @@ Remix also supports testing, debugging and deploying of smart contracts and much
 Our Remix project with all its features is available
 at `remix.ethereum.org <http://remix.ethereum.org>`__ and more information can be found in these
 docs.  Our tool is available at `our GitHub repository
-<https://github.com/ethereum/remix-id>`__.
+<https://github.com/ethereum/remix-ide>`__.
 
 This set of documents covers instructions on how to use Remix and some tutorials to help you get started.
 

docs/run_tab.md

@@ -112,7 +112,7 @@ In that case we use the addres of the previously created library :
 `created{1512830014773}`. the number is the id (timestamp) of the
 transaction that leads to the creation of the library.
 
-The third parameter corresponds to the call to te function `set` of the
+The third parameter corresponds to the call to the function `set` of the
 contract `test` (the property to is set to: `created{1512830015080}`) .
 Input parameters are `1` and
 `0xca35b7d915458ef540ade6068dfe2f44e8fa733c`

lerna.json

@@ -4,7 +4,8 @@
     "remix-debug",
     "remix-debugger",
     "remix-lib",
-    "remix-solidity"
+    "remix-solidity",
+    "remix-analyzer"
   ],
   "version": "independent"
 }

remix-analyzer/package.json

@@ -21,7 +21,10 @@
     "babel-eslint": "^7.1.1",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "remix-lib": "^0.2.9",
-    "babel-preset-es2015": "^6.24.0"
+    "babel-preset-es2015": "^6.24.0",
+    "solc": "^0.4.24",
+    "standard": "^7.0.1",
+    "tape": "^4.6.0"
   },
   "scripts": {
     "test": "standard && tape ./test/tests.js"
@@ -34,10 +37,5 @@
   },
   "author": "Remix Team",
   "license": "MIT",
-  "homepage": "https://github.com/ethereum/remix#readme",
+  "homepage": "https://github.com/ethereum/remix#readme"
-  "devDependencies": {
-    "solc": "^0.4.24",
-    "standard": "^7.0.1",
-    "tape": "^4.6.0"
-  }
 }

remix-solidity/package.json

@@ -23,15 +23,13 @@
     "fast-async": "^6.1.2",
     "npm-run-all": "^4.0.2",
     "remix-lib": "^0.2.9",
-    "solc": "https://github.com/ethereum/solc-js",
+    "solc": "^0.4.24",
     "standard": "^7.0.1",
     "tape": "^4.6.0",
     "webworkify": "^1.2.1"
   },
   "scripts": {
-    "test": "standard && tape ./test/tests.js",
+    "test": "standard && tape ./test/tests.js"
-    "downloadsolc": "cd node_modules/solc && (test -e soljson.js || wget --no-check-certificate https://solc-bin.ethereum.org/soljson.js) && cd ..",
-    "prepublish": "mkdirp build"
   },
   "standard": {
     "ignore": [