Merged in v1.0.1-branch (pull request hyperledger#1)

Author: alacambra

.dockerignore

@@ -1,2 +1,7 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 obc-peer
 .git

.gitignore

@@ -10,6 +10,11 @@ tags
 .tags
 .vagrant/
 /build
+/release/darwin-amd64
+/release/linux-amd64
+/release/linux-s390x
+/release/linux-ppc64le
+/release/windows-amd64
 # Emacs backup files
 *~
 *#

CHANGELOG.md

@@ -10,6 +10,7 @@
 #   - checks - runs all tests/checks
 #   - desk-check - runs linters and verify to test changed packages
 #   - configtxgen - builds a native configtxgen binary
+#   - configtxlator - builds a native configtxlator binary
 #   - cryptogen  -  builds a native cryptogen binary
 #   - peer - builds a native fabric peer binary
 #   - orderer - builds a native fabric orderer binary
@@ -30,12 +31,14 @@
 #   - tools-docker[-clean] - ensures the tools container is available[/cleaned]
 #   - protos - generate all protobuf artifacts based on .proto files
 #   - clean - cleans the build area
-#   - dist-clean - superset of 'clean' that also removes persistent state
+#   - clean-all - superset of 'clean' that also removes persistent state
+#   - dist-clean - clean release packages for all target platforms
 #   - unit-test-clean - cleans unit test state (particularly from docker)
 
 PROJECT_NAME   = hyperledger/fabric
-BASE_VERSION   = 1.0.0-beta-javacc
-PREV_VERSION   = 1.0.0-alpha2
+<<<<<<< HEAD
+BASE_VERSION   = 1.0.1-javacc
+PREV_VERSION   = 1.0.0
 IS_RELEASE     = true
 
 ifneq ($(IS_RELEASE),true)
@@ -48,7 +51,8 @@ endif
 PKGNAME = github.com/$(PROJECT_NAME)
 CGO_FLAGS = CGO_CFLAGS=" "
 ARCH=$(shell uname -m)
-CHAINTOOL_RELEASE=v0.10.3
+MARCH=$(shell go env GOOS)-$(shell go env GOARCH)
+CHAINTOOL_RELEASE=1.0.0
 BASEIMAGE_RELEASE=$(shell cat ./.baseimage-release)
 
 # defined in common/metadata/metadata.go
@@ -62,7 +66,7 @@ GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/common/metadata.%,$(METADATA_VAR))
 
 GO_TAGS ?=
 
-CHAINTOOL_URL ?= https://github.com/hyperledger/fabric-chaintool/releases/download/$(CHAINTOOL_RELEASE)/chaintool
+CHAINTOOL_URL ?= https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/chaintool-$(CHAINTOOL_RELEASE)/hyperledger-fabric-chaintool-$(CHAINTOOL_RELEASE).jar
 
 export GO_LDFLAGS
 
@@ -78,9 +82,10 @@ PROJECT_FILES = $(shell git ls-files  | grep -v ^test | grep -v ^unit-test | \
 	grep -v ^bddtests | grep -v ^docs | grep -v _test.go$ | grep -v .md$ | \
 	grep -v ^.git | grep -v ^examples | grep -v ^devenv | grep -v .png$ | \
 	grep -v ^LICENSE )
+RELEASE_TEMPLATES = $(shell git ls-files | grep "release/templates")
 IMAGES = peer orderer ccenv javaenv buildenv testenv zookeeper kafka couchdb tools
 RELEASE_PLATFORMS = windows-amd64 darwin-amd64 linux-amd64 linux-ppc64le linux-s390x
-RELEASE_PKGS = configtxgen cryptogen configtxlator
+RELEASE_PKGS = configtxgen cryptogen configtxlator peer orderer
 
 pkgmap.cryptogen      := $(PKGNAME)/common/tools/cryptogen
 pkgmap.configtxgen    := $(PKGNAME)/common/configtx/tool/configtxgen
@@ -183,7 +188,7 @@ linter: buildenv
 %/chaintool: Makefile
 	@echo "Installing chaintool"
 	@mkdir -p $(@D)
-	curl -L $(CHAINTOOL_URL) > $@
+	curl -fL $(CHAINTOOL_URL) > $@
 	chmod +x $@
 
 # We (re)build a package within a docker context but persist the $GOPATH/pkg
@@ -251,6 +256,7 @@ build/image/couchdb/payload:	images/couchdb/docker-entrypoint.sh \
 				images/couchdb/vm.args
 build/image/tools/payload:      build/docker/bin/cryptogen \
 	                        build/docker/bin/configtxgen \
+	                        build/docker/bin/configtxlator \
 				build/docker/bin/peer \
 				build/sampleconfig.tar.bz2
 
@@ -284,7 +290,7 @@ build/goshim.tar.bz2: $(GOSHIM_DEPS)
 	@echo "Creating $@"
 	@tar -jhc -C $(GOPATH)/src $(patsubst $(GOPATH)/src/%,%,$(GOSHIM_DEPS)) > $@
 
-build/sampleconfig.tar.bz2:
+build/sampleconfig.tar.bz2: $(shell find sampleconfig -type f)
 	(cd sampleconfig && tar -jc *) > $@
 
 build/javashim.tar.bz2: $(JAVASHIM_DEPS)
@@ -295,7 +301,7 @@ build/%.tar.bz2:
 	@tar -jc $^ > $@
 
 # builds release packages for the host platform
-release: $(patsubst %,release/%, $(shell go env GOOS)-$(shell go env GOARCH))
+release: $(patsubst %,release/%, $(MARCH))
 
 # builds release packages for all target platforms
 release-all: $(patsubst %,release/%, $(RELEASE_PLATFORMS))
@@ -343,14 +349,52 @@ release/%/bin/cryptogen: $(PROJECT_FILES)
 	mkdir -p $(@D)
 	$(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F))
 
+release/%/bin/orderer: $(PROJECT_FILES)
+	@echo "Building $@ for $(GOOS)-$(GOARCH)"
+	mkdir -p $(@D)
+	$(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F))
+
+release/%/bin/peer: GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/common/metadata.%,$(METADATA_VAR))
+
+release/%/bin/peer: $(PROJECT_FILES)
+	@echo "Building $@ for $(GOOS)-$(GOARCH)"
+	mkdir -p $(@D)
+	$(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F))
+
 release/%/install: $(PROJECT_FILES)
-	mkdir -p $@
-	@cat $@/../../templates/get-docker-images.in \
+	mkdir -p $(@D)/bin
+	@cat $(@D)/../templates/get-docker-images.in \
 		| sed -e 's/_NS_/$(DOCKER_NS)/g' \
 		| sed -e 's/_ARCH_/$(DOCKER_ARCH)/g' \
 		| sed -e 's/_VERSION_/$(PROJECT_VERSION)/g' \
-		> $@/get-docker-images.sh
-		@chmod +x $@/get-docker-images.sh
+		| sed -e 's/_BASE_DOCKER_TAG_/$(BASE_DOCKER_TAG)/g' \
+		> $(@D)/bin/get-docker-images.sh
+		@chmod +x $(@D)/bin/get-docker-images.sh
+	@cat $(@D)/../templates/get-byfn.in \
+		| sed -e 's/_VERSION_/$(PROJECT_VERSION)/g' \
+		> $(@D)/bin/get-byfn.sh
+		@chmod +x $(@D)/bin/get-byfn.sh
+
+.PHONY: dist
+dist: dist-clean release
+	cd release/$(MARCH) && tar -czvf hyperledger-fabric-$(MARCH).$(PROJECT_VERSION).tar.gz *
+
+dist-all: dist-clean release-all $(patsubst %,dist/%, $(RELEASE_PLATFORMS))
+
+dist/windows-amd64:
+	cd release/windows-amd64 && tar -czvf hyperledger-fabric-windows-amd64.$(PROJECT_VERSION).tar.gz *
+
+dist/darwin-amd64:
+	cd release/darwin-amd64 && tar -czvf hyperledger-fabric-darwin-amd64.$(PROJECT_VERSION).tar.gz *
+
+dist/linux-amd64:
+	cd release/linux-amd64 && tar -czvf hyperledger-fabric-linux-amd64.$(PROJECT_VERSION).tar.gz *
+
+dist/linux-ppc64le:
+	cd release/linux-ppc64le && tar -czvf hyperledger-fabric-linux-ppc64le.$(PROJECT_VERSION).tar.gz *
+
+dist/linux-s390x:
+	cd release/linux-s390x && tar -czvf hyperledger-fabric-linux-s390x.$(PROJECT_VERSION).tar.gz *
 
 .PHONY: protos
 protos: buildenv
@@ -367,10 +411,18 @@ docker-clean: $(patsubst %,%-docker-clean, $(IMAGES))
 clean: docker-clean unit-test-clean release-clean
 	-@rm -rf build ||:
 
-.PHONY: dist-clean
-dist-clean: clean gotools-clean
+.PHONY: clean-all
+clean-all: clean gotools-clean dist-clean release-clean unit-test-clean
 	-@rm -rf /var/hyperledger/* ||:
 
+.PHONY: dist-clean
+dist-clean:
+	-@rm -rf release/windows-amd64/hyperledger-fabric-windows-amd64.$(PROJECT_VERSION).tar.gz ||:
+	-@rm -rf release/darwin-amd64/hyperledger-fabric-darwin-amd64.$(PROJECT_VERSION).tar.gz ||:
+	-@rm -rf release/linux-amd64/hyperledger-fabric-linux-amd64.$(PROJECT_VERSION).tar.gz ||:
+	-@rm -rf release/linux-ppc64le/hyperledger-fabric-linux-ppc64le.$(PROJECT_VERSION).tar.gz ||:
+	-@rm -rf release/linux-s390x/hyperledger-fabric-linux-s390x.$(PROJECT_VERSION).tar.gz ||:
+
 %-release-clean:
 	$(eval TARGET = ${patsubst %-release-clean,%,${@}})
 	-@rm -rf release/$(TARGET)

Makefile

@@ -13,23 +13,35 @@ the [Hyperledger Project Lifecycle document](https://wiki.hyperledger.org/commun
 [![GoDoc](https://godoc.org/github.com/hyperledger/fabric?status.svg)](https://godoc.org/github.com/hyperledger/fabric)
 [![Documentation Status](https://readthedocs.org/projects/hyperledger-fabric/badge/?version=latest)](http://hyperledger-fabric.readthedocs.io/en/latest/?badge=latest)
 
-## Hyperledger fabric
+## Hyperledger Fabric
 
-The fabric is an implementation of blockchain technology, leveraging familiar
-and proven technologies. It is a modular architecture allowing pluggable
-implementations of various function. It features powerful container technology
-to host any mainstream language for smart contracts development.
+Hyperledger Fabric is a platform for distributed ledger solutions, underpinned
+by a modular architecture delivering high degrees of confidentiality,
+resiliency, flexibility and scalability. It is designed to support pluggable
+implementations of different components, and accommodate the complexity and
+intricacies that exist across the economic ecosystem.
+
+Hyperledger Fabric delivers a uniquely elastic and extensible architecture,
+distinguishing it from alternative blockchain solutions. Planning for the
+future of enterprise blockchain requires building on top of a fully-vetted,
+open source architecture; Hyperledger Fabric is your starting point.
 
 ## Documentation, Getting Started and Developer Guides
 
-This is a **read-only mirror** of the formal Gerrit repository, please visit our
+Please visit our
 [online documentation](http://hyperledger-fabric.readthedocs.io/en/latest/) for
 information on getting started using and developing with the fabric, SDK and chaincode.
 
+It's recommended for first-time users to begin by going through the
+[Getting Started](http://hyperledger-fabric.readthedocs.io/en/latest/getting_started.html)
+section of the documentation in order to gain familiarity with the Hyperledger
+Fabric components and the basic transaction flow. 
+
 ## Contributing
 
-We welcome contributions to the Hyperledger Project in many forms. There’s always plenty to do!
-Check [the documentation on how to contribute to this project](http://hyperledger-fabric.readthedocs.io/en/latest/CONTRIBUTING.html) for the full details.
+We welcome contributions to the Hyperledger Fabric Project in many forms.
+There’s always plenty to do! Check [the documentation on how to contribute to this project](http://hyperledger-fabric.readthedocs.io/en/latest/CONTRIBUTING.html)
+for the full details.
 
 ## Community
 
@@ -50,4 +62,3 @@ Check [the documentation on how to contribute to this project](http://hyperledge
 ## License <a name="license"></a>
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
-s

README.md

@@ -18,7 +18,7 @@ package factory
 import (
 	"testing"
 
-	"github.com/docker/docker/pkg/testutil/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFactoryOptsFactoryName(t *testing.T) {

bccsp/factory/opts_test.go

@@ -239,7 +239,7 @@ func (csp *impl) generateECKey(curve asn1.ObjectIdentifier, ephemeral bool) (ski
 		pkcs11.NewAttribute(pkcs11.CKA_TOKEN, !ephemeral),
 		pkcs11.NewAttribute(pkcs11.CKA_VERIFY, true),
 		pkcs11.NewAttribute(pkcs11.CKA_EC_PARAMS, marshaledOID),
-		pkcs11.NewAttribute(pkcs11.CKA_PRIVATE, true),
+		pkcs11.NewAttribute(pkcs11.CKA_PRIVATE, false),
 
 		pkcs11.NewAttribute(pkcs11.CKA_ID, publabel),
 		pkcs11.NewAttribute(pkcs11.CKA_LABEL, publabel),

bccsp/pkcs11/pkcs11.go

@@ -1,3 +1,8 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 [behave]
 tags=~@orderer
 	 ~@endorser

bddtests/.behaverc

@@ -62,6 +62,12 @@ make clean
 make peer
 ```
 
+The peer executable will be located in the build/bin folder. Make sure that your PATH enviroment variable contains the location.
+Execute the following command if necessary.
+```
+    export PATH=$PATH:$GOPATH/src/github.com/hyperledger/fabric/build/bin
+```
+
 The behave system also uses several docker containers.  Execute the following commands to create the required docker containers.
 
 ```

bddtests/README.md

@@ -0,0 +1,5 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#