From dcc158da2c53439d051fe90b88143f942d57a93e Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:10:59 -0700 Subject: [PATCH 01/25] update top-level tsconfig to generate definitions --- tsconfig.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 5cead8e0..6fb8fe55 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,10 @@ "skipLibCheck": true, "esModuleInterop": true, "resolveJsonModule": true, - "typeRoots": ["node_modules/@types"] + "typeRoots": [ + "node_modules/@types" + ], + "sourceMap": true, + "declaration": true, } -} +} \ No newline at end of file From 0ac750ebcfb78f3252564c66e8ec283980d35cd3 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:11:07 -0700 Subject: [PATCH 02/25] kosu.js: formatting tsconfig --- packages/kosu.js/tsconfig.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/kosu.js/tsconfig.json b/packages/kosu.js/tsconfig.json index 893deefc..1040915a 100644 --- a/packages/kosu.js/tsconfig.json +++ b/packages/kosu.js/tsconfig.json @@ -5,7 +5,12 @@ "rootDir": "src", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": ["node_modules/@types"] + "typeRoots": [ + "node_modules/@types" + ], }, - "include": ["./src/**/*", "../kosu-system-contracts/src/types.d.ts"] -} + "include": [ + "./src/**/*", + "../kosu-system-contracts/src/types.d.ts" + ] +} \ No newline at end of file From feaa864a43685a61eaa1c179cb8bb879a214fa17 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:12:51 -0700 Subject: [PATCH 03/25] gov-portal-helper: v0.1.8 --- packages/gov-portal-helper/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gov-portal-helper/package.json b/packages/gov-portal-helper/package.json index c3bbd94c..36b5360d 100644 --- a/packages/gov-portal-helper/package.json +++ b/packages/gov-portal-helper/package.json @@ -1,6 +1,6 @@ { "name": "@kosu/gov-portal-helper", - "version": "0.1.7", + "version": "0.1.8", "description": "Abstraction library for interacting with the Kosu contract system governance functions.", "main": "lib/index.js", "license": "MIT", @@ -42,4 +42,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file From 55f2f26eb8d22df0c9166294fdd62a67e4e27ba8 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:15:45 -0700 Subject: [PATCH 04/25] kosu.js: v0.1.0-alpha.6 --- packages/kosu.js/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kosu.js/package.json b/packages/kosu.js/package.json index 209d20e5..4dff66bc 100644 --- a/packages/kosu.js/package.json +++ b/packages/kosu.js/package.json @@ -1,6 +1,6 @@ { "name": "@kosu/kosu.js", - "version": "0.1.0-alpha.5", + "version": "0.1.0-alpha.6", "description": "JavaScript module for connecting with Kosu.", "main": "dist/index.js", "license": "MIT", @@ -60,4 +60,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file From 6d36d4103fc930051b3ceff5a2151d323501afdf Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:16:27 -0700 Subject: [PATCH 05/25] tsc-config: v0.0.2 --- packages/tsc-config/package.json | 4 ++-- packages/tsc-config/tsconfig.json | 25 +++++++++---------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/packages/tsc-config/package.json b/packages/tsc-config/package.json index 3595f76b..4d674616 100644 --- a/packages/tsc-config/package.json +++ b/packages/tsc-config/package.json @@ -1,7 +1,7 @@ { "name": "@kosu/tsc-config", "private": false, - "version": "0.0.1", + "version": "0.0.2", "description": "TypeScript compiler base configuration for TS projects at Paradigm Labs.", "main": "tsconfig.json", "repository": "https://github.com/ParadigmFoundation/kosu-monorepo/blob/master/packages/tsc-config/README.md", @@ -10,4 +10,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file diff --git a/packages/tsc-config/tsconfig.json b/packages/tsc-config/tsconfig.json index fa5dd2a6..6fb8fe55 100644 --- a/packages/tsc-config/tsconfig.json +++ b/packages/tsc-config/tsconfig.json @@ -1,24 +1,17 @@ { "compilerOptions": { "module": "commonjs", - "target": "es5", - "lib": ["es2017", "dom"], - "removeComments": true, - "resolveJsonModule": true, - "experimentalDecorators": true, + "target": "es2015", "downlevelIteration": true, "noImplicitReturns": true, "pretty": true, "skipLibCheck": true, - "typeRoots": ["node_modules/@types"], - "strict": true, - // These settings are required for TypeScript project references - "composite": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "typeRoots": [ + "node_modules/@types" + ], + "sourceMap": true, "declaration": true, - "declarationMap": true, - "sourceMap": true - }, - - "include": [], - "references": [{ "path": "../tslint-config/tslint.json" }] -} + } +} \ No newline at end of file From 1a7d6ac69118fa920e4ccd8c98d9710b1eb8c7f8 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:18:45 -0700 Subject: [PATCH 06/25] tsc-config: v0.0.2 --- packages/tsc-config/package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/tsc-config/package.json b/packages/tsc-config/package.json index 4d674616..bc5a0dc1 100644 --- a/packages/tsc-config/package.json +++ b/packages/tsc-config/package.json @@ -9,5 +9,8 @@ "license": "MIT", "publishConfig": { "access": "public" - } + }, + "files": [ + "tsconfig.json" + ] } \ No newline at end of file From 6909aa9519455f52b116862f87af420bea291d2f Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:23:35 -0700 Subject: [PATCH 07/25] gov-portal-helper: remove unused import --- packages/gov-portal-helper/src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/gov-portal-helper/src/index.ts b/packages/gov-portal-helper/src/index.ts index e4cee531..039edaf1 100644 --- a/packages/gov-portal-helper/src/index.ts +++ b/packages/gov-portal-helper/src/index.ts @@ -1,7 +1,6 @@ import Web3 from "web3"; import BigNumber from "bignumber.js"; import cookies from "browser-cookies"; -import uuid from "uuid/v4"; import { EventEmitter } from "events"; import { Kosu } from "@kosu/kosu.js"; From 4b3fb61a809604f126d29255f4e573ef01b683c0 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:23:55 -0700 Subject: [PATCH 08/25] monorepo: regenerate lockfile --- yarn.lock | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 743269f1..a6ac3581 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3335,20 +3335,15 @@ bignumber.js@7.2.1, bignumber.js@^7.2.1: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ== -bignumber.js@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" - integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== +bignumber.js@8.0.2, bignumber.js@~8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.0.2.tgz#d8c4e1874359573b1ef03011a2d861214aeef137" + integrity sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw== "bignumber.js@git+https://github.com/frozeman/bignumber.js-nolookahead.git": version "2.0.7" resolved "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" -bignumber.js@~8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.0.2.tgz#d8c4e1874359573b1ef03011a2d861214aeef137" - integrity sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw== - bin-links@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757" From 0c88f4fc8d350bf97a8d0e6605bbd8c45abc3a0f Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:24:00 -0700 Subject: [PATCH 09/25] gov-portal-helper: fix bignumber version --- packages/gov-portal-helper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gov-portal-helper/package.json b/packages/gov-portal-helper/package.json index 36b5360d..0ae707aa 100644 --- a/packages/gov-portal-helper/package.json +++ b/packages/gov-portal-helper/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@kosu/kosu.js": "^0.1.0-alpha.5", - "bignumber.js": "^9.0.0", + "bignumber.js": "8.0.2", "browser-cookies": "^1.2.0", "events": "^3.0.0", "web3": "1.0.0-beta.37" From 067d28a365d9fa04e92027c1b6d966186c883e97 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:28:07 -0700 Subject: [PATCH 10/25] create-portal-helper: using new API from kosu.js --- packages/create-portal-helper/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-portal-helper/src/index.ts b/packages/create-portal-helper/src/index.ts index 22611b3d..f6a0997e 100644 --- a/packages/create-portal-helper/src/index.ts +++ b/packages/create-portal-helper/src/index.ts @@ -282,7 +282,7 @@ class Create { }; const posterSignature = await Signature.generate( this.web3, - OrderSerializer.posterHex(kosuOrder, ZRX_SUBCONTRACT_MAKER_ARGS), + OrderSerializer.posterSignatureHex(kosuOrder, ZRX_SUBCONTRACT_MAKER_ARGS), this.coinbase, ); const signedKosuOrder = { From b8bea6fb8a29980a75a3241e0c037f70b05369c4 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:28:53 -0700 Subject: [PATCH 11/25] create-portal-helper: v0.1.0-alpha.7 --- packages/create-portal-helper/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create-portal-helper/package.json b/packages/create-portal-helper/package.json index a4a64728..804621e7 100644 --- a/packages/create-portal-helper/package.json +++ b/packages/create-portal-helper/package.json @@ -1,6 +1,6 @@ { "name": "@kosu/create-portal-helper", - "version": "0.1.0-alpha.6", + "version": "0.1.0-alpha.7", "description": "Abstraction library for simplifying web-portal interactions.", "main": "index.js", "repository": "https://github.com/ParadigmFoundation/kosu-monorepo", @@ -15,7 +15,7 @@ "dependencies": { "0x.js": "^6.0.9", "@0x/subproviders": "^4.0.6", - "@kosu/kosu.js": "0.1.0-alpha.3", + "@kosu/kosu.js": "^0.1.0-alpha.6", "web3": "1.0.0-beta.37" }, "devDependencies": { @@ -32,10 +32,10 @@ "webpack": "^4.32.2" }, "files": [ - "lib/index.js", + "lib/*", "lib/config/*" ], "publishConfig": { "access": "public" } -} +} \ No newline at end of file From e5e1050b82075de0bd0531a725c0ef8cc35a4af2 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:29:15 -0700 Subject: [PATCH 12/25] gov-portal-helper: fixing getListing method call --- packages/gov-portal-helper/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gov-portal-helper/src/index.ts b/packages/gov-portal-helper/src/index.ts index 039edaf1..92bca658 100644 --- a/packages/gov-portal-helper/src/index.ts +++ b/packages/gov-portal-helper/src/index.ts @@ -811,7 +811,7 @@ class Gov { throw new Error("[gov] invalid public key"); } - const listings = await this.kosu.validatorRegistry.getListings(); + const listings = await this.kosu.validatorRegistry.getAllListings(); listings.forEach(listing => { cache[listing.tendermintPublicKey] = listing; }); From bc958305a44860ef4bdbd2626c55ac245b4304b2 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:30:49 -0700 Subject: [PATCH 13/25] mono: regenerate lockfile --- yarn.lock | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/yarn.lock b/yarn.lock index a6ac3581..89f3bcf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1156,27 +1156,6 @@ web3-utils "^1.0.0-beta.53" ws "^6.1.4" -"@kosu/kosu.js@0.1.0-alpha.3": - version "0.1.0-alpha.3" - resolved "https://registry.yarnpkg.com/@kosu/kosu.js/-/kosu.js-0.1.0-alpha.3.tgz#0eac4ca0ea0ccedfdae46ae179c42867a92a88ea" - integrity sha512-9n6cXpn5i23FGub4Ze1vYeNS1bCnI0TUmcbk51oAxRqsGYrsKy/azCEl7YxJJ6Ff3i6IZVHoa471imTY7HWtKw== - dependencies: - "@0x/utils" "^4.3.1" - "@0x/web3-wrapper" "^6.0.5" - "@babel/core" "^7.4.4" - "@kosu/system-contracts" "^0.1.0-alpha.2" - ethereum-protocol "^1.0.1" - ethereumjs-abi "^0.6.6" - ethereumjs-util "^5.2.0" - isomorphic-ws "^4.0.1" - node-fetch "^2.2.0" - truffle-contract "^4.0.11" - web3 "1.0.0-beta.37" - web3-eth-contract "^1.0.0-beta.53" - web3-provider-engine "^15.0.0" - web3-utils "^1.0.0-beta.53" - ws "^6.1.4" - "@ledgerhq/devices@^4.60.2": version "4.60.2" resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-4.60.2.tgz#dbb2232b12e104bc53e9fdd278b29a5323aa931e" From 76f25b48a8589f7b609e4915661417acc1864f39 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:33:52 -0700 Subject: [PATCH 14/25] tsc-config: v0.1.0 --- packages/tsc-config/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tsc-config/package.json b/packages/tsc-config/package.json index bc5a0dc1..b143e372 100644 --- a/packages/tsc-config/package.json +++ b/packages/tsc-config/package.json @@ -1,7 +1,7 @@ { "name": "@kosu/tsc-config", "private": false, - "version": "0.0.2", + "version": "0.1.0", "description": "TypeScript compiler base configuration for TS projects at Paradigm Labs.", "main": "tsconfig.json", "repository": "https://github.com/ParadigmFoundation/kosu-monorepo/blob/master/packages/tsc-config/README.md", From 057c8c97e86688d0fec1985a50b40cf82f344c8e Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:34:37 -0700 Subject: [PATCH 15/25] mono: typo in package definitions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index abd8adb8..99436a58 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "packages/kosu.js", "packages/kosu-sdk-contracts", "packages/kosu-system-contracts", - "pacakges/tsc-config", + "packages/tsc-config", "packages/tslint-config", "packages/dev-images", "packages/web-helpers", @@ -44,4 +44,4 @@ "typescript": "^3.4.5", "wsrun": "^3.6.5" } -} +} \ No newline at end of file From 60618da30ad50d0c4a771d65a4f2067c6e323ee0 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:36:22 -0700 Subject: [PATCH 16/25] kosu.js: use tsconfig from npm --- packages/kosu.js/package.json | 3 ++- packages/kosu.js/tsconfig.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/kosu.js/package.json b/packages/kosu.js/package.json index 4dff66bc..7a19adef 100644 --- a/packages/kosu.js/package.json +++ b/packages/kosu.js/package.json @@ -27,6 +27,7 @@ "@0x/web3-wrapper": "^6.0.5", "@babel/core": "^7.4.4", "@kosu/system-contracts": "^0.1.0-alpha.4", + "@kosu/tsc-config": "^0.1.0", "@kosu/tslint-config": "^0.0.4", "ethereum-protocol": "^1.0.1", "ethereumjs-abi": "^0.6.6", @@ -60,4 +61,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/packages/kosu.js/tsconfig.json b/packages/kosu.js/tsconfig.json index 1040915a..e9364084 100644 --- a/packages/kosu.js/tsconfig.json +++ b/packages/kosu.js/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "@kosu/tsc-config", "compilerOptions": { "outDir": "dist", "rootDir": "src", From c92920c6af4f2c656a45259cab3103052b81003d Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:36:35 -0700 Subject: [PATCH 17/25] kosu-system-contracts: use tsc from npm --- packages/kosu-system-contracts/package.json | 1 + packages/kosu-system-contracts/tsconfig.json | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/kosu-system-contracts/package.json b/packages/kosu-system-contracts/package.json index 52d6dc9b..c518f4eb 100644 --- a/packages/kosu-system-contracts/package.json +++ b/packages/kosu-system-contracts/package.json @@ -43,6 +43,7 @@ "@0x/utils": "^4.3.1", "@0x/web3-wrapper": "^6.0.5", "@kosu/subcontract-sdk": "0.1.0-alpha.1", + "@kosu/tsc-config": "^0.1.0", "@kosu/tslint-config": "^0.0.4", "bitcore-lib": "0.16", "ethereum-types": "^2.1.2", diff --git a/packages/kosu-system-contracts/tsconfig.json b/packages/kosu-system-contracts/tsconfig.json index c546fba7..b2782829 100644 --- a/packages/kosu-system-contracts/tsconfig.json +++ b/packages/kosu-system-contracts/tsconfig.json @@ -1,14 +1,21 @@ { - "extends": "../../tsconfig.json", + "extends": "@kosu/tsc-config", "compilerOptions": { "outDir": "dist", "rootDir": ".", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": ["node_modules/@types"], - "types": ["mocha"] + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "mocha" + ] }, - "include": ["./generated-wrappers/*", "./src/**/*"], + "include": [ + "./generated-wrappers/*", + "./src/**/*" + ], "files": [ "generated-artifacts/AuthorizedAddresses.json", "generated-artifacts/EventEmitter.json", @@ -20,4 +27,4 @@ "generated-artifacts/ValidatorRegistry.json", "generated-artifacts/Voting.json" ] -} +} \ No newline at end of file From fdbfc3547efe2a293f0ccdb9177f8a9238c4634b Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:37:21 -0700 Subject: [PATCH 18/25] gov-portal-helper: use tsconfig from npm --- packages/gov-portal-helper/package.json | 3 ++- packages/gov-portal-helper/tsconfig.json | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/gov-portal-helper/package.json b/packages/gov-portal-helper/package.json index 0ae707aa..f9270245 100644 --- a/packages/gov-portal-helper/package.json +++ b/packages/gov-portal-helper/package.json @@ -13,6 +13,7 @@ }, "dependencies": { "@kosu/kosu.js": "^0.1.0-alpha.5", + "@kosu/tsc-config": "^0.1.0", "bignumber.js": "8.0.2", "browser-cookies": "^1.2.0", "events": "^3.0.0", @@ -42,4 +43,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/packages/gov-portal-helper/tsconfig.json b/packages/gov-portal-helper/tsconfig.json index 9d679786..e80c4d92 100644 --- a/packages/gov-portal-helper/tsconfig.json +++ b/packages/gov-portal-helper/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "@kosu/tsc-config", "compilerOptions": { "allowSyntheticDefaultImports": true, "esModuleInterop": true, @@ -7,8 +7,12 @@ "rootDir": "src", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": ["node_modules/@types"], + "typeRoots": [ + "node_modules/@types" + ], "removeComments": false }, - "include": ["./src/index.ts"] -} + "include": [ + "./src/index.ts" + ] +} \ No newline at end of file From 7324816b3d17ddb5dfcb504466222f1bd36f17a2 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:38:22 -0700 Subject: [PATCH 19/25] create-portal-helper: use tscconfig from npm --- packages/create-portal-helper/package.json | 3 ++- packages/create-portal-helper/tsconfig.json | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/create-portal-helper/package.json b/packages/create-portal-helper/package.json index 804621e7..dfd7da6b 100644 --- a/packages/create-portal-helper/package.json +++ b/packages/create-portal-helper/package.json @@ -16,6 +16,7 @@ "0x.js": "^6.0.9", "@0x/subproviders": "^4.0.6", "@kosu/kosu.js": "^0.1.0-alpha.6", + "@kosu/tsc-config": "^0.1.0", "web3": "1.0.0-beta.37" }, "devDependencies": { @@ -38,4 +39,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/packages/create-portal-helper/tsconfig.json b/packages/create-portal-helper/tsconfig.json index d1c03d73..503ccf83 100644 --- a/packages/create-portal-helper/tsconfig.json +++ b/packages/create-portal-helper/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "@kosu/tsc-config", "compilerOptions": { "allowSyntheticDefaultImports": true, "esModuleInterop": true, @@ -7,7 +7,12 @@ "rootDir": "src", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": ["node_modules/@types"] + "typeRoots": [ + "node_modules/@types" + ] }, - "include": ["./src/index.ts", "./src/config/*"] -} + "include": [ + "./src/index.ts", + "./src/config/*" + ] +} \ No newline at end of file From 137dc94c835aa35817344e6a1cbb7aac819570cf Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:41:08 -0700 Subject: [PATCH 20/25] kosu.js: v0.1.0-alpha.7 --- packages/kosu.js/package.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/kosu.js/package.json b/packages/kosu.js/package.json index 7a19adef..0d3251bd 100644 --- a/packages/kosu.js/package.json +++ b/packages/kosu.js/package.json @@ -1,6 +1,6 @@ { "name": "@kosu/kosu.js", - "version": "0.1.0-alpha.6", + "version": "0.1.0-alpha.7", "description": "JavaScript module for connecting with Kosu.", "main": "dist/index.js", "license": "MIT", @@ -26,7 +26,7 @@ "@0x/utils": "^4.3.1", "@0x/web3-wrapper": "^6.0.5", "@babel/core": "^7.4.4", - "@kosu/system-contracts": "^0.1.0-alpha.4", + "@kosu/system-contracts": "^0.1.0-alpha.5", "@kosu/tsc-config": "^0.1.0", "@kosu/tslint-config": "^0.0.4", "ethereum-protocol": "^1.0.1", @@ -60,5 +60,8 @@ }, "publishConfig": { "access": "public" - } -} + }, + "files": [ + "dist/*" + ] +} \ No newline at end of file From 382c73dcf4f80d56c2b42407c500925bc1f6fdb9 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:41:26 -0700 Subject: [PATCH 21/25] create-portal-helper: v0.1.0-alpha.8 --- packages/create-portal-helper/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-portal-helper/package.json b/packages/create-portal-helper/package.json index dfd7da6b..9398d999 100644 --- a/packages/create-portal-helper/package.json +++ b/packages/create-portal-helper/package.json @@ -1,6 +1,6 @@ { "name": "@kosu/create-portal-helper", - "version": "0.1.0-alpha.7", + "version": "0.1.0-alpha.8", "description": "Abstraction library for simplifying web-portal interactions.", "main": "index.js", "repository": "https://github.com/ParadigmFoundation/kosu-monorepo", @@ -15,7 +15,7 @@ "dependencies": { "0x.js": "^6.0.9", "@0x/subproviders": "^4.0.6", - "@kosu/kosu.js": "^0.1.0-alpha.6", + "@kosu/kosu.js": "^0.1.0-alpha.7", "@kosu/tsc-config": "^0.1.0", "web3": "1.0.0-beta.37" }, @@ -39,4 +39,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file From 4c46c09003a96119cbaee82fae6aed3f1c61f117 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:41:37 -0700 Subject: [PATCH 22/25] gov-portal-helper: v0.1.8 --- packages/gov-portal-helper/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gov-portal-helper/package.json b/packages/gov-portal-helper/package.json index f9270245..98caeb12 100644 --- a/packages/gov-portal-helper/package.json +++ b/packages/gov-portal-helper/package.json @@ -1,6 +1,6 @@ { "name": "@kosu/gov-portal-helper", - "version": "0.1.8", + "version": "0.1.9", "description": "Abstraction library for interacting with the Kosu contract system governance functions.", "main": "lib/index.js", "license": "MIT", @@ -12,7 +12,7 @@ "build": "tsc" }, "dependencies": { - "@kosu/kosu.js": "^0.1.0-alpha.5", + "@kosu/kosu.js": "^0.1.0-alpha.7", "@kosu/tsc-config": "^0.1.0", "bignumber.js": "8.0.2", "browser-cookies": "^1.2.0", @@ -43,4 +43,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file From 70be2dbc215ba67a6f457230d6f7bcb3dead3fb8 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:41:49 -0700 Subject: [PATCH 23/25] kosu-system-contracts: v0.1.0-alpha.5 --- packages/kosu-system-contracts/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kosu-system-contracts/package.json b/packages/kosu-system-contracts/package.json index c518f4eb..caacc7d8 100644 --- a/packages/kosu-system-contracts/package.json +++ b/packages/kosu-system-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@kosu/system-contracts", - "version": "0.1.0-alpha.4", + "version": "0.1.0-alpha.5", "description": "Kosu protocol core contracts in Solidity.", "license": "MIT", "repository": { @@ -77,4 +77,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file From 9339edf62164d77e447bb5ad43d0b69f214c7679 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 11 Jun 2019 17:48:30 -0700 Subject: [PATCH 24/25] monorepo: running prettier --- package.json | 2 +- packages/create-portal-helper/package.json | 2 +- packages/create-portal-helper/tsconfig.json | 11 +++-------- packages/gov-portal-helper/package.json | 2 +- packages/gov-portal-helper/tsconfig.json | 10 +++------- packages/kosu-system-contracts/package.json | 2 +- packages/kosu-system-contracts/tsconfig.json | 15 ++++----------- packages/kosu.js/package.json | 2 +- packages/kosu.js/tsconfig.json | 11 +++-------- packages/tsc-config/package.json | 2 +- packages/tsc-config/tsconfig.json | 8 +++----- tsconfig.json | 8 +++----- 12 files changed, 25 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index 99436a58..547de937 100644 --- a/package.json +++ b/package.json @@ -44,4 +44,4 @@ "typescript": "^3.4.5", "wsrun": "^3.6.5" } -} \ No newline at end of file +} diff --git a/packages/create-portal-helper/package.json b/packages/create-portal-helper/package.json index 9398d999..649aafba 100644 --- a/packages/create-portal-helper/package.json +++ b/packages/create-portal-helper/package.json @@ -39,4 +39,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/packages/create-portal-helper/tsconfig.json b/packages/create-portal-helper/tsconfig.json index 503ccf83..9cdadd0a 100644 --- a/packages/create-portal-helper/tsconfig.json +++ b/packages/create-portal-helper/tsconfig.json @@ -7,12 +7,7 @@ "rootDir": "src", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": [ - "node_modules/@types" - ] + "typeRoots": ["node_modules/@types"] }, - "include": [ - "./src/index.ts", - "./src/config/*" - ] -} \ No newline at end of file + "include": ["./src/index.ts", "./src/config/*"] +} diff --git a/packages/gov-portal-helper/package.json b/packages/gov-portal-helper/package.json index 98caeb12..abd5bd7e 100644 --- a/packages/gov-portal-helper/package.json +++ b/packages/gov-portal-helper/package.json @@ -43,4 +43,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/packages/gov-portal-helper/tsconfig.json b/packages/gov-portal-helper/tsconfig.json index e80c4d92..45e75ab2 100644 --- a/packages/gov-portal-helper/tsconfig.json +++ b/packages/gov-portal-helper/tsconfig.json @@ -7,12 +7,8 @@ "rootDir": "src", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": [ - "node_modules/@types" - ], + "typeRoots": ["node_modules/@types"], "removeComments": false }, - "include": [ - "./src/index.ts" - ] -} \ No newline at end of file + "include": ["./src/index.ts"] +} diff --git a/packages/kosu-system-contracts/package.json b/packages/kosu-system-contracts/package.json index caacc7d8..aeddbfd7 100644 --- a/packages/kosu-system-contracts/package.json +++ b/packages/kosu-system-contracts/package.json @@ -77,4 +77,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/packages/kosu-system-contracts/tsconfig.json b/packages/kosu-system-contracts/tsconfig.json index b2782829..a4afb826 100644 --- a/packages/kosu-system-contracts/tsconfig.json +++ b/packages/kosu-system-contracts/tsconfig.json @@ -5,17 +5,10 @@ "rootDir": ".", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": [ - "node_modules/@types" - ], - "types": [ - "mocha" - ] + "typeRoots": ["node_modules/@types"], + "types": ["mocha"] }, - "include": [ - "./generated-wrappers/*", - "./src/**/*" - ], + "include": ["./generated-wrappers/*", "./src/**/*"], "files": [ "generated-artifacts/AuthorizedAddresses.json", "generated-artifacts/EventEmitter.json", @@ -27,4 +20,4 @@ "generated-artifacts/ValidatorRegistry.json", "generated-artifacts/Voting.json" ] -} \ No newline at end of file +} diff --git a/packages/kosu.js/package.json b/packages/kosu.js/package.json index 0d3251bd..866397fa 100644 --- a/packages/kosu.js/package.json +++ b/packages/kosu.js/package.json @@ -64,4 +64,4 @@ "files": [ "dist/*" ] -} \ No newline at end of file +} diff --git a/packages/kosu.js/tsconfig.json b/packages/kosu.js/tsconfig.json index e9364084..07340f23 100644 --- a/packages/kosu.js/tsconfig.json +++ b/packages/kosu.js/tsconfig.json @@ -5,12 +5,7 @@ "rootDir": "src", "resolveJsonModule": true, "moduleResolution": "node", - "typeRoots": [ - "node_modules/@types" - ], + "typeRoots": ["node_modules/@types"] }, - "include": [ - "./src/**/*", - "../kosu-system-contracts/src/types.d.ts" - ] -} \ No newline at end of file + "include": ["./src/**/*", "../kosu-system-contracts/src/types.d.ts"] +} diff --git a/packages/tsc-config/package.json b/packages/tsc-config/package.json index b143e372..39753de7 100644 --- a/packages/tsc-config/package.json +++ b/packages/tsc-config/package.json @@ -13,4 +13,4 @@ "files": [ "tsconfig.json" ] -} \ No newline at end of file +} diff --git a/packages/tsc-config/tsconfig.json b/packages/tsc-config/tsconfig.json index 6fb8fe55..c7e27f93 100644 --- a/packages/tsc-config/tsconfig.json +++ b/packages/tsc-config/tsconfig.json @@ -8,10 +8,8 @@ "skipLibCheck": true, "esModuleInterop": true, "resolveJsonModule": true, - "typeRoots": [ - "node_modules/@types" - ], + "typeRoots": ["node_modules/@types"], "sourceMap": true, - "declaration": true, + "declaration": true } -} \ No newline at end of file +} diff --git a/tsconfig.json b/tsconfig.json index 6fb8fe55..c7e27f93 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,10 +8,8 @@ "skipLibCheck": true, "esModuleInterop": true, "resolveJsonModule": true, - "typeRoots": [ - "node_modules/@types" - ], + "typeRoots": ["node_modules/@types"], "sourceMap": true, - "declaration": true, + "declaration": true } -} \ No newline at end of file +} From 9ffa4d0faffec09e12c7493d34162e27d66ac9f0 Mon Sep 17 00:00:00 2001 From: Nick Freyaldenhoven Date: Tue, 11 Jun 2019 22:15:17 -0500 Subject: [PATCH 25/25] Removing an only that got checked in. --- packages/kosu-system-contracts/test/init_test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kosu-system-contracts/test/init_test.ts b/packages/kosu-system-contracts/test/init_test.ts index e5238d45..afd3921c 100644 --- a/packages/kosu-system-contracts/test/init_test.ts +++ b/packages/kosu-system-contracts/test/init_test.ts @@ -166,7 +166,7 @@ before(async () => { Object.assign(global, { ...testHelpers, txDefaults, testValues, contracts, accounts, web3, web3Wrapper }); }); -describe.only("SubContract", () => { +describe("SubContract", () => { const argumentsJson = { maker: [ { datatype: "address", name: "signer" }, // 0