From eb9a47f361a8ffa0c666061a93749c9fca95cc9e Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Mon, 18 Sep 2017 09:35:28 +0100 Subject: [PATCH 1/2] update version and engine version --- lerna.json | 2 +- package.json | 2 +- packages/animaltracking-network/package.json | 6 +-- packages/basic-sample-network/package.json | 4 +- packages/bond-network/package.json | 4 +- packages/carauction-network/package.json | 4 +- packages/digitalproperty-network/package.json | 4 +- packages/marbles-network/package.json | 4 +- packages/perishable-network/package.json | 4 +- packages/pii-network/package.json | 4 +- packages/trade-network/README.md | 37 ++++++++----------- packages/trade-network/package.json | 4 +- .../vehicle-lifecycle-network/package.json | 4 +- 13 files changed, 39 insertions(+), 44 deletions(-) diff --git a/lerna.json b/lerna.json index 936af39..5867277 100644 --- a/lerna.json +++ b/lerna.json @@ -3,7 +3,7 @@ "packages": [ "packages/*" ], - "version": "0.1.8", + "version": "0.1.9", "hoist": true, "nohoist": "*-model" } diff --git a/package.json b/package.json index 1523ec9..e9fac3d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "name": "sample-networks", "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.", - "version": "0.1.8", + "version": "0.1.9", "main": "index.js", "private": true, "scripts": { diff --git a/packages/animaltracking-network/package.json b/packages/animaltracking-network/package.json index 7345d56..09d58e9 100644 --- a/packages/animaltracking-network/package.json +++ b/packages/animaltracking-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "animaltracking-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Animal Tracking network based on UK DEFRA regulations", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/animaltracking-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/animaltracking-network/networkimageanimated.svg", @@ -36,8 +36,8 @@ "devDependencies": { "browserfs": "^1.2.0", "chai": "^3.5.0", - "composer-connector-embedded": "^0.11.0", "composer-cli": "^0.11.0", + "composer-connector-embedded": "^0.11.0", "eslint": "^3.6.1", "jsdoc": "^3.4.1", "license-check": "^1.1.5", diff --git a/packages/basic-sample-network/package.json b/packages/basic-sample-network/package.json index cb230f1..153f717 100644 --- a/packages/basic-sample-network/package.json +++ b/packages/basic-sample-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "basic-sample-network", - "version": "0.1.8", + "version": "0.1.9", "description": "The Hello World of Hyperledger Composer samples", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/basic-sample-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/basic-sample-network/networkimageanimated.svg", diff --git a/packages/bond-network/package.json b/packages/bond-network/package.json index feda780..4a9cd6c 100644 --- a/packages/bond-network/package.json +++ b/packages/bond-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "bond-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Bond Reference Data Sharing Business Network", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/bond-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/bond-network/networkimageanimated.svg", diff --git a/packages/carauction-network/package.json b/packages/carauction-network/package.json index 0697e25..9cee3f7 100644 --- a/packages/carauction-network/package.json +++ b/packages/carauction-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "carauction-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Car Auction Business Network", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/carauction-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/carauction-network/networkimageanimated.svg", diff --git a/packages/digitalproperty-network/package.json b/packages/digitalproperty-network/package.json index a87446d..bb17b7a 100644 --- a/packages/digitalproperty-network/package.json +++ b/packages/digitalproperty-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "digitalproperty-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Digital Property Network", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/digitalproperty-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/digitalproperty-network/networkimageanimated.svg", diff --git a/packages/marbles-network/package.json b/packages/marbles-network/package.json index db1449d..277f608 100644 --- a/packages/marbles-network/package.json +++ b/packages/marbles-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "marbles-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Marble Trading Network", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/marbles-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/marbles-network/networkimageanimated.svg", diff --git a/packages/perishable-network/package.json b/packages/perishable-network/package.json index dadda3f..9af3406 100644 --- a/packages/perishable-network/package.json +++ b/packages/perishable-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0 " }, "name": "perishable-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Shipping Perishable Goods Business Network", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/perishable-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/perishable-network/networkimageanimated.svg", diff --git a/packages/pii-network/package.json b/packages/pii-network/package.json index c794492..25256cb 100644 --- a/packages/pii-network/package.json +++ b/packages/pii-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "pii-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Business Network to illustrate using Access Control over Personally Identifiable Information (PII).", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/pii-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/pii-network/networkimageanimated.svg", diff --git a/packages/trade-network/README.md b/packages/trade-network/README.md index 5b3405e..b477224 100644 --- a/packages/trade-network/README.md +++ b/packages/trade-network/README.md @@ -5,59 +5,54 @@ This business network defines: **Participant** -`Trader` +`Trader`, `Regulator` **Asset** `Commodity` **Transaction(s)** -`Transaction` +`Trade`, `BulkTrade`, `RemoveHighQuantityCommodities` + +For test purposes `_demoSetup` **Event** `TradeNotification ` To test this Business Network Definition in the **Test** tab: +Clck on **SubmitTransaction** and select the transaction to submit as `_demoSetup` +This will create two Traders, and a selection of assets. + Create two `Trader` participants: ``` { "$class": "org.acme.trading.Trader", - "tradeId": "TRADER1", - "firstName": "Jenny", - "lastName": "Jones" + "tradeId": "TRACY", + "firstName": "Tracy", + "lastName": "Trader" } ``` ``` { "$class": "org.acme.trading.Trader", - "tradeId": "TRADER2", - "firstName": "Amy", - "lastName": "Williams" + "tradeId": "TOM", + "firstName": "Tom", + "lastName": "Trader" } ``` -Create a `Commodity` asset: -``` -{ - "$class": "org.acme.trading.Commodity", - "tradingSymbol": "ABC", - "description": "Test commodity", - "mainExchange": "Euronext", - "quantity": 72.297, - "owner": "resource:org.acme.trading.Trader#TRADER1" -} -``` + Submit a `Trade` transaction: ``` { "$class": "org.acme.trading.Trade", - "commodity": "resource:org.acme.trading.Commodity#ABC", - "newOwner": "resource:org.acme.trading.Trader#TRADER2" + "commodity": "resource:org.acme.trading.Commodity#Ag", + "newOwner": "resource:org.acme.trading.Trader#TOM" } ``` diff --git a/packages/trade-network/package.json b/packages/trade-network/package.json index ff063b6..939eacd 100644 --- a/packages/trade-network/package.json +++ b/packages/trade-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "trade-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Commodities Trading Business Network", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/trade-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/trade-network/networkimageanimated.svg", diff --git a/packages/vehicle-lifecycle-network/package.json b/packages/vehicle-lifecycle-network/package.json index cd2e830..20ca024 100644 --- a/packages/vehicle-lifecycle-network/package.json +++ b/packages/vehicle-lifecycle-network/package.json @@ -1,9 +1,9 @@ { "engines": { - "composer": "^0.11.0 || ^0.12.0" + "composer": "^0.11.0 || ^0.12.0 || ^0.13.0" }, "name": "vehicle-lifecycle-network", - "version": "0.1.8", + "version": "0.1.9", "description": "Vehicle Lifecycle Network", "networkImage": "https://hyperledger.github.io/composer-sample-networks/packages/vehicle-lifecycle-network/networkimage.svg", "networkImageanimated": "https://hyperledger.github.io/composer-sample-networks/packages/vehicle-lifecycle-network/networkimageanimated.svg", From 40437dde99bce1c84049050703054b80989fd28f Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Mon, 18 Sep 2017 13:10:35 +0100 Subject: [PATCH 2/2] put back the original readme --- packages/trade-network/README.md | 37 ++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/packages/trade-network/README.md b/packages/trade-network/README.md index b477224..5b3405e 100644 --- a/packages/trade-network/README.md +++ b/packages/trade-network/README.md @@ -5,54 +5,59 @@ This business network defines: **Participant** -`Trader`, `Regulator` +`Trader` **Asset** `Commodity` **Transaction(s)** -`Trade`, `BulkTrade`, `RemoveHighQuantityCommodities` - -For test purposes `_demoSetup` +`Transaction` **Event** `TradeNotification ` To test this Business Network Definition in the **Test** tab: -Clck on **SubmitTransaction** and select the transaction to submit as `_demoSetup` -This will create two Traders, and a selection of assets. - Create two `Trader` participants: ``` { "$class": "org.acme.trading.Trader", - "tradeId": "TRACY", - "firstName": "Tracy", - "lastName": "Trader" + "tradeId": "TRADER1", + "firstName": "Jenny", + "lastName": "Jones" } ``` ``` { "$class": "org.acme.trading.Trader", - "tradeId": "TOM", - "firstName": "Tom", - "lastName": "Trader" + "tradeId": "TRADER2", + "firstName": "Amy", + "lastName": "Williams" } ``` +Create a `Commodity` asset: - +``` +{ + "$class": "org.acme.trading.Commodity", + "tradingSymbol": "ABC", + "description": "Test commodity", + "mainExchange": "Euronext", + "quantity": 72.297, + "owner": "resource:org.acme.trading.Trader#TRADER1" +} +``` Submit a `Trade` transaction: ``` { "$class": "org.acme.trading.Trade", - "commodity": "resource:org.acme.trading.Commodity#Ag", - "newOwner": "resource:org.acme.trading.Trader#TOM" + "commodity": "resource:org.acme.trading.Commodity#ABC", + "newOwner": "resource:org.acme.trading.Trader#TRADER2" } ```