Skip to content

Commit e4062c3

Browse files
Sanket-0510Sanket-0510
committed
updated the snapshots
Signed-off-by: Sanket Teli <telisanket2002@gmail.com>
1 parent 658e041 commit e4062c3

9 files changed

+2498
-149
lines changed

‎e2e/__snapshots__/extendConfig.test.ts.snap‎

Lines changed: 2147 additions & 0 deletions
Large diffs are not rendered by default.

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,9 +1543,12 @@ FABRIC_CA_VERSION=1.5.5
15431543
FABRIC_CA_POSTGRES_VERSION=14
15441544
FABRIC_CCENV_VERSION=2.3.3
15451545
FABRIC_BASEOS_VERSION=2.3.3
1546-
FABRIC_JAVAENV_VERSION=2.3
1547-
FABRIC_NODEENV_VERSION=2.3
1548-
RECOMMENDED_NODE_VERSION=12
1546+
1547+
1548+
FABRIC_JAVAENV_VERSION=3.0-beta
1549+
FABRIC_NODEENV_VERSION=2.5
1550+
RECOMMENDED_NODE_VERSION=18
1551+
15491552
15501553
ROOT_CA_ADMIN_NAME=admin
15511554
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -1715,6 +1718,7 @@ generateChannelsArtifacts() {
17151718
}
17161719
17171720
installChannels() {
1721+
set -x
17181722
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
17191723
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
17201724
@@ -1815,6 +1819,7 @@ upgradeChaincode() {
18151819
}
18161820
18171821
notifyOrgsAboutChannels() {
1822+
18181823
printHeadline "Creating new channel config blocks" "U1F537"
18191824
createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config"
18201825
@@ -1823,6 +1828,7 @@ notifyOrgsAboutChannels() {
18231828
18241829
printHeadline "Deleting new channel config blocks" "U1F52A"
18251830
deleteNewChannelUpdateTx "my-channel1" "Org1MSP" "cli.org1.example.com"
1831+
18261832
}
18271833
18281834
printStartSuccessInfo() {
@@ -1927,22 +1933,23 @@ services:
19271933
- FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL}
19281934
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
19291935
- ORDERER_GENERAL_LISTENPORT=7030
1930-
- ORDERER_GENERAL_GENESISMETHOD=file
1931-
- ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block
19321936
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
19331937
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
1934-
- GODEBUG=netdns=go
1935-
# metrics
1936-
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9440
1937-
- ORDERER_METRICS_PROVIDER=prometheus
1938-
# enabled TLS
1938+
# TLS Configuration
19391939
- ORDERER_GENERAL_TLS_ENABLED=true
19401940
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
19411941
- ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt
19421942
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
1943+
# Cluster TLS Configuration
19431944
- ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt
19441945
- ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key
19451946
- ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
1947+
# Genesis file configuration (for solo and raft)
1948+
- ORDERER_GENERAL_GENESISMETHOD=file
1949+
- ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block
1950+
# Metrics configuration
1951+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9443
1952+
- ORDERER_METRICS_PROVIDER=prometheus
19461953
working_dir: /var/hyperledger/orderer
19471954
command: orderer
19481955
ports:
@@ -2069,6 +2076,7 @@ services:
20692076
- CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION}
20702077
- CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION}
20712078
- CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION}
2079+
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION}
20722080
#
20732081
- CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL}
20742082
- CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL}
@@ -2266,8 +2274,8 @@ createChannelTx() {
22662274
docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
22672275
22682276
docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME
2269-
docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME
22702277
2278+
docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME
22712279
docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME
22722280
22732281
removeContainer $CONTAINER_NAME
@@ -2281,7 +2289,10 @@ createNewChannelUpdateTx() {
22812289
local CONFIG_PROFILE=$3
22822290
local CONFIG_PATH=$4
22832291
local OUTPUT_PATH=$5
2284-
local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx"
2292+
2293+
ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx"
2294+
OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx"
2295+
CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx"
22852296
22862297
echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..."
22872298
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
@@ -2304,11 +2315,11 @@ createNewChannelUpdateTx() {
23042315
docker exec -i $CONTAINER_NAME configtxgen \\
23052316
--configPath ./fabric-config \\
23062317
-profile "\${CONFIG_PROFILE}" \\
2307-
-outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\
2318+
-outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\
23082319
-channelID "\${CHANNEL_NAME}" \\
23092320
-asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME
23102321
2311-
docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME
2322+
docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME
23122323
23132324
removeContainer $CONTAINER_NAME
23142325
}
@@ -3065,7 +3076,6 @@ createChannelAndJoin() {
30653076
mkdir "$DIR_NAME" && cd "$DIR_NAME"
30663077
30673078
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
3068-
30693079
peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx
30703080
peer channel join -b "\${CHANNEL_NAME}".block
30713081

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Orderer: &Group1Defaults
117117
OrdererType: solo
118118
Addresses:
119119
- orderer0.group1.orderer.example.com:7030
120+
120121
BatchTimeout: 2s
121122
BatchSize:
122123
MaxMessageCount: 10
@@ -1453,9 +1454,12 @@ FABRIC_CA_VERSION=1.5.5
14531454
FABRIC_CA_POSTGRES_VERSION=14
14541455
FABRIC_CCENV_VERSION=2.5.9
14551456
FABRIC_BASEOS_VERSION=2.5.9
1456-
FABRIC_JAVAENV_VERSION=2.5
1457+
1458+
1459+
FABRIC_JAVAENV_VERSION=3.0-beta
14571460
FABRIC_NODEENV_VERSION=2.5
1458-
RECOMMENDED_NODE_VERSION=16
1461+
RECOMMENDED_NODE_VERSION=18
1462+
14591463
14601464
ROOT_CA_ADMIN_NAME=admin
14611465
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -1665,10 +1669,11 @@ generateChannelsArtifacts() {
16651669
}
16661670
16671671
installChannels() {
1672+
set -x
16681673
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
16691674
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
16701675
1671-
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
1676+
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
16721677
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
16731678
}
16741679
@@ -1770,6 +1775,7 @@ upgradeChaincode() {
17701775
}
17711776
17721777
notifyOrgsAboutChannels() {
1778+
17731779
printHeadline "Creating new channel config blocks" "U1F537"
17741780
createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config"
17751781
@@ -1778,6 +1784,7 @@ notifyOrgsAboutChannels() {
17781784
17791785
printHeadline "Deleting new channel config blocks" "U1F52A"
17801786
deleteNewChannelUpdateTx "my-channel1" "Org1MSP" "cli.org1.example.com"
1787+
17811788
}
17821789
17831790
printStartSuccessInfo() {
@@ -1881,11 +1888,14 @@ services:
18811888
- FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL}
18821889
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
18831890
- ORDERER_GENERAL_LISTENPORT=7030
1884-
- ORDERER_GENERAL_GENESISMETHOD=file
1885-
- ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block
18861891
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
18871892
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
1888-
- GODEBUG=netdns=go
1893+
# Genesis file configuration (for solo and raft)
1894+
- ORDERER_GENERAL_GENESISMETHOD=file
1895+
- ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block
1896+
# Metrics configuration
1897+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9443
1898+
- ORDERER_METRICS_PROVIDER=prometheus
18891899
working_dir: /var/hyperledger/orderer
18901900
command: orderer
18911901
ports:
@@ -1959,6 +1969,7 @@ services:
19591969
- CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION}
19601970
- CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION}
19611971
- CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION}
1972+
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION}
19621973
#
19631974
- CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL}
19641975
- CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL}
@@ -2002,6 +2013,7 @@ services:
20022013
- CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION}
20032014
- CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION}
20042015
- CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION}
2016+
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION}
20052017
#
20062018
- CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL}
20072019
- CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL}
@@ -2130,8 +2142,8 @@ createChannelTx() {
21302142
docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
21312143
21322144
docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME
2133-
docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME
21342145
2146+
docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME
21352147
docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME
21362148
21372149
removeContainer $CONTAINER_NAME
@@ -2145,7 +2157,10 @@ createNewChannelUpdateTx() {
21452157
local CONFIG_PROFILE=$3
21462158
local CONFIG_PATH=$4
21472159
local OUTPUT_PATH=$5
2148-
local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx"
2160+
2161+
ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx"
2162+
OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx"
2163+
CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx"
21492164
21502165
echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..."
21512166
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
@@ -2168,11 +2183,11 @@ createNewChannelUpdateTx() {
21682183
docker exec -i $CONTAINER_NAME configtxgen \\
21692184
--configPath ./fabric-config \\
21702185
-profile "\${CONFIG_PROFILE}" \\
2171-
-outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\
2186+
-outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\
21722187
-channelID "\${CHANNEL_NAME}" \\
21732188
-asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME
21742189
2175-
docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME
2190+
docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME
21762191
21772192
removeContainer $CONTAINER_NAME
21782193
}
@@ -2929,7 +2944,6 @@ createChannelAndJoin() {
29292944
mkdir "$DIR_NAME" && cd "$DIR_NAME"
29302945
29312946
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
2932-
29332947
peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx
29342948
peer channel join -b "\${CHANNEL_NAME}".block
29352949

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ Orderer: &Group1Defaults
168168
OrdererType: solo
169169
Addresses:
170170
- orderer0.group1.orderer.example.com:7030
171+
171172
BatchTimeout: 2s
172173
BatchSize:
173174
MaxMessageCount: 10
@@ -2114,9 +2115,12 @@ FABRIC_CA_VERSION=1.5.5
21142115
FABRIC_CA_POSTGRES_VERSION=14
21152116
FABRIC_CCENV_VERSION=2.4.7
21162117
FABRIC_BASEOS_VERSION=2.4.7
2117-
FABRIC_JAVAENV_VERSION=2.4
2118-
FABRIC_NODEENV_VERSION=2.4
2119-
RECOMMENDED_NODE_VERSION=16
2118+
2119+
2120+
FABRIC_JAVAENV_VERSION=3.0-beta
2121+
FABRIC_NODEENV_VERSION=2.5
2122+
RECOMMENDED_NODE_VERSION=18
2123+
21202124
21212125
ROOT_CA_ADMIN_NAME=admin
21222126
ROOT_CA_ADMIN_PASSWORD=adminpw
@@ -2380,12 +2384,13 @@ generateChannelsArtifacts() {
23802384
}
23812385
23822386
installChannels() {
2387+
set -x
23832388
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
23842389
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
23852390
2386-
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
2391+
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
23872392
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
2388-
printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638"
2393+
printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638"
23892394
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
23902395
}
23912396
@@ -2563,6 +2568,7 @@ upgradeChaincode() {
25632568
}
25642569
25652570
notifyOrgsAboutChannels() {
2571+
25662572
printHeadline "Creating new channel config blocks" "U1F537"
25672573
createNewChannelUpdateTx "my-channel1" "Org1MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config"
25682574
createNewChannelUpdateTx "my-channel1" "Org2MSP" "MyChannel1" "$FABLO_NETWORK_ROOT/fabric-config" "$FABLO_NETWORK_ROOT/fabric-config/config"
@@ -2574,6 +2580,7 @@ notifyOrgsAboutChannels() {
25742580
printHeadline "Deleting new channel config blocks" "U1F52A"
25752581
deleteNewChannelUpdateTx "my-channel1" "Org1MSP" "cli.org1.example.com"
25762582
deleteNewChannelUpdateTx "my-channel1" "Org2MSP" "cli.org2.example.com"
2583+
25772584
}
25782585
25792586
printStartSuccessInfo() {
@@ -2712,11 +2719,14 @@ services:
27122719
- FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL}
27132720
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
27142721
- ORDERER_GENERAL_LISTENPORT=7030
2715-
- ORDERER_GENERAL_GENESISMETHOD=file
2716-
- ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block
27172722
- ORDERER_GENERAL_LOCALMSPID=OrdererMSP
27182723
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp
2719-
- GODEBUG=netdns=go
2724+
# Genesis file configuration (for solo and raft)
2725+
- ORDERER_GENERAL_GENESISMETHOD=file
2726+
- ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/config/Group1Genesis.block
2727+
# Metrics configuration
2728+
- ORDERER_OPERATIONS_LISTENADDRESS=orderer0.group1.orderer.example.com:9443
2729+
- ORDERER_METRICS_PROVIDER=prometheus
27202730
working_dir: /var/hyperledger/orderer
27212731
command: orderer
27222732
ports:
@@ -2793,6 +2803,7 @@ services:
27932803
- CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION}
27942804
- CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION}
27952805
- CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION}
2806+
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION}
27962807
#
27972808
- CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL}
27982809
- CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL}
@@ -2836,6 +2847,7 @@ services:
28362847
- CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION}
28372848
- CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION}
28382849
- CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION}
2850+
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION}
28392851
#
28402852
- CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL}
28412853
- CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL}
@@ -2928,6 +2940,7 @@ services:
29282940
- CORE_CHAINCODE_BUILDER=hyperledger/fabric-ccenv:\${FABRIC_CCENV_VERSION}
29292941
- CORE_CHAINCODE_GOLANG_RUNTIME=hyperledger/fabric-baseos:\${FABRIC_BASEOS_VERSION}
29302942
- CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:\${FABRIC_JAVAENV_VERSION}
2943+
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:\${FABRIC_NODEENV_VERSION}
29312944
#
29322945
- CORE_CHAINCODE_LOGGING_LEVEL=\${LOGGING_LEVEL}
29332946
- CORE_CHAINCODE_LOGGING_SHIM=\${LOGGING_LEVEL}
@@ -3056,8 +3069,8 @@ createChannelTx() {
30563069
docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
30573070
30583071
docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME
3059-
docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME
30603072
3073+
docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "\${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "\${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME
30613074
docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME
30623075
30633076
removeContainer $CONTAINER_NAME
@@ -3071,7 +3084,10 @@ createNewChannelUpdateTx() {
30713084
local CONFIG_PROFILE=$3
30723085
local CONFIG_PATH=$4
30733086
local OUTPUT_PATH=$5
3074-
local ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx"
3087+
3088+
ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/\${MSP_NAME}anchors-$CHANNEL_NAME.tx"
3089+
OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/\${MSP_NAME}anchors.tx"
3090+
CONTAINER_COPY_PATH="\${CONTAINER_NAME}:/config/\${MSP_NAME}anchors.tx"
30753091
30763092
echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..."
30773093
inputLog "CHANNEL_NAME: $CHANNEL_NAME"
@@ -3094,11 +3110,11 @@ createNewChannelUpdateTx() {
30943110
docker exec -i $CONTAINER_NAME configtxgen \\
30953111
--configPath ./fabric-config \\
30963112
-profile "\${CONFIG_PROFILE}" \\
3097-
-outputAnchorPeersUpdate ./config/"\${MSP_NAME}"anchors.tx \\
3113+
-outputAnchorPeersUpdate "\${OUTPUT_ANCHOR_PEERS_UPDATE_PATH}" \\
30983114
-channelID "\${CHANNEL_NAME}" \\
30993115
-asOrg "\${MSP_NAME}" || removeContainer $CONTAINER_NAME
31003116
3101-
docker cp $CONTAINER_NAME:/config/"\${MSP_NAME}"anchors.tx "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME
3117+
docker cp "$CONTAINER_COPY_PATH" "$ANCHOR_PEER_UPDATE_PATH" || removeContainer $CONTAINER_NAME
31023118
31033119
removeContainer $CONTAINER_NAME
31043120
}
@@ -3855,7 +3871,6 @@ createChannelAndJoin() {
38553871
mkdir "$DIR_NAME" && cd "$DIR_NAME"
38563872
38573873
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
3858-
38593874
peer channel create -o "\${ORDERER_URL}" -c "\${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx
38603875
peer channel join -b "\${CHANNEL_NAME}".block
38613876

0 commit comments

Comments
 (0)