aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-07-02 22:20:34 +0800
committerGitHub <noreply@github.com>2018-07-02 22:20:34 +0800
commitd247d72e3e8fb17e8147dc417637e9cc9fd9a0ba (patch)
treee6a85787f58ee1ad7e0a5e1ba5ce1c2497090bbb
parentd861caca23cd87d162c0d4be62c04d9842c6b84f (diff)
parent50957e1d29674e8cb5e451ec576899ba8c15dde2 (diff)
downloaddexon-0x-contracts-d247d72e3e8fb17e8147dc417637e9cc9fd9a0ba.tar.gz
dexon-0x-contracts-d247d72e3e8fb17e8147dc417637e9cc9fd9a0ba.tar.zst
dexon-0x-contracts-d247d72e3e8fb17e8147dc417637e9cc9fd9a0ba.zip
Merge pull request #803 from 0xProject/fix/publishing/remote-tag-removal
Small publish fixes
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/abi-gen/package.json2
-rw-r--r--packages/base-contract/package.json2
-rw-r--r--packages/contract-wrappers/package.json2
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/dev-utils/package.json2
-rw-r--r--packages/ethereum-types/package.json2
-rw-r--r--packages/fill-scenarios/CHANGELOG.json2
-rw-r--r--packages/fill-scenarios/package.json2
-rw-r--r--packages/json-schemas/CHANGELOG.json9
-rw-r--r--packages/migrations/package.json2
-rw-r--r--packages/monorepo-scripts/CHANGELOG.json9
-rw-r--r--packages/monorepo-scripts/src/prepublish_checks.ts12
-rw-r--r--packages/monorepo-scripts/src/utils/utils.ts27
-rw-r--r--packages/order-utils/CHANGELOG.json6
-rw-r--r--packages/order-utils/package.json2
-rw-r--r--packages/order-watcher/package.json4
-rw-r--r--packages/sol-compiler/package.json2
-rw-r--r--packages/sol-cov/package.json2
-rw-r--r--packages/subproviders/package.json2
-rw-r--r--packages/testnet-faucets/package.json2
-rw-r--r--packages/types/CHANGELOG.json8
-rw-r--r--packages/types/package.json2
-rw-r--r--packages/typescript-typings/package.json2
-rw-r--r--packages/utils/CHANGELOG.json13
-rw-r--r--packages/utils/package.json4
-rw-r--r--packages/web3-wrapper/package.json2
-rw-r--r--yarn.lock7
28 files changed, 80 insertions, 55 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 12fbf0347..1b41a7cf2 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -110,7 +110,7 @@
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"ethers": "3.0.22",
"lodash": "^4.17.4"
},
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index 9d3c6d00d..dadf1dbfe 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -29,7 +29,7 @@
"dependencies": {
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"chalk": "^2.3.0",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index ecbde213b..3b9383033 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -43,7 +43,7 @@
"typescript": "2.7.1"
},
"dependencies": {
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index fe98e08bf..1b4835be6 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -86,7 +86,7 @@
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"ethereumjs-blockstream": "^2.0.6",
"ethereumjs-util": "^5.1.1",
"ethers": "3.0.22",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index e0e82adc7..01f2320d0 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -80,7 +80,7 @@
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-util": "^5.1.1",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index e62075054..621053ed7 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -48,7 +48,7 @@
"@0xproject/subproviders": "^0.10.4",
"@0xproject/types": "^0.8.1",
"@0xproject/utils": "^0.7.1",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/web3-wrapper": "^0.7.1",
"lodash": "^4.17.4",
diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json
index a937f6ad1..9d4930826 100644
--- a/packages/ethereum-types/package.json
+++ b/packages/ethereum-types/package.json
@@ -1,6 +1,6 @@
{
"name": "ethereum-types",
- "version": "0.0.1",
+ "version": "0.0.2",
"engines": {
"node": ">=6.12"
},
diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json
index ec9111ebb..822f8d5d5 100644
--- a/packages/fill-scenarios/CHANGELOG.json
+++ b/packages/fill-scenarios/CHANGELOG.json
@@ -1,6 +1,6 @@
[
{
- "version": "0.1.0",
+ "version": "1.0.0",
"changes": [
{
"note": "Make fill-scenarios compatible with V2 of 0x protocol",
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index 883300fa0..91024ed34 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -44,7 +44,7 @@
"@0xproject/base-contract": "^0.3.4",
"@0xproject/order-utils": "^1.0.0",
"@0xproject/types": "1.0.0",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json
index bb9cd3cd2..2b37e1836 100644
--- a/packages/json-schemas/CHANGELOG.json
+++ b/packages/json-schemas/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "1.0.0",
+ "changes": [
+ {
+ "note": "Update schemas for V2",
+ "pr": 615
+ }
+ ]
+ },
+ {
"timestamp": 1529397769,
"version": "0.8.1",
"changes": [
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 57bf0875a..f4190a771 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -67,7 +67,7 @@
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"@ledgerhq/hw-app-eth": "^4.3.0",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"ethers": "3.0.22",
"lodash": "^4.17.4",
"web3-provider-engine": "^14.0.4"
diff --git a/packages/monorepo-scripts/CHANGELOG.json b/packages/monorepo-scripts/CHANGELOG.json
index a1dda0176..781704a8e 100644
--- a/packages/monorepo-scripts/CHANGELOG.json
+++ b/packages/monorepo-scripts/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "0.2.2",
+ "changes": [
+ {
+ "note": "Fix git remote tag removal step & add an additional sanity assertion",
+ "pr": 803
+ }
+ ]
+ },
+ {
"timestamp": 1529397769,
"version": "0.2.1",
"changes": [
diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index 1c4ee1fc6..3b4ff9082 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -34,17 +34,17 @@ async function checkGitTagsForNextVersionAndDeleteIfExistAsync(
const packageLocation = lernaPackage.location;
const nextVersion = await utils.getNextPackageVersionAsync(currentVersion, packageName, packageLocation);
- const localTagVersions = localTagVersionsByPackageName[packageName];
- if (_.includes(localTagVersions, nextVersion)) {
- const tagName = `${packageName}@${nextVersion}`;
- await utils.removeLocalTagAsync(tagName);
- }
-
const remoteTagVersions = remoteTagVersionsByPackageName[packageName];
if (_.includes(remoteTagVersions, nextVersion)) {
const tagName = `:refs/tags/${packageName}@${nextVersion}`;
await utils.removeRemoteTagAsync(tagName);
}
+
+ const localTagVersions = localTagVersionsByPackageName[packageName];
+ if (_.includes(localTagVersions, nextVersion)) {
+ const tagName = `${packageName}@${nextVersion}`;
+ await utils.removeLocalTagAsync(tagName);
+ }
}
}
diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts
index 20bc57bae..f819ab6f1 100644
--- a/packages/monorepo-scripts/src/utils/utils.ts
+++ b/packages/monorepo-scripts/src/utils/utils.ts
@@ -44,6 +44,9 @@ export const utils = {
nextVersionIfValid = semver.inc(currentVersion, 'patch');
}
const lastEntry = changelog[0];
+ if (semver.gt(currentVersion, lastEntry.version)) {
+ throw new Error(`Package.json version cannot be greater then last CHANGELOG entry. Check: ${packageName}`);
+ }
nextVersionIfValid = semver.eq(lastEntry.version, currentVersion)
? semver.inc(currentVersion, 'patch')
: lastEntry.version;
@@ -100,19 +103,23 @@ export const utils = {
return tagVersionByPackageName;
},
async removeLocalTagAsync(tagName: string): Promise<void> {
- const result = await execAsync(`git tag -d ${tagName}`, {
- cwd: constants.monorepoRootPath,
- });
- if (!_.isEmpty(result.stderr)) {
- throw new Error(`Failed to delete local git tag. Got err: ${result.stderr}`);
+ try {
+ await execAsync(`git tag -d ${tagName}`, {
+ cwd: constants.monorepoRootPath,
+ });
+ } catch (err) {
+ throw new Error(`Failed to delete local git tag. Got err: ${err}`);
}
+ this.log(`Removed local tag: ${tagName}`);
},
async removeRemoteTagAsync(tagName: string): Promise<void> {
- const result = await execAsync(`git push origin ${tagName}`, {
- cwd: constants.monorepoRootPath,
- });
- if (!_.isEmpty(result.stderr)) {
- throw new Error(`Failed to delete remote git tag. Got err: ${result.stderr}`);
+ try {
+ await execAsync(`git push origin ${tagName}`, {
+ cwd: constants.monorepoRootPath,
+ });
+ } catch (err) {
+ throw new Error(`Failed to delete remote git tag. Got err: ${err}`);
}
+ this.log(`Removed remote tag: ${tagName}`);
},
};
diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json
index a1f199793..199ce2173 100644
--- a/packages/order-utils/CHANGELOG.json
+++ b/packages/order-utils/CHANGELOG.json
@@ -1,8 +1,12 @@
[
{
- "version": "0.1.0",
+ "version": "1.0.0",
"changes": [
{
+ "note": "Refactor to work with V2 of 0x protocol",
+ "pr": 636
+ },
+ {
"note": "Export parseECSignature method",
"pr": 684
}
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index e3c81de44..97b08c3d3 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -82,7 +82,7 @@
"@0xproject/web3-wrapper": "^0.7.1",
"@types/node": "^8.0.53",
"bn.js": "^4.11.8",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-util": "^5.1.1",
"ethers": "3.0.22",
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 3335713a3..40613ea96 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -85,9 +85,9 @@
"@0xproject/order-utils": "^0.0.7",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
- "@0xproject/utils": "^0.7.3",
+ "@0xproject/utils": "^0.7.2",
"@0xproject/web3-wrapper": "^0.7.1",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"bintrees": "^1.0.2",
"ethers": "3.0.22",
"lodash": "^4.17.4"
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 98568c270..2c1fa41b3 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -84,7 +84,7 @@
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"@types/yargs": "^11.0.0",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"chalk": "^2.3.0",
"ethereumjs-util": "^5.1.1",
"isomorphic-fetch": "^2.2.1",
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 3d1b7f900..483500ca9 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -56,7 +56,7 @@
"@0xproject/utils": "^0.7.1",
"@0xproject/web3-wrapper": "^0.7.1",
"@0xproject/dev-utils": "^0.4.4",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"ethereumjs-util": "^5.1.1",
"glob": "^7.1.2",
"istanbul": "^0.4.5",
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 31b6ffed6..e87d7bf94 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -46,7 +46,7 @@
"@0xproject/utils": "^0.7.1",
"@ledgerhq/hw-app-eth": "^4.3.0",
"@ledgerhq/hw-transport-u2f": "^4.3.0",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"bip39": "^2.5.0",
"bn.js": "^4.11.8",
"ethereumjs-tx": "^1.3.5",
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index 712ac6795..fdd71656a 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -36,7 +36,7 @@
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/lodash": "4.14.104",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"awesome-typescript-loader": "^3.1.3",
"gulp": "^3.9.1",
"make-promises-safe": "^1.1.0",
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json
index 40197ab92..a0be5d7fe 100644
--- a/packages/types/CHANGELOG.json
+++ b/packages/types/CHANGELOG.json
@@ -1,5 +1,13 @@
[
{
+ "version": "1.0.0",
+ "changes": [
+ {
+ "notes": "Updated types for V2 of 0x protocol"
+ }
+ ]
+ },
+ {
"timestamp": 1529397769,
"version": "0.8.1",
"changes": [
diff --git a/packages/types/package.json b/packages/types/package.json
index 0d5e308b9..f79b558fa 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -35,7 +35,7 @@
"dependencies": {
"@types/node": "^8.0.53",
"bignumber.js": "~4.1.0",
- "ethereum-types": "^0.0.1"
+ "ethereum-types": "^0.0.2"
},
"publishConfig": {
"access": "public"
diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json
index 3ba7c10ba..e3f226294 100644
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -25,7 +25,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/typescript-typings#readme",
"dependencies": {
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"bignumber.js": "~4.1.0"
},
"devDependencies": {
diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json
index c6736dc4d..a27216be7 100644
--- a/packages/utils/CHANGELOG.json
+++ b/packages/utils/CHANGELOG.json
@@ -1,14 +1,5 @@
[
{
- "version": "0.7.3",
- "changes": [
- {
- "note": "Fixes uncaught Error in abi_decoder",
- "pr": 763
- }
- ]
- },
- {
"version": "0.7.2",
"changes": [
{
@@ -17,6 +8,10 @@
{
"note": "Add logUtils.warn",
"pr": 589
+ },
+ {
+ "note": "Fixes uncaught Error in abi_decoder",
+ "pr": 763
}
]
},
diff --git a/packages/utils/package.json b/packages/utils/package.json
index f4f39956c..f10594de5 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/utils",
- "version": "0.7.3",
+ "version": "0.7.2",
"engines": {
"node": ">=6.12"
},
@@ -35,7 +35,7 @@
"typescript": "2.7.1"
},
"dependencies": {
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.2",
"@types/node": "^8.0.53",
"ethereumjs-util": "^5.1.1",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 5f7f2cb00..05d195bb9 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -66,7 +66,7 @@
"dependencies": {
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
- "ethereum-types": "^0.0.1",
+ "ethereum-types": "^0.0.2",
"ethers": "3.0.22",
"lodash": "^4.17.4",
"web3": "^0.20.0"
diff --git a/yarn.lock b/yarn.lock
index fae380f11..a25c55085 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4071,13 +4071,6 @@ ethereum-common@^0.0.18:
version "0.0.18"
resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
-ethereum-types@^0.0.2:
- version "0.0.2"
- resolved "https://registry.npmjs.org/ethereum-types/-/ethereum-types-0.0.2.tgz#6ef6faf46a24697cbf66b6c8a0ecf2095ce58c38"
- dependencies:
- "@types/node" "^8.0.53"
- bignumber.js "~4.1.0"
-
ethereumjs-abi@0.6.5, ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
version "0.6.5"
resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf"