Update Commercial Paper to v2.0 Lifecycle #109

mbwhite · 2020-01-27T10:18:02Z

JIRA = https://jira.hyperledger.org/browse/FAB-17457

nikhil550

I was able to use the new lifecycle commands, but was not able to use the scripts that set the env variables. I have started writing the tutorial using env variables instead. Can switch over if the scripts work. Not that the script also needs to set a path the the config and binary folders in the fabric samples. Otherwise I was getting an order version of the peer binaries.

commercial-paper/README.md

commercial-paper/roles/network-starter.sh

commercial-paper/README.md

commercial-paper/roles/network-starter.sh

commercial-paper/README.md

nikhil550 · 2020-02-04T03:59:12Z

In the process of updating the tutorial, I am finding that we ask users to go back and forth between a lot of terminals. As part of making it easier on the user, I think we need to move the scripts setting the environment variables to to the organizatation/magnetocorp and organizations/digibank folder respectively. That way users can change into those folders and set the environment without any additional changes. That would also allow you to more the network starter and network stop commands out of the roles folder and into the main commercial paper repo.

I made those changes on my own branch (updated after latest run through): https://github.com/nikhil550/fabric-samples/tree/update-cp-lifecycle/commercial-paper

.gitignore

commercial-paper/README.md

nikhil550 · 2020-02-03T19:23:44Z

commercial-paper/README.md

 cd fabric-samples/commercial-paper
 ```

-This `README.md` file is in the `commercial-paper` directory, the source code for client applications and the contracts ins in the `organization` directory, and some helper scripts are in the `roles` directory.
-
 ## Running the Infrastructure

 In one console window, run the `./roles/network-starter.sh` script; this will start the basic infrastructure and also start monitoring all the docker containers.


Remove "and also start monitoring all the docker containers." since the script no longer does this.

nikhil550 · 2020-02-03T19:56:25Z

commercial-paper/README.md

-docker exec cliMagnetoCorp peer chaincode invoke -o orderer.example.com:7050 --channelID mychannel --name papercontract -c '{"Args":["org.papernet.commercialpaper:instantiate"]}' --waitForEvent
+Then when you package the contract, use this variation of the command to specify language
+```
+peer lifecycle chaincode package cp.tar.gz --lang golang --path /opt/gopath/src/github.com/contract-go --label cp_0


The path should be ./contract-go

nikhil550 · 2020-02-03T20:01:50Z

commercial-paper/README.md

+
+```
+cd fabric-samples/commercial-paper
+source <(./roles/magnetocorp.sh)


I got this to work, but I need to use the command source roles/magnetcorp.sh instead, and make some changes to the script. I am on mac.

nikhil550 · 2020-02-03T20:01:59Z

commercial-paper/README.md

-### Install and Instantiate the contract
+```
+cd fabric-samples/commercial-paper
+source <(./roles/digibank.sh)


Same as above.

nikhil550 · 2020-02-03T20:03:07Z

commercial-paper/roles/magnetocorp.sh


-echo "Suggest that you change to this dir> cd ${DIR}/organization/magnetocorp/"
+env | sort | comm -1 -3 /tmp/env.orig - | sed -E 's/(.*)=(.*)/export \1="\2"/'
+rm /tmp/env.orig


Needed to add this line at the bottom to get this to work.
cd "${DIR}/../commercial-paper"

nikhil550 · 2020-02-03T20:03:28Z

commercial-paper/roles/magnetocorp.sh

+parsePeerConnectionParameters 1 2
+export PEER_PARMS="${PEER_CONN_PARMS##*( )}"
+# set the fabric config path
+export FABRIC_CFG_PATH="${DIR}/../config"


Needed to add the path directory to this script to get it to work
export PATH="${DIR}/../bin:${PWD}:$PATH"

nikhil550 · 2020-02-03T20:07:51Z

commercial-paper/README.md

-`fabric-samples/commercial-paper/` directory
-
-`./roles/digibank.sh`
+This is running as *Digibank*; 

 You can now run the applications to buy and redeem the paper. Change to either the
 `commercial-paper/organization/digibank/application` directory or `commercial-paper/organization/digibank/application-java`


I would say something about cleaning the network at the bottom

Clean up

When you are finished using the Fabric test network and the commercial paper smart contract and applications, you can use the following command to clean up the network:

./roles/network-clean.sh

nikhil550 · 2020-02-04T21:09:45Z

commercial-paper/roles/network-clean.sh

+# Exit on first error, print all commands.
+set -ev
+set -o pipefail
+


I would remove the identity artifacts as well
rm -rf organization/digibank/identity/user/balaji/wallet/*
rm -rf organization/magnetocorp/identity/user/isabella/wallet/*

mbwhite · 2020-02-05T08:23:43Z

In the process of updating the tutorial, I am finding that we ask users to go back and forth between a lot of terminals. As part of making it easier on the user, I think we need to move the scripts setting the environment variables to to the organizatation/magnetocorp and organizations/digibank folder respectively. That way users can change into those folders and set the environment without any additional changes. That would also allow you to more the network starter and network stop commands out of the roles folder and into the main commercial paper repo.

I made those changes on my own branch (updated after latest run through): https://github.com/nikhil550/fabric-samples/tree/update-cp-lifecycle/commercial-paper

Yes agree with moving those

nikhil550 · 2020-02-06T20:01:45Z

commercial-paper/network-clean.sh

@@ -14,16 +14,13 @@ set -o pipefail
 # Where am I?
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"


This should be

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

nikhil550 · 2020-02-06T20:03:04Z

commercial-paper/network-clean.sh

-docker kill cliDigiBank cliMagnetoCorp logspout || true
-./teardown.sh || true
-./start.sh || _exit "Failed to start Fabric"
+cd "${DIR}/../test-network/"



Clean the wallets too

rm -rf organization/digibank/identity/user/balaji/wallet/* rm -rf organization/magnetocorp/identity/user/isabella/wallet/*

nikhil550 · 2020-02-06T20:03:27Z

commercial-paper/network-starter.sh

+set -o pipefail
+
+# Where am I?
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"


should be

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

- move to using the test-network - updating README.md to include commands to use v2.0 lifecylce - update Contracts and Applications to use 2.0 libraries Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

sstone1

LGTM

nikhil550 · 2020-02-07T18:02:48Z

Corresponding tutorial update: hyperledger/fabric#610

pamandrejko · 2020-02-10T20:01:53Z

@mbwhite When I checkout this PR and run ./network-starter.sh, it fails with:

set -o pipefail

# Where am I?
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd 
 dirname "${BASH_SOURCE[0]}" 

export FABRIC_CFG_PATH="${DIR}/../config"

cd "${DIR}/../test-network/"
./network-starter.sh: line 19: cd: /Users/pamaibm.com/fabric-samples/fabric-samples/../test-network/: No such file or directory

Nik says this line:
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

needs to be
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

mbwhite requested review from christo4ferris, denyeart, harrisob, jyellick, lehors, mastersingh24 and sstone1 as code owners January 27, 2020 10:18

mbwhite force-pushed the update-cp-lifecycle branch 12 times, most recently from 89a6d18 to 4820b3f Compare January 29, 2020 10:26

mbwhite changed the title ~~Update Commercial Paper to v2.0 Lifecycle... (WIP - Do Not Merge)~~ Update Commercial Paper to v2.0 Lifecycle Jan 29, 2020

mbwhite changed the title ~~Update Commercial Paper to v2.0 Lifecycle~~ Update Commercial Paper to v2.0 Lifecycle (only merge when docs are ready) Jan 29, 2020

nikhil550 reviewed Jan 31, 2020

View reviewed changes

nikhil550 mentioned this pull request Jan 31, 2020

[FAB-14679] Update commercial paper tutorial for new chaincode lifecycle hyperledger/fabric#610

Merged

mbwhite force-pushed the update-cp-lifecycle branch 2 times, most recently from 1ff34a7 to d39400b Compare February 3, 2020 16:23

nikhil550 reviewed Feb 4, 2020

View reviewed changes

mbwhite force-pushed the update-cp-lifecycle branch from d39400b to 9b5eea7 Compare February 5, 2020 08:49

mbwhite force-pushed the update-cp-lifecycle branch 2 times, most recently from fd33c6e to 6056e67 Compare February 5, 2020 11:35

mbwhite changed the title ~~Update Commercial Paper to v2.0 Lifecycle (only merge when docs are ready)~~ Update Commercial Paper to v2.0 Lifecycle Feb 6, 2020

mbwhite force-pushed the update-cp-lifecycle branch from 6056e67 to b5fa697 Compare February 6, 2020 14:13

nikhil550 approved these changes Feb 6, 2020

View reviewed changes

mbwhite force-pushed the update-cp-lifecycle branch from b5fa697 to ff32b29 Compare February 7, 2020 10:49

WIP Commercial Paper -> Test network

8f9341d

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

mbwhite force-pushed the update-cp-lifecycle branch from ff32b29 to a3a433d Compare February 7, 2020 15:33

Update Commercial Paper to v2.0 lifecycle

237a715

- move to using the test-network - updating README.md to include commands to use v2.0 lifecylce - update Contracts and Applications to use 2.0 libraries Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

mbwhite force-pushed the update-cp-lifecycle branch from a3a433d to 237a715 Compare February 7, 2020 15:50

sstone1 approved these changes Feb 7, 2020

View reviewed changes

mbwhite merged commit b89ee34 into hyperledger:master Feb 11, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Commercial Paper to v2.0 Lifecycle #109

Update Commercial Paper to v2.0 Lifecycle #109

mbwhite commented Jan 27, 2020 •

edited

Loading

nikhil550 left a comment

nikhil550 commented Feb 4, 2020 •

edited

Loading

nikhil550 Feb 3, 2020

nikhil550 Feb 3, 2020

nikhil550 Feb 3, 2020

nikhil550 Feb 3, 2020

nikhil550 Feb 3, 2020

nikhil550 Feb 3, 2020

nikhil550 Feb 3, 2020

nikhil550 Feb 4, 2020

mbwhite commented Feb 5, 2020

nikhil550 Feb 6, 2020

nikhil550 Feb 6, 2020

nikhil550 Feb 6, 2020

sstone1 left a comment

nikhil550 commented Feb 7, 2020

pamandrejko commented Feb 10, 2020 •

edited

Loading

		@@ -14,16 +14,13 @@ set -o pipefail
		# Where am I?
		DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

Update Commercial Paper to v2.0 Lifecycle #109

Update Commercial Paper to v2.0 Lifecycle #109

Conversation

mbwhite commented Jan 27, 2020 • edited Loading

nikhil550 left a comment

Choose a reason for hiding this comment

nikhil550 commented Feb 4, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Clean up

Choose a reason for hiding this comment

mbwhite commented Feb 5, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sstone1 left a comment

Choose a reason for hiding this comment

nikhil550 commented Feb 7, 2020

pamandrejko commented Feb 10, 2020 • edited Loading

mbwhite commented Jan 27, 2020 •

edited

Loading

nikhil550 commented Feb 4, 2020 •

edited

Loading

pamandrejko commented Feb 10, 2020 •

edited

Loading