Merge pull request #98 from renproject/release/1.0.0

Author: loongy

.circleci/config.yml

@@ -36,7 +36,7 @@ jobs:
       - install_deps
       - run:
           name: Run tests
-          command: yarn run coverage && yarn run coveralls
+          command: NODE_OPTIONS=--max_old_space_size=4096 yarn run coverage && yarn run coveralls
 
 workflows:
   build:

.gitignore

@@ -10,6 +10,9 @@ dist
 coverageEnv
 coverage.json
 .coveralls.yml
+.coverage_artifacts
+.coverage_contracts
+*output.log
 
 # Configuration files
 *.env

.npmignore

@@ -0,0 +1,44 @@
+# Node / NPM / Yarn
+node_modules
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Build / test artifacts
+coverage
+dist
+coverageEnv
+coverage.json
+.coveralls.yml
+.coverage_artifacts
+.coverage_contracts
+*output.log
+
+# Configuration files
+*.env
+.env*
+
+# OS files
+.DS_Store
+
+# Solidity
+.node-xmlhttprequest-sync-*
+scTopics
+allFiredEvents
+in_complete_tests
+build/development
+local_*
+bindings.go
+types
+
+
+# npmignore - content above this line is automatically generated and modifications may be omitted
+# see npmjs.com/npmignore for more details.
+test
+.circleci
+.github
+.vscode
+.gitattributes
+.solcover.js
+tsconfig.json
+tslint.json

.solcover.js

@@ -1,17 +1,21 @@
 module.exports = {
-    copyPackages: ["@openzeppelin/contracts"], // needed to import from node_modules
+    copyPackages: ["@openzeppelin/contracts-ethereum-package"], // needed to import from node_modules.
     testrpcOptions: "-d --accounts 10 --port 8555",
     skipFiles: [
-        // REN token
+        // REN token.
         "RenToken/RenToken.sol",
 
-        // Contract for building bindings
+        // Contract for building bindings.
         "test/Bindings.sol",
 
-        // Migration contract
+        // Migration contract.
         "migrations/Migrations.sol",
 
-        // Contracts for assisting the tests
+        // Examples
+        "Gateway/adapters/BasicAdapter.sol",
+        "Gateway/examples/Vesting.sol",
+
+        // Contracts for assisting the tests.
         "test/ERC20WithFeesTest.sol",
         "test/tokens/ImpreciseToken.sol",
         "test/tokens/SelfDestructingToken.sol",
@@ -24,6 +28,6 @@ module.exports = {
         "test/StringTest.sol",
         "test/CompareTest.sol",
         "test/tokens/PaymentToken.sol",
-        "test/CycleChanger.sol",
-    ],
+        "test/CycleChanger.sol"
+    ]
 };

README.md

@@ -8,11 +8,6 @@
 
 Ren is powered by the RenVM — the Ren Virtual Machine — in a decentralized network of Darknodes that is distinct from Ethereum. This ensures the performance of the network, and the privacy of data, is not dependent on Ethereum.
 
-## Docs
-
-* [Darknode Registry](./docs/01-darknode-registry.md)
-* [Darknode Payments](./docs/02-darknode-payments.md)
-
 ## Tests
 
 Install the dependencies.

build/chaosnet/Protocol.json build/chaosnet/BCHGateway.jsonbuild/chaosnet/Protocol.json renamed to build/chaosnet/BCHGateway.json

@@ -1,5 +1,5 @@
 {
-  "contractName": "Protocol",
+  "contractName": "BCHGateway",
   "abi": [
     {
       "anonymous": false,
@@ -164,10 +164,10 @@
       "type": "function"
     }
   ],
-  "sourcePath": "./contracts/Protocol/Protocol.sol",
+  "sourcePath": "~/github/renproject/ren-sol/contracts/Gateway/Gateway.sol",
   "compiler": {
     "name": "solc",
-    "version": "0.5.12+commit.7709ece9.Emscripten.clang"
+    "version": "0.5.16+commit.9c3226ce.Emscripten.clang"
   },
   "networks": {
     "1": {
@@ -189,8 +189,7 @@
             }
           ],
           "name": "AdminChanged",
-          "type": "event",
-          "signature": "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
+          "type": "event"
         },
         "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b": {
           "anonymous": false,
@@ -203,14 +202,13 @@
             }
           ],
           "name": "Upgraded",
-          "type": "event",
-          "signature": "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b"
+          "type": "event"
         }
       },
       "links": {},
-      "address": "0xeF4de0E97D92757520D78c4d49d8151964f6a85B",
-      "transactionHash": "0x5df7b19fdbaffdf70b33e17190e20e1c4a3d24db5473d69cdf5520327317a0ee"
+      "address": "0xc3AC15BEc6dA89e8DC5c4d1b4d0C785547676e3a",
+      "transactionHash": "0x216aceeb99702118eb1ed0dc12244419ef3454d24ed01fae58a9c0a7c2f985fb"
     }
   },
-  "schemaVersion": "3.0.20"
+  "schemaVersion": "3.0.23"
 }