From 75cba98859d6b7ed1bd0bc65b76db9562392c6b3 Mon Sep 17 00:00:00 2001 From: jinwoo Date: Tue, 21 Nov 2017 10:08:45 +0900 Subject: [PATCH 1/2] update script/fabric-preload.sh version --- scripts/fabric-preload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fabric-preload.sh b/scripts/fabric-preload.sh index a88963ed..be1d531c 100755 --- a/scripts/fabric-preload.sh +++ b/scripts/fabric-preload.sh @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 # -export VERSION=${1:-1.0.0} +export VERSION=${1:-1.0.4} export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}') #Set MARCH variable i.e ppc64le,s390x,x86_64,i386 MARCH=`uname -m` From c56aa4309668585bc16891916241915195dd0275 Mon Sep 17 00:00:00 2001 From: jinwoo Date: Tue, 21 Nov 2017 13:56:42 +0900 Subject: [PATCH 2/2] fabcar example Automatic script update --- basic-network/config/Org1MSPanchors.tx | Bin 0 -> 284 bytes basic-network/config/channel.tx | Bin 368 -> 368 bytes basic-network/config/genesis.block | Bin 6360 -> 6364 bytes ...4e46edb20a69c8b85d4749b487e15f8e8a6e8df_sk | 5 +++ ...da6f3b6b74925ed0d23061af4899409ba46ae6a_sk | 5 --- .../example.com/ca/ca.example.com-cert.pem | 24 ++++++------ .../msp/admincerts/Admin@example.com-cert.pem | 14 +++---- .../msp/cacerts/ca.example.com-cert.pem | 24 ++++++------ .../msp/tlscacerts/tlsca.example.com-cert.pem | 24 ++++++------ .../msp/admincerts/Admin@example.com-cert.pem | 14 +++---- .../msp/cacerts/ca.example.com-cert.pem | 24 ++++++------ ...558dc7859c4fe458e262e674a6c23f242ea33d1_sk | 5 --- ...47ec18f43597293170fc2ae6c5e62b267ec8ebd_sk | 5 +++ .../signcerts/orderer.example.com-cert.pem | 22 +++++------ .../msp/tlscacerts/tlsca.example.com-cert.pem | 24 ++++++------ .../orderers/orderer.example.com/tls/ca.crt | 24 ++++++------ .../orderer.example.com/tls/server.crt | 14 +++---- .../orderer.example.com/tls/server.key | 6 +-- ...9ddf666952e0ead59227352e2ff2be588f9427f_sk | 5 +++ ...a8d0d7672785b685cb503bcb95e53dcc279fba7_sk | 5 --- .../tlsca/tlsca.example.com-cert.pem | 24 ++++++------ .../msp/admincerts/Admin@example.com-cert.pem | 14 +++---- .../msp/cacerts/ca.example.com-cert.pem | 24 ++++++------ ...09d6165268fba153211af1281f00d45f54b1022_sk | 5 --- ...ba59d31066594a5ccf02e86383f426a8a80dd1b_sk | 5 +++ .../msp/signcerts/Admin@example.com-cert.pem | 14 +++---- .../msp/tlscacerts/tlsca.example.com-cert.pem | 24 ++++++------ .../users/Admin@example.com/tls/ca.crt | 24 ++++++------ .../users/Admin@example.com/tls/server.crt | 24 ++++++------ .../users/Admin@example.com/tls/server.key | 6 +-- ...01851d14504d31aad1b2ddddbac6a57365e497c_sk | 5 --- ...a734e6b428f58fba60ff8d3dcc5afba504eb669_sk | 5 +++ .../ca/ca.org1.example.com-cert.pem | 16 ++++---- .../ca/org1.example.com-cert.pem | 14 ------- .../Admin@org1.example.com-cert.pem | 24 ++++++------ .../msp/cacerts/ca.org1.example.com-cert.pem | 16 ++++---- .../tlsca.org1.example.com-cert.pem | 26 ++++++------- .../Admin@org1.example.com-cert.pem | 24 ++++++------ .../msp/cacerts/ca.org1.example.com-cert.pem | 16 ++++---- ...72a0ccfbfb42727480fb8c8d0223af321a7893d_sk | 5 --- ...c7a00c33a7cc2daa9a23fbcfeeda5fc49bf74fe_sk | 5 +++ .../signcerts/peer0.org1.example.com-cert.pem | 24 ++++++------ .../tlsca.org1.example.com-cert.pem | 26 ++++++------- .../peers/peer0.org1.example.com/tls/ca.crt | 26 ++++++------- .../peer0.org1.example.com/tls/server.crt | 26 ++++++------- .../peer0.org1.example.com/tls/server.key | 6 +-- ...1a3aabc64d796c40f20835bf9f38ff00f347064_sk | 5 +++ ...3c8d2c591f745d1babc4d6d9cce0a1acc168acb_sk | 5 --- .../tlsca/tlsca.org1.example.com-cert.pem | 26 ++++++------- .../Admin@org1.example.com-cert.pem | 24 ++++++------ .../msp/cacerts/ca.org1.example.com-cert.pem | 16 ++++---- ...d85d5d527fe841c2a85974d6fdd5e23cb5e576a_sk | 5 +++ ...91e62130f8008a0bf996e4e4b84cd097a747fec_sk | 5 --- .../signcerts/Admin@org1.example.com-cert.pem | 24 ++++++------ .../tlsca.org1.example.com-cert.pem | 26 ++++++------- .../users/Admin@org1.example.com/tls/ca.crt | 26 ++++++------- .../Admin@org1.example.com/tls/server.crt | 24 ++++++------ .../Admin@org1.example.com/tls/server.key | 6 +-- .../User1@org1.example.com-cert.pem | 24 ++++++------ .../msp/cacerts/ca.org1.example.com-cert.pem | 16 ++++---- ...7c97e90f3952e379497dc55eb903f31b50abc83_sk | 5 --- ...fdbb20cec312724c6e678a3d61ec2e33c2b092b_sk | 5 +++ .../signcerts/User1@org1.example.com-cert.pem | 24 ++++++------ .../tlsca.org1.example.com-cert.pem | 26 ++++++------- .../users/User1@org1.example.com/tls/ca.crt | 26 ++++++------- .../User1@org1.example.com/tls/server.crt | 16 ++++---- .../User1@org1.example.com/tls/server.key | 6 +-- basic-network/docker-compose.yml | 2 +- basic-network/teardown.sh | 1 + fabcar/generateArtifacts.sh | 35 ++++++++++++++++++ fabcar/stop.sh | 22 +++++++++++ fabcar/teardown.sh | 20 ++++++++++ 72 files changed, 578 insertions(+), 514 deletions(-) create mode 100644 basic-network/config/Org1MSPanchors.tx create mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/ca/3bc974c53417d60c44e56527c4e46edb20a69c8b85d4749b487e15f8e8a6e8df_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/ca/a0606a4a860a1e31c90a23788da6f3b6b74925ed0d23061af4899409ba46ae6a_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/4d2f776c0fef8eac3f460a7c3558dc7859c4fe458e262e674a6c23f242ea33d1_sk create mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/eea327380bbe616be2ded85e547ec18f43597293170fc2ae6c5e62b267ec8ebd_sk create mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/tlsca/7698c0afafca895892d701c009ddf666952e0ead59227352e2ff2be588f9427f_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/tlsca/8d2186556c85d515e737d0c0da8d0d7672785b685cb503bcb95e53dcc279fba7_sk delete mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/1deeab5433fa6e5f045eb763109d6165268fba153211af1281f00d45f54b1022_sk create mode 100755 basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/281365ed2120903e7a9d23d0aba59d31066594a5ccf02e86383f426a8a80dd1b_sk delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/ca/4239aa0dcd76daeeb8ba0cda701851d14504d31aad1b2ddddbac6a57365e497c_sk create mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/ca/6e673448bf8256c2a29d3ed94a734e6b428f58fba60ff8d3dcc5afba504eb669_sk delete mode 100644 basic-network/crypto-config/peerOrganizations/org1.example.com/ca/org1.example.com-cert.pem delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/46be1d569fe68f33e517c9e0072a0ccfbfb42727480fb8c8d0223af321a7893d_sk create mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/fa91c97e4a065ed2d098b153bc7a00c33a7cc2daa9a23fbcfeeda5fc49bf74fe_sk create mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/654c79e413ed7eb580b46a8fd1a3aabc64d796c40f20835bf9f38ff00f347064_sk delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/ed3fd82393e95fc2c475afc113c8d2c591f745d1babc4d6d9cce0a1acc168acb_sk create mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/163fd7ca1288f30a87fc8c680d85d5d527fe841c2a85974d6fdd5e23cb5e576a_sk delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/cd96d5260ad4757551ed4a5a991e62130f8008a0bf996e4e4b84cd097a747fec_sk delete mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/c75bd6911aca808941c3557ee7c97e90f3952e379497dc55eb903f31b50abc83_sk create mode 100755 basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/e4c714fccfbcac332e0f08724fdbb20cec312724c6e678a3d61ec2e33c2b092b_sk create mode 100755 fabcar/generateArtifacts.sh create mode 100755 fabcar/stop.sh create mode 100755 fabcar/teardown.sh diff --git a/basic-network/config/Org1MSPanchors.tx b/basic-network/config/Org1MSPanchors.tx new file mode 100644 index 0000000000000000000000000000000000000000..c59bbfb2b93702cdd92f16fb62e1400afc7bf161 GIT binary patch literal 284 zcmd;@$;8Fa#mm8@#F<-}oROH9mzpEg%EZ;g#DydfE)>ee?O0HdlbM`Yl9`_;8yp~{FU8Kq3}P@SadWYU7iE^D78L_ITwH99DY=<>AU04UC^az!ETIJz zmYU5dG=mY<=nh7p*)<5W3pp62%z#Srk~8v)0#ZTx)rDlaq`AZjfE)w8e4rcjQY#X3 c3vyERlJj!~y3M6v#v{85ZaGdT!dwNT0po>9E&u=k literal 0 HcmV?d00001 diff --git a/basic-network/config/channel.tx b/basic-network/config/channel.tx index bba64bed8be75342de09936f3238b24893e6fb6f..7aa019916f7639394819167ccc6b56273bdacf3c 100644 GIT binary patch delta 34 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 delta 2753 zcmai0>&xV39d$2ncQ@;@+gabY>-M_KwzPd)C&?t48LZeRm&s+4%uMEzizwtilbK9r zCdnidN|*WYg?3BTCiY0C|J9G69f@Ic%iMd2!fzRKZ+DJuez;NvERZ8AzKc{dDi@*~E<#duq;>Gv~oaUAT!NnBDSRtOd6` z9B<-?XL()|!*LtKECMGm*fmkxY}+=0*?7acj<>KDLU?u?wNSHmxpwLG*P_P) zd;E9C`ur!LuM6M(%4@`#pVz(#L(jvtXW`l(51_MDw2Y%oGE2j__Vz*TsRQW3&bmHjo_ZMrwxmbJiB6RAhzkT+ApVtv?KxjS> zuL!I^$hKq9h{_jEe(%1lM@zXx&vTiUcIwoYrNFK*9>0k}YCsm{<9q$`vEwUMf)k$! zTr`e@I#4^)dK2D-&SX2`4qJ?xq|JI@FL7?y^haAa6AEtVblN^o3Hx_8YR3Y|>PWByyGaoR!aq{rc_@s=mk#*5^cA8;*ntxh6NeIkIu!7VwAx?~5~#B}#MFRV)u# zb-UC&AqdGR_{7jCcoji)3{O3@J*vlc`37{y@vBdl`pK(JnxcSp=!1+WfzJ;*!+a?M zHcnxz*mUNA$%-XWfG+9#>*+k`^#=nQ98vbxskD6l_?a^xmqt3uq)_RdzUw}KNd=Sj zMhq+!g4xO7om^B{F#iC9q)uGEe7fCXGGqklD&{LoVQPi)%0}g_q_i?_pwpA;H#BLG z28*n$Ik~k%I~T(VrmIM1vEx)n+lkbfXHY4fxpW;2Y z@)Oshs6LR|R2_;%GQn1YvT@rhm1(z{bf6iL(eM{Gc1TBkDH(;NvbOq@Ot;6|m8I*g z6(P$K6KAxq)6hhL`(VJ;Nl?+?yFdaN3(6a}-hF)#glpPHP&6elDD?}|CZ`HK9y4&h zPS{<;L5X}lDGYb0Wf|q`d^a-qB7m8Sd0NRprU2g8q#a5CW(?KYvDEh{DXuRE!9ZdV zBPTha8%dW*6{SHSLQL_D-zIy8!$-47xo5T&s6%61Y=!Z1uBA|fa&vW-=3+dv*gRp% z8_@0L>QoE&sGDLdKq* zI!h&nD$%B5SpMkPe%aqU{r~+2{nLa2iB^7VorB0+lE-K#9_QS(6c8U#XkfT3u)wm^7!TG4N;%S;~?QW}w%?TNB;F@|}2PJnytMHZg=% znqxTxQ;S%YeP)HVmn0dxc2@ondZ6r{{Y?2=$bD^h_S~^+LFHjby(#N}O97BqW_?bJ zO{%|>lf+Jx@}2Xq+)Mj~Gy=FZ8WhqZ(&!Q2kZ6C``w+{_QTghHemS~$SNZU{gL5{U zFT_yZLe_{h%J=uKe336kYL{329@)#~hLt)aoYVTrbdg3-;ZJ*7U$b{KE|6w!de+=8 zHm!haNa$uE2xJH^sW8|Q6e7-N6zF-0KHrIvC$0mnARVaWPF$;0xZ^qmyjIpdN&*G$ zk=3m8RRo#yHA_t^mIhJa@@Uv*TYEfasek$GZ_m^t4KDEAh@v1XSxZs`EX2GD|Qn` zAB}+zQi^vD^HoZ6fv0Z8mI-3o3Z*~;QBU7Nl}d#zOfig@8zv1Xo_2TJn8UTqjq$rP zd^nG{&Cnw1^9^RZ)DDKH$Yhb=R@R@T{|>2J%a>~Rqv;0&J%Uw{oW+(sAi#XK83|xj zUHiXEDXvOsP*NA}G}r*>H)D#?l=xpMHNmRB`H%h}vC09=kpn)~6&B4@W}mZA`Gb>> z?Ac+b>O1k`BYQ5}NuctL;}7X1n<$;(&h7i$be5okH;|VQYdK~^YwL%Mg?ExVCbm;C z&TXt89TR=M4C9Jx8lMbw+jk#y>xlBR_M9t z#gek_3u(kPn_F|r&KZKyrS-N5COq1+AajDyhTx5zjQ6>;GWWK-wIki|LDbZ2yg6RS z#B{ilVwegF+Y>c?mPM1Jt>WJDz5SQUw+|jIpE+R57cX5azjTQ&-P;b2Jy_m 3a37b287f75176ab817f436b7bdd97559c73813028eab8226b12781f7a8a7ba4_sk) #\n" +printf "3. open your docker-compose.yaml in basic-network directory #\n" +printf "4. and edit FABRIC_CA_SERVER_CA_KEYFILE environment #\n" +printf "ex) FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/3a37b287f75176ab817f436b7bdd97559c73813028eab8226b12781f7a8a7ba4_sk << this is blabla_sk file #\n" +printf " #\n" +printf "Thanks!! If you have any questions, please email chaindevchu@gmail.com #\n" +printf "##########################################################################################################################################################################\n" diff --git a/fabcar/stop.sh b/fabcar/stop.sh new file mode 100755 index 00000000..c6fc0672 --- /dev/null +++ b/fabcar/stop.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# Copyright IBM Corp All Rights Reserved +# +# SPDX-License-Identifier: Apache-2.0 +# +# Exit on first error +set -e + +# don't rewrite paths for Windows Git Bash users +export MSYS_NO_PATHCONV=1 + +starttime=$(date +%s) + +#delete hfc-key-store file +rm -rf hfc-key-store + +# launch network; create channel and join peer to channel +cd ../basic-network +./stop.sh + +printf "\nTotal setup execution time : $(($(date +%s) - starttime)) secs ...\n\n\n" diff --git a/fabcar/teardown.sh b/fabcar/teardown.sh new file mode 100755 index 00000000..01dc1367 --- /dev/null +++ b/fabcar/teardown.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +# Copyright IBM Corp All Rights Reserved +# +# SPDX-License-Identifier: Apache-2.0 +# +# Exit on first error +set -e + +# don't rewrite paths for Windows Git Bash users +export MSYS_NO_PATHCONV=1 + +starttime=$(date +%s) + +# launch network; create channel and join peer to channel +cd ../basic-network +./teardown.sh + +printf "\nTotal setup execution time : $(($(date +%s) - starttime)) secs ...\n\n\n" +printf "please check as command 'docker ps -a'\n"