Skip to content

Commit

Permalink
Merge pull request #465 from xpepermint/master
Browse files Browse the repository at this point in the history
Fix dependency inconsistencies
  • Loading branch information
xpepermint committed Mar 22, 2019
2 parents c6c8f6c + eb3c487 commit 076d3bb
Show file tree
Hide file tree
Showing 64 changed files with 1,211 additions and 762 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ Please follow the [TypeScript coding guidelines](https://github.com/Microsoft/Ty

The release manager will publish packages to NPM using these commands.

**WARNING**: We used `@0xcert/ethereum-utils` package before and now have version inconsistency problem. The package is released as version 1.2.0 and is not part of the Rush configuration until we reach the actual 1.2.0 version of the framework. Make sure you re-include that package (inside rush.json) after 1.2.0 is released!

```sh
$ rush version --bump --override-bump minor
$ rush publish --publish --include-all
Expand Down
1,473 changes: 815 additions & 658 deletions common/config/rush/npm-shrinkwrap.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"policyName": "patchAll",
"definitionName": "lockStepVersion",
"version": "1.0.0",
"version": "1.0.1",
"nextBump": "patch"
}
]
11 changes: 11 additions & 0 deletions packages/0xcert-cert/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@0xcert/cert",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/cert_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions packages/0xcert-cert/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - @0xcert/cert

This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Initial release*

8 changes: 4 additions & 4 deletions packages/0xcert-cert/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/cert",
"version": "1.0.0",
"version": "1.0.1",
"description": "Asset certification module for 0xcert Framework.",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down Expand Up @@ -72,8 +72,8 @@
"typescript": "^3.1.1"
},
"dependencies": {
"@0xcert/utils": "1.0.0",
"@0xcert/merkle": "1.0.0",
"@0xcert/conventions": "1.0.0"
"@0xcert/utils": "1.0.1",
"@0xcert/merkle": "1.0.1",
"@0xcert/conventions": "1.0.1"
}
}
11 changes: 11 additions & 0 deletions packages/0xcert-conventions/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@0xcert/conventions",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/conventions_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions packages/0xcert-conventions/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - @0xcert/conventions

This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Initial release*

4 changes: 2 additions & 2 deletions packages/0xcert-conventions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/conventions",
"version": "1.0.0",
"version": "1.0.1",
"description": "Module with implementation of all confirmed conventions.",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down Expand Up @@ -64,7 +64,7 @@
],
"license": "MIT",
"devDependencies": {
"@0xcert/utils": "1.0.0",
"@0xcert/utils": "1.0.1",
"@hayspec/cli": "^0.8.3",
"@hayspec/spec": "^0.8.3",
"ajv": "^6.7.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/0xcert-ethereum-asset-ledger/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@0xcert/ethereum-asset-ledger",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/ethereum-asset-ledger_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions packages/0xcert-ethereum-asset-ledger/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - @0xcert/ethereum-asset-ledger

This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Initial release*

14 changes: 7 additions & 7 deletions packages/0xcert-ethereum-asset-ledger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/ethereum-asset-ledger",
"version": "1.0.0",
"version": "1.0.1",
"description": "Asset ledger module for asset management on the Ethereum blockchain.",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down Expand Up @@ -67,8 +67,8 @@
],
"license": "MIT",
"devDependencies": {
"@0xcert/ethereum-sandbox": "1.0.0",
"@0xcert/ethereum-order-gateway": "1.0.0",
"@0xcert/ethereum-sandbox": "1.0.1",
"@0xcert/ethereum-order-gateway": "1.0.1",
"@specron/cli": "^0.5.6",
"@specron/spec": "^0.5.6",
"nyc": "^13.1.0",
Expand All @@ -79,9 +79,9 @@
"web3": "1.0.0-beta.37"
},
"dependencies": {
"@0xcert/ethereum-generic-provider": "1.0.0",
"@0xcert/ethereum-utils": "1.0.0",
"@0xcert/scaffold": "1.0.0",
"@0xcert/utils": "1.0.0"
"@0xcert/ethereum-generic-provider": "1.0.1",
"@0xcert/ethereum-utils": "1.2.0",
"@0xcert/scaffold": "1.0.1",
"@0xcert/utils": "1.0.1"
}
}
11 changes: 11 additions & 0 deletions packages/0xcert-ethereum-erc20-contracts/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@0xcert/ethereum-erc20-contracts",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/ethereum-erc20-contracts_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions packages/0xcert-ethereum-erc20-contracts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - @0xcert/ethereum-erc20-contracts

This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Initial release*

4 changes: 2 additions & 2 deletions packages/0xcert-ethereum-erc20-contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/ethereum-erc20-contracts",
"version": "1.0.0",
"version": "1.0.1",
"description": "Smart contract implementation of the ERC-20 standard on the Ethereum blockchain.",
"scripts": {
"build": "npm run clean && npx specron compile && npx tsc",
Expand Down Expand Up @@ -63,7 +63,7 @@
],
"license": "MIT",
"devDependencies": {
"@0xcert/ethereum-utils-contracts": "1.0.0",
"@0xcert/ethereum-utils-contracts": "1.0.1",
"@specron/cli": "^0.5.6",
"@specron/spec": "^0.5.6",
"solc": "0.5.6",
Expand Down
6 changes: 6 additions & 0 deletions packages/0xcert-ethereum-erc721-contracts/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "@0xcert/ethereum-erc721-contracts",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/ethereum-erc721-contracts_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
},
{
"version": "1.0.0",
"tag": "@0xcert/ethereum-erc721-contracts_v1.0.0",
Expand Down
7 changes: 6 additions & 1 deletion packages/0xcert-ethereum-erc721-contracts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log - @0xcert/ethereum-erc721-contracts

This log was last generated on Thu, 22 Nov 2018 00:51:03 GMT and should not be manually modified.
This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Version update only*

## 1.0.0
Thu, 22 Nov 2018 00:51:03 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/0xcert-ethereum-erc721-contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/ethereum-erc721-contracts",
"version": "1.0.0",
"version": "1.0.1",
"description": "Smart contract implementation of the ERC-721 standard on the Ethereum blockchain.",
"scripts": {
"build": "npm run clean && npx specron compile && npx tsc",
Expand Down Expand Up @@ -63,7 +63,7 @@
],
"license": "MIT",
"devDependencies": {
"@0xcert/ethereum-utils-contracts": "1.0.0",
"@0xcert/ethereum-utils-contracts": "1.0.1",
"@specron/cli": "^0.5.6",
"@specron/spec": "^0.5.6",
"solc": "0.5.6",
Expand Down
11 changes: 11 additions & 0 deletions packages/0xcert-ethereum-generic-provider/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@0xcert/ethereum-generic-provider",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/ethereum-generic-provider_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions packages/0xcert-ethereum-generic-provider/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - @0xcert/ethereum-generic-provider

This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Initial release*

8 changes: 4 additions & 4 deletions packages/0xcert-ethereum-generic-provider/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/ethereum-generic-provider",
"version": "1.0.0",
"version": "1.0.1",
"description": "Basic implementation of communication provider for the Ethereum blockchain.",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down Expand Up @@ -67,7 +67,7 @@
],
"license": "MIT",
"devDependencies": {
"@0xcert/ethereum-sandbox": "1.0.0",
"@0xcert/ethereum-sandbox": "1.0.1",
"@types/node": "^10.12.24",
"@specron/cli": "^0.5.6",
"@specron/spec": "^0.5.6",
Expand All @@ -80,8 +80,8 @@
"web3": "1.0.0-beta.37"
},
"dependencies": {
"@0xcert/ethereum-utils": "1.0.0",
"@0xcert/scaffold": "1.0.0",
"@0xcert/ethereum-utils": "1.2.0",
"@0xcert/scaffold": "1.0.1",
"events": "^3.0.0"
}
}
11 changes: 11 additions & 0 deletions packages/0xcert-ethereum-http-provider/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@0xcert/ethereum-http-provider",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/ethereum-http-provider_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions packages/0xcert-ethereum-http-provider/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - @0xcert/ethereum-http-provider

This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Initial release*

8 changes: 4 additions & 4 deletions packages/0xcert-ethereum-http-provider/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/ethereum-http-provider",
"version": "1.0.0",
"version": "1.0.1",
"description": "Implementation of HTTP communication provider for the Ethereum blockchain.",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down Expand Up @@ -67,7 +67,7 @@
],
"license": "MIT",
"devDependencies": {
"@0xcert/ethereum-sandbox": "1.0.0",
"@0xcert/ethereum-sandbox": "1.0.1",
"@specron/cli": "^0.5.6",
"@specron/spec": "^0.5.6",
"nyc": "^13.1.0",
Expand All @@ -78,7 +78,7 @@
"web3": "1.0.0-beta.37"
},
"dependencies": {
"@0xcert/ethereum-generic-provider": "1.0.0",
"@0xcert/utils": "1.0.0"
"@0xcert/ethereum-generic-provider": "1.0.1",
"@0xcert/utils": "1.0.1"
}
}
11 changes: 11 additions & 0 deletions packages/0xcert-ethereum-metamask-provider/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@0xcert/ethereum-metamask-provider",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/ethereum-metamask-provider_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
}
]
}
9 changes: 9 additions & 0 deletions packages/0xcert-ethereum-metamask-provider/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Change Log - @0xcert/ethereum-metamask-provider

This log was last generated on Fri, 22 Mar 2019 09:48:00 GMT and should not be manually modified.

## 1.0.1
Fri, 22 Mar 2019 09:48:00 GMT

*Initial release*

6 changes: 3 additions & 3 deletions packages/0xcert-ethereum-metamask-provider/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@0xcert/ethereum-metamask-provider",
"version": "1.0.0",
"version": "1.0.1",
"description": "Implementation of MetaMask communication provider for the Ethereum blockchain.",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down Expand Up @@ -67,7 +67,7 @@
],
"license": "MIT",
"devDependencies": {
"@0xcert/ethereum-sandbox": "1.0.0",
"@0xcert/ethereum-sandbox": "1.0.1",
"@specron/cli": "^0.5.6",
"@specron/spec": "^0.5.6",
"nyc": "^13.1.0",
Expand All @@ -78,6 +78,6 @@
"web3": "1.0.0-beta.37"
},
"dependencies": {
"@0xcert/ethereum-generic-provider": "1.0.0"
"@0xcert/ethereum-generic-provider": "1.0.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"name": "@0xcert/ethereum-order-gateway-contracts",
"entries": [
{
"version": "1.0.1",
"tag": "@0xcert/ethereum-order-gateway-contracts_v1.0.1",
"date": "Fri, 22 Mar 2019 09:48:00 GMT",
"comments": {}
},
{
"version": "1.0.0",
"tag": "@0xcert/ethereum-order-gateway-contracts_v1.0.0",
Expand Down

0 comments on commit 076d3bb

Please sign in to comment.