diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/contracts/README.md | 2 | ||||
| -rw-r--r-- | packages/contracts/package.json | 52 | ||||
| -rw-r--r-- | packages/contracts/truffle.js | 4 | ||||
| -rw-r--r-- | packages/contracts/tsconfig.json | 2 |
4 files changed, 29 insertions, 31 deletions
diff --git a/packages/contracts/README.md b/packages/contracts/README.md index 1aa62b25d..57c75cb85 100644 --- a/packages/contracts/README.md +++ b/packages/contracts/README.md @@ -13,7 +13,7 @@ Contracts ### Installing Dependencies -Install [Node v6.9.1](https://nodejs.org/en/download/releases/) +Install [Node](https://nodejs.org/en/download/releases/) Install [yarn](https://yarnpkg.com/lang/en/docs/install/) in order to install the project dependencies more deterministically. diff --git a/packages/contracts/package.json b/packages/contracts/package.json index bddf01956..346add2ae 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,62 +1,60 @@ { - "name": "0x-smart-contracts", + "name": "contracts", "version": "1.0.0", - "description": "", + "description": "Smart contract components of 0x protocol", "main": "index.js", "directories": { "test": "test" }, "scripts": { - "transpile": "rm -rf ./transpiled; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./transpiled; tsc;", - "test": "npm run transpile; truffle test", - "compile": "npm run transpile; node transpiled/deploy/cli.js compile", - "migrate": "npm run transpile; truffle migrate", - "migrateCustom": "npm run transpile; node transpiled/deploy/cli.js migrate", - "deploy": "npm run migrate --network kovan", + "build": "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", + "test": "npm run build; truffle test", + "compile": "npm run build; node lib/deploy/cli.js compile", + "clean": "rm -rf ./lib", + "migrate:truffle": "npm run build; truffle migrate", + "migrate": "npm run build; node lib/deploy/cli.js migrate", "lint": "tslint --project . 'migrations/*.ts' 'test/**/*.ts' 'util/*.ts' 'deploy/**/*.ts'", - "testrpc": "testrpc --networkId 50", - "mocha": "npm run transpile; mocha transpiled/deploy/test/*_test.js" + "mocha": "npm run build; mocha lib/deploy/test/*_test.js" }, "repository": { "type": "git", - "url": "git+https://github.com/0xProject/0x-Smart-Contracts.git" + "url": "https://github.com/0xProject/0x.js.git" }, - "author": "abandeali1@gmail.com", - "license": "ISC", + "author": "Amir Bandeali", + "license": "Apache-2.0", "bugs": { - "url": "https://github.com/0xProject/0x-Smart-Contracts/issues" + "url": "https://github.com/0xProject/0x.js/issues" }, - "homepage": "https://github.com/0xProject/0x-Smart-Contracts#readme", + "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md", "devDependencies": { + "@0xproject/tslint-config": "^0.2.0", "@types/bluebird": "^3.5.3", "@types/isomorphic-fetch": "^0.0.34", - "@types/lodash": "^4.14.63", - "@types/node": "^8.0.51", + "@types/lodash": "^4.14.64", + "@types/node": "^8.0.1", "@types/request-promise-native": "^1.0.2", "@types/yargs": "^8.0.2", - "chai": "^4.1.2", - "chai-as-promised": "^7.1.1", + "chai": "^4.0.1", + "chai-as-promised": "^7.1.0", "chai-as-promised-typescript-typings": "^0.0.3", "chai-bignumber": "^2.0.1", - "chai-typescript-typings": "^0.0.0", + "chai-typescript-typings": "^0.0.1", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", - "ethereumjs-testrpc": "4.0.1", - "mocha": "^4.0.1", + "mocha": "^4.0.0", "solc": "^0.4.18", "truffle": "3.4.3", "tslint": "5.8.0", - "tslint-config-0xproject": "^0.0.2", "types-bn": "^0.0.1", - "types-ethereumjs-util": "machinomy/types-ethereumjs-util", + "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "^2.6.1", - "web3-typescript-typings": "^0.7.1", + "web3-typescript-typings": "^0.7.2", "yargs": "^10.0.3" }, "dependencies": { "@0xproject/json-schemas": "^0.6.9", "0x.js": "^0.22.6", - "bignumber.js": "^4.1.0", + "bignumber.js": "~4.1.0", "bluebird": "^3.5.0", "bn.js": "^4.11.6", "es6-promisify": "^5.0.0", @@ -65,7 +63,7 @@ "isomorphic-fetch": "^2.2.1", "lodash": "^4.17.4", "request": "^2.81.0", - "web3": "0.20.2", + "web3": "0.20.0", "web3-eth-abi": "^1.0.0-beta.24" } } diff --git a/packages/contracts/truffle.js b/packages/contracts/truffle.js index 3f804b15c..630f4cf8b 100644 --- a/packages/contracts/truffle.js +++ b/packages/contracts/truffle.js @@ -12,6 +12,6 @@ module.exports = { gas: 4612388, }, }, - test_directory: "transpiled/test", - migrations_directory: "transpiled/migrations", + test_directory: "lib/test", + migrations_directory: "lib/migrations", }; diff --git a/packages/contracts/tsconfig.json b/packages/contracts/tsconfig.json index 97e7b6790..c51d5acc4 100644 --- a/packages/contracts/tsconfig.json +++ b/packages/contracts/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "outDir": "./transpiled/", + "outDir": "./lib/", "sourceMap": true, "noImplicitAny": true, "module": "commonjs", |