Merge pull request #3 from erickearns/master

Initial 'package-npm' target and script, add SingularityNetToken.json…
singnet · Apr 5, 2018 · 4d0b793 · 4d0b793
2 parents c5c91ad + 4149e12
commit 4d0b793
Show file tree

Hide file tree

Showing 14 changed files with 1,867 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 build
 node_modules
 yarn-error.log
-.DS_Store
 npm-debug.log
 addresses.json
 /.vscode
diff --git a/README.md b/README.md
@@ -1,9 +1,26 @@
 # token-contracts
 Includes token contracts, migrations, tests
 
-## Requirements
+## Contracts
+
+### AgiCrowdsale
+* SingularityNET's original crowdsale contract
+
+### SingularityNetToken
+* ERC-20 implementation for SingularityNET AGI Token
+
+### TokenVesting
+* A contract to manage the gradual vesting of AGI tokens to an individual or entity
+
+### TokenVestingFactory
+* A contract to manage the creation of TokenVesting instances on-chain
+
+## Deployed Contracts
+* SingularityNetToken (Mainnet): 0x8eb24319393716668d768dcec29356ae9cffe285
+* SingularityNetToken (Kovan): 0x3b226ff6aad7851d3263e53cb7688d13a07f6e81
 
-* [Node.js](https://github.com/nodejs/node) (7.6 +)
+## Requirements
+* [Node.js](https://github.com/nodejs/node) (8+)
 * [Npm](https://www.npmjs.com/package/npm)
 
 ## Install
@@ -14,8 +31,14 @@ npm install
 ```
 
 ### Test 
-
 ```bash
 npm run test
 ```
 
+## Package
+```bash
+npm run package-npm
+```
+
+## Release
+SingularityNetToken artifacts are published to NPM: https://www.npmjs.com/package/singularitynet-token-contracts
diff --git a/contracts/.DS_Store b/contracts/.DS_Store
diff --git a/contracts/foundation/AgiCrowdsale.sol → contracts/AgiCrowdsale.sol b/contracts/foundation/AgiCrowdsale.sol → contracts/AgiCrowdsale.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import "../tokens/SingularityNetToken.sol";
+import "./SingularityNetToken.sol";
 import "zeppelin-solidity/contracts/math/SafeMath.sol";
 import "zeppelin-solidity/contracts/ReentrancyGuard.sol";
 import "zeppelin-solidity/contracts/ownership/Ownable.sol";

diff --git a/contracts/tokens/SingularityNetToken.sol → contracts/SingularityNetToken.sol b/contracts/tokens/SingularityNetToken.sol → contracts/SingularityNetToken.sol
diff --git a/contracts/tokens/TokenVesting.sol → contracts/TokenVesting.sol b/contracts/tokens/TokenVesting.sol → contracts/TokenVesting.sol
diff --git a/contracts/tokens/TokenVestingFactory.sol → contracts/TokenVestingFactory.sol b/contracts/tokens/TokenVestingFactory.sol → contracts/TokenVestingFactory.sol
diff --git a/migrations/.DS_Store b/migrations/.DS_Store
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,11 +1,13 @@
 {
   "name": "singularitynet-token-contracts",
-  "version": "0.0.1",
+  "version": "1.0.0",
+  "private": true,
   "description": "Includes token contracts, migrations, tests",
   "directories": {
     "test": "test"
   },
   "scripts": {
+    "package-npm": "node scripts/package-npm.js",
     "compile": "node_modules/.bin/truffle compile",
     "deploy": "node_modules/.bin/truffle migrate",
     "test": "rm -rf build && node_modules/.bin/truffle test"
@@ -25,6 +27,7 @@
     "zeppelin-solidity": "1.4.0"
   },
   "devDependencies": {
+    "fs-extra": "^5.0.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "chai-bignumber": "^2.0.2"