Update Commercial Paper to v2.0 Lifecycle (#109)

* WIP Commercial Paper -> Test network Signed-off-by: Matthew B White <whitemat@uk.ibm.com> * Update Commercial Paper to v2.0 lifecycle - 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>
hyperledger · Feb 11, 2020 · b89ee34 · b89ee34
1 parent 4208644
commit b89ee34
Show file tree

Hide file tree

Showing 41 changed files with 4,099 additions and 1,010 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@
 .project
 # omit Go vendor directories
 vendor/
+.vscode
+.gradle
diff --git a/ci/commercialpaper-go.yml b/ci/commercialpaper-go.yml
@@ -9,24 +9,83 @@ steps:
  - script: go test ./...
  workingDirectory: commercial-paper/organization/digibank/contract-go
  displayName: Go unit test digibank
- - script: bash start.sh
- workingDirectory: basic-network
+
+ - script: |
+ go mod vendor
+ workingDirectory: commercial-paper/organization/magnetocorp/contract-go
+ - script: |
+ go mod vendor
+ workingDirectory: commercial-paper/organization/digibank/contract-go 
+
+ - script: |
+ echo $PATH
+ ls -l /usr/local/bin/peer
+ sudo tar xzvf /tmp/hyperledger-fabric-linux-amd64-latest.tar.gz -C ..
+ ./network.sh down
+ ./network.sh up createChannel -s couchdb -i 2.0.0-beta
+
+ # Copy the connection profiles so they are in the correct organizations. 
+ cp "./organizations/peerOrganizations/org1.example.com/connection-org1.yaml" "../commercial-paper/organization/digibank/gateway/"
+ cp "./organizations/peerOrganizations/org2.example.com/connection-org2.yaml" "../commercial-paper/organization/magnetocorp/gateway/"
+ workingDirectory: test-network
  displayName: Start Fabric
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
  - script: |
- docker-compose -f docker-compose.yml up -d cliMagnetoCorp
+ source <(./magnetocorp.sh)
+ peer lifecycle chaincode package cp.tar.gz --lang java --path ./contract-java --label cp_0
+ peer lifecycle chaincode install cp.tar.gz
 
- docker exec cliMagnetoCorp bash -c 'cd /opt/gopath/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp/contract-go && go mod vendor'
+ export PACKAGE_ID=$(peer lifecycle chaincode queryinstalled --output json | jq -r '.installed_chaincodes[0].package_id')
+ echo $PACKAGE_ID
 
- docker exec cliMagnetoCorp peer lifecycle chaincode package cp.tar.gz --lang golang --path github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp/contract-go --label cp_0
- docker exec cliMagnetoCorp peer lifecycle chaincode install cp.tar.gz
- export PACKAGE_ID=$(docker exec cliMagnetoCorp peer lifecycle chaincode queryinstalled 2>&1 | awk -F "[, ]+" '/Label: /{print $3}')
+ peer lifecycle chaincode approveformyorg --orderer localhost:7050 --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel \
+ --name papercontract \
+ -v 0 \
+ --package-id $PACKAGE_ID \
+ --sequence 1 \
+ --tls \
+ --cafile $ORDERER_CA
+ 
+ peer lifecycle chaincode checkcommitreadiness --channelID mychannel --name papercontract -v 0 --sequence 1
+ workingDirectory: commercial-paper/organization/magnetocorp
+ displayName: Setup Commercial Paper contract
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
+ - script: |
+ source <(./digibank.sh)
+ peer lifecycle chaincode package cp.tar.gz --lang java --path ./contract-java --label cp_0
+ peer lifecycle chaincode install cp.tar.gz
+
+ export PACKAGE_ID=$(peer lifecycle chaincode queryinstalled --output json | jq -r '.installed_chaincodes[0].package_id')
+ echo $PACKAGE_ID
 
- docker exec cliMagnetoCorp peer lifecycle chaincode approveformyorg --channelID mychannel --name papercontract -v 0 --package-id $PACKAGE_ID --sequence 1 --signature-policy "AND ('Org1MSP.member')" 
- docker exec cliMagnetoCorp peer lifecycle chaincode commit -o orderer.example.com:7050 --channelID mychannel --name papercontract -v 0 --sequence 1 --waitForEvent --signature-policy "AND ('Org1MSP.member')" 
- docker exec cliMagnetoCorp peer chaincode invoke -o orderer.example.com:7050 --channelID mychannel --name papercontract -c '{"Args":["org.papernet.commercialpaper:instantiate"]}' --waitForEvent
+ peer lifecycle chaincode approveformyorg --orderer localhost:7050 --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel \
+ --name papercontract \
+ -v 0 \
+ --package-id $PACKAGE_ID \
+ --sequence 1 \
+ --tls \
+ --cafile $ORDERER_CA
+ 
+ peer lifecycle chaincode checkcommitreadiness --channelID mychannel --name papercontract -v 0 --sequence 1
 
- workingDirectory: commercial-paper/organization/magnetocorp/configuration/cli
+ peer lifecycle chaincode commit -o localhost:7050 \
+ --peerAddresses localhost:7051 --tlsRootCertFiles ${PEER0_ORG1_CA} \
+ --peerAddresses localhost:9051 --tlsRootCertFiles ${PEER0_ORG2_CA} \
+ --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel --name papercontract -v 0 \
+ --sequence 1 \
+ --tls --cafile $ORDERER_CA --waitForEvent 
+
+ workingDirectory: commercial-paper/organization/digibank
  displayName: Setup Commercial Paper contract
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
+
+
 
  - script: retry -- npm install
  workingDirectory: commercial-paper/organization/magnetocorp/application

diff --git a/ci/commercialpaper-java.yml b/ci/commercialpaper-java.yml
@@ -3,26 +3,83 @@
 #
 
 steps:
- - script: bash start.sh
- workingDirectory: basic-network
- displayName: Start Fabric
  - script: |
  ./gradlew build
  workingDirectory: commercial-paper/organization/digibank/contract-java
  displayName: Build Java Contract 
  - script: |
- docker-compose -f docker-compose.yml up -d cliDigiBank
+ ./gradlew build
+ workingDirectory: commercial-paper/organization/magnetocorp/contract-java
+ displayName: Build Java Contract 
+
+ - script: |
+ echo $PATH
+ ls -l /usr/local/bin/peer
+ sudo tar xzvf /tmp/hyperledger-fabric-linux-amd64-latest.tar.gz -C ..
+ ./network.sh down
+ ./network.sh up createChannel -s couchdb -i 2.0.0-beta
+
+ # Copy the connection profiles so they are in the correct organizations. 
+ cp "./organizations/peerOrganizations/org1.example.com/connection-org1.yaml" "../commercial-paper/organization/digibank/gateway/"
+ cp "./organizations/peerOrganizations/org2.example.com/connection-org2.yaml" "../commercial-paper/organization/magnetocorp/gateway/"
+ workingDirectory: test-network
+ displayName: Start Fabric
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
+ - script: |
+ source <(./magnetocorp.sh)
+ peer lifecycle chaincode package cp.tar.gz --lang java --path ./contract-java --label cp_0
+ peer lifecycle chaincode install cp.tar.gz
+
+ export PACKAGE_ID=$(peer lifecycle chaincode queryinstalled --output json | jq -r '.installed_chaincodes[0].package_id')
+ echo $PACKAGE_ID
 
- docker exec cliDigiBank peer lifecycle chaincode package cp.tar.gz --lang java --path /opt/gopath/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/digibank/contract-java/build/libs --label cp_0
- docker exec cliDigiBank peer lifecycle chaincode install cp.tar.gz
- export PACKAGE_ID=$(docker exec cliDigiBank peer lifecycle chaincode queryinstalled 2>&1 | awk -F "[, ]+" '/Label: /{print $3}')
+ peer lifecycle chaincode approveformyorg --orderer localhost:7050 --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel \
+ --name papercontract \
+ -v 0 \
+ --package-id $PACKAGE_ID \
+ --sequence 1 \
+ --tls \
+ --cafile $ORDERER_CA
+ 
+ peer lifecycle chaincode checkcommitreadiness --channelID mychannel --name papercontract -v 0 --sequence 1
+ workingDirectory: commercial-paper/organization/magnetocorp
+ displayName: Setup Commercial Paper contract
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
+ - script: |
+ source <(./digibank.sh)
+ peer lifecycle chaincode package cp.tar.gz --lang java --path ./contract-java --label cp_0
+ peer lifecycle chaincode install cp.tar.gz
 
- docker exec cliDigiBank peer lifecycle chaincode approveformyorg --channelID mychannel --name papercontract -v 0 --package-id $PACKAGE_ID --sequence 1 --signature-policy "AND ('Org1MSP.member')" 
- docker exec cliDigiBank peer lifecycle chaincode commit -o orderer.example.com:7050 --channelID mychannel --name papercontract -v 0 --sequence 1 --waitForEvent --signature-policy "AND ('Org1MSP.member')" 
- docker exec cliDigiBank peer chaincode invoke -o orderer.example.com:7050 --channelID mychannel --name papercontract -c '{"Args":["org.papernet.commercialpaper:instantiate"]}' --waitForEvent
+ export PACKAGE_ID=$(peer lifecycle chaincode queryinstalled --output json | jq -r '.installed_chaincodes[0].package_id')
+ echo $PACKAGE_ID
 
- workingDirectory: commercial-paper/organization/digibank/configuration/cli
+ peer lifecycle chaincode approveformyorg --orderer localhost:7050 --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel \
+ --name papercontract \
+ -v 0 \
+ --package-id $PACKAGE_ID \
+ --sequence 1 \
+ --tls \
+ --cafile $ORDERER_CA
+ 
+ peer lifecycle chaincode checkcommitreadiness --channelID mychannel --name papercontract -v 0 --sequence 1
+
+ peer lifecycle chaincode commit -o localhost:7050 \
+ --peerAddresses localhost:7051 --tlsRootCertFiles ${PEER0_ORG1_CA} \
+ --peerAddresses localhost:9051 --tlsRootCertFiles ${PEER0_ORG2_CA} \
+ --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel --name papercontract -v 0 \
+ --sequence 1 \
+ --tls --cafile $ORDERER_CA --waitForEvent 
+
+ workingDirectory: commercial-paper/organization/digibank
  displayName: Setup Commercial Paper contract
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
+
 
  - script: retry -- npm install
  workingDirectory: commercial-paper/organization/magnetocorp/application

diff --git a/ci/commercialpaper-javascript.yml b/ci/commercialpaper-javascript.yml
@@ -3,23 +3,73 @@
 #
 
 steps:
- - script: bash start.sh
- workingDirectory: basic-network
- displayName: Start Fabric
  - script: |
- docker-compose -f docker-compose.yml up -d cliMagnetoCorp
+ echo $PATH
+ ls -l /usr/local/bin/peer
+ sudo tar xzvf /tmp/hyperledger-fabric-linux-amd64-latest.tar.gz -C ..
+ ./network.sh down
+ ./network.sh up createChannel -s couchdb -i 2.0.0-beta
 
- docker exec cliMagnetoCorp peer lifecycle chaincode package cp.tar.gz --lang node --path /opt/gopath/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp/contract --label cp_0
- docker exec cliMagnetoCorp peer lifecycle chaincode install cp.tar.gz
- export PACKAGE_ID=$(docker exec cliMagnetoCorp peer lifecycle chaincode queryinstalled 2>&1 | awk -F "[, ]+" '/Label: /{print $3}')
+ # Copy the connection profiles so they are in the correct organizations. 
+ cp "./organizations/peerOrganizations/org1.example.com/connection-org1.yaml" "../commercial-paper/organization/digibank/gateway/"
+ cp "./organizations/peerOrganizations/org2.example.com/connection-org2.yaml" "../commercial-paper/organization/magnetocorp/gateway/"
+ workingDirectory: test-network
+ displayName: Start Fabric
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
+ - script: |
+ source <(./magnetocorp.sh)
+ peer lifecycle chaincode package cp.tar.gz --lang node --path ./contract --label cp_0
+ peer lifecycle chaincode install cp.tar.gz
 
- docker exec cliMagnetoCorp peer lifecycle chaincode approveformyorg --channelID mychannel --name papercontract -v 0 --package-id $PACKAGE_ID --sequence 1 --signature-policy "AND ('Org1MSP.member')" 
- docker exec cliMagnetoCorp peer lifecycle chaincode commit -o orderer.example.com:7050 --channelID mychannel --name papercontract -v 0 --sequence 1 --waitForEvent --signature-policy "AND ('Org1MSP.member')" 
- docker exec cliMagnetoCorp peer chaincode invoke -o orderer.example.com:7050 --channelID mychannel --name papercontract -c '{"Args":["org.papernet.commercialpaper:instantiate"]}' --waitForEvent
+ export PACKAGE_ID=$(peer lifecycle chaincode queryinstalled --output json | jq -r '.installed_chaincodes[0].package_id')
+ echo $PACKAGE_ID
 
- workingDirectory: commercial-paper/organization/magnetocorp/configuration/cli
+ peer lifecycle chaincode approveformyorg --orderer localhost:7050 --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel \
+ --name papercontract \
+ -v 0 \
+ --package-id $PACKAGE_ID \
+ --sequence 1 \
+ --tls \
+ --cafile $ORDERER_CA
+ 
+ peer lifecycle chaincode checkcommitreadiness --channelID mychannel --name papercontract -v 0 --sequence 1
+ workingDirectory: commercial-paper/organization/magnetocorp
  displayName: Setup Commercial Paper contract
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
+ - script: |
+ source <(./digibank.sh)
+ peer lifecycle chaincode package cp.tar.gz --lang node --path ./contract --label cp_0
+ peer lifecycle chaincode install cp.tar.gz
 
+ export PACKAGE_ID=$(peer lifecycle chaincode queryinstalled --output json | jq -r '.installed_chaincodes[0].package_id')
+ echo $PACKAGE_ID
+
+ peer lifecycle chaincode approveformyorg --orderer localhost:7050 --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel \
+ --name papercontract \
+ -v 0 \
+ --package-id $PACKAGE_ID \
+ --sequence 1 \
+ --tls \
+ --cafile $ORDERER_CA
+ 
+ peer lifecycle chaincode checkcommitreadiness --channelID mychannel --name papercontract -v 0 --sequence 1
+
+ peer lifecycle chaincode commit -o localhost:7050 \
+ --peerAddresses localhost:7051 --tlsRootCertFiles ${PEER0_ORG1_CA} \
+ --peerAddresses localhost:9051 --tlsRootCertFiles ${PEER0_ORG2_CA} \
+ --ordererTLSHostnameOverride orderer.example.com \
+ --channelID mychannel --name papercontract -v 0 \
+ --sequence 1 \
+ --tls --cafile $ORDERER_CA --waitForEvent 
+
+ workingDirectory: commercial-paper/organization/digibank
+ displayName: Setup Commercial Paper contract
+ env:
+ FABRIC_CFG_PATH: /usr/local/config
  - script: retry -- npm install
  workingDirectory: commercial-paper/organization/magnetocorp/application
  displayName: Install Magnetocorp application

diff --git a/commercial-paper/.gitignore b/commercial-paper/.gitignore
@@ -1 +1,4 @@
-cp.tar.gz
+cp.tar.gz
+**/.gradle
+**/gateway/connection-org1.yaml
+**/gateway/connection-org2.yaml