diff --git a/package.json b/package.json index abd8adb8..547de937 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", diff --git a/packages/create-portal-helper/package.json b/packages/create-portal-helper/package.json index a4a64728..649aafba 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.8", "description": "Abstraction library for simplifying web-portal interactions.", "main": "index.js", "repository": "https://github.com/ParadigmFoundation/kosu-monorepo", @@ -15,7 +15,8 @@ "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.7", + "@kosu/tsc-config": "^0.1.0", "web3": "1.0.0-beta.37" }, "devDependencies": { @@ -32,7 +33,7 @@ "webpack": "^4.32.2" }, "files": [ - "lib/index.js", + "lib/*", "lib/config/*" ], "publishConfig": { 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 = { diff --git a/packages/create-portal-helper/tsconfig.json b/packages/create-portal-helper/tsconfig.json index d1c03d73..9cdadd0a 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, diff --git a/packages/gov-portal-helper/package.json b/packages/gov-portal-helper/package.json index c3bbd94c..abd5bd7e 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.9", "description": "Abstraction library for interacting with the Kosu contract system governance functions.", "main": "lib/index.js", "license": "MIT", @@ -12,8 +12,9 @@ "build": "tsc" }, "dependencies": { - "@kosu/kosu.js": "^0.1.0-alpha.5", - "bignumber.js": "^9.0.0", + "@kosu/kosu.js": "^0.1.0-alpha.7", + "@kosu/tsc-config": "^0.1.0", + "bignumber.js": "8.0.2", "browser-cookies": "^1.2.0", "events": "^3.0.0", "web3": "1.0.0-beta.37" diff --git a/packages/gov-portal-helper/src/index.ts b/packages/gov-portal-helper/src/index.ts index e4cee531..92bca658 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"; @@ -812,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; }); diff --git a/packages/gov-portal-helper/tsconfig.json b/packages/gov-portal-helper/tsconfig.json index 9d679786..45e75ab2 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, diff --git a/packages/kosu-system-contracts/package.json b/packages/kosu-system-contracts/package.json index 52d6dc9b..aeddbfd7 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": { @@ -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/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 diff --git a/packages/kosu-system-contracts/tsconfig.json b/packages/kosu-system-contracts/tsconfig.json index c546fba7..a4afb826 100644 --- a/packages/kosu-system-contracts/tsconfig.json +++ b/packages/kosu-system-contracts/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "@kosu/tsc-config", "compilerOptions": { "outDir": "dist", "rootDir": ".", diff --git a/packages/kosu.js/package.json b/packages/kosu.js/package.json index 209d20e5..866397fa 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.7", "description": "JavaScript module for connecting with Kosu.", "main": "dist/index.js", "license": "MIT", @@ -26,7 +26,8 @@ "@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", "ethereumjs-abi": "^0.6.6", @@ -59,5 +60,8 @@ }, "publishConfig": { "access": "public" - } + }, + "files": [ + "dist/*" + ] } diff --git a/packages/kosu.js/tsconfig.json b/packages/kosu.js/tsconfig.json index 893deefc..07340f23 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", diff --git a/packages/tsc-config/package.json b/packages/tsc-config/package.json index 3595f76b..39753de7 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.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", @@ -9,5 +9,8 @@ "license": "MIT", "publishConfig": { "access": "public" - } + }, + "files": [ + "tsconfig.json" + ] } diff --git a/packages/tsc-config/tsconfig.json b/packages/tsc-config/tsconfig.json index fa5dd2a6..c7e27f93 100644 --- a/packages/tsc-config/tsconfig.json +++ b/packages/tsc-config/tsconfig.json @@ -1,24 +1,15 @@ { "compilerOptions": { "module": "commonjs", - "target": "es5", - "lib": ["es2017", "dom"], - "removeComments": true, - "resolveJsonModule": true, - "experimentalDecorators": true, + "target": "es2015", "downlevelIteration": true, "noImplicitReturns": true, "pretty": true, "skipLibCheck": true, + "esModuleInterop": true, + "resolveJsonModule": true, "typeRoots": ["node_modules/@types"], - "strict": true, - // These settings are required for TypeScript project references - "composite": true, - "declaration": true, - "declarationMap": true, - "sourceMap": true - }, - - "include": [], - "references": [{ "path": "../tslint-config/tslint.json" }] + "sourceMap": true, + "declaration": true + } } diff --git a/tsconfig.json b/tsconfig.json index 5cead8e0..c7e27f93 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,8 @@ "skipLibCheck": true, "esModuleInterop": true, "resolveJsonModule": true, - "typeRoots": ["node_modules/@types"] + "typeRoots": ["node_modules/@types"], + "sourceMap": true, + "declaration": true } } diff --git a/yarn.lock b/yarn.lock index 743269f1..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" @@ -3335,20 +3314,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"