+
+
diff --git a/docs/dev-setup/build.md b/docs/dev-setup/build.md
index 6b1cea40903..642eaf79ec2 100644
--- a/docs/dev-setup/build.md
+++ b/docs/dev-setup/build.md
@@ -158,6 +158,21 @@ cd $GOPATH/src/github.com/hyperledger/fabric
make peer unit-test behave
```
+### Building on Power Platform
+
+Development and build on Power (ppc64le) systems is done outside of vagrant as outlined [here](#building-outside-of-vagrant-). For ease of setting up the dev environment on Ubuntu, invoke [this script](https://github.com/hyperledger/fabric/tree/master/devenv/setupUbuntuOnPPC64le.sh) as root. This script has been validated on Ubuntu 16.04 and assumes certain things (like, development system has OS repositories in place, firewall setting etc) and in general can be improvised further.
+
+To get started on Power server installed with Ubuntu, first ensure you have properly setup your Host's [GOPATH environment variable](https://github.com/golang/go/wiki/GOPATH). Then, execute the following commands to build the fabric code:
+
+```
+mkdir -p $GOPATH/src/github.com/hyperledger
+cd $GOPATH/src/github.com/hyperledger
+git clone http://gerrit.hyperledger.org/r/fabric
+sudo ./fabric/devenv/setupUbuntuOnPPC64le.sh
+cd $GOPATH/src/github.com/hyperledger/fabric
+make dist-clean all
+```
+
### Building natively on OSX
First, install Docker, as described [here](https://docs.docker.com/engine/installation/mac/).
The database by default writes to /var/hyperledger. You can override this in the `core.yaml` configuration file, under `peer.fileSystemPath`.
diff --git a/docs/images/standalone-app-developer.png b/docs/images/standalone-app-developer.png
new file mode 100644
index 00000000000..1fb8ac82268
Binary files /dev/null and b/docs/images/standalone-app-developer.png differ
diff --git a/docs/images/web-app-developer.png b/docs/images/web-app-developer.png
new file mode 100644
index 00000000000..1fb8ac82268
Binary files /dev/null and b/docs/images/web-app-developer.png differ
diff --git a/docs/index.md b/docs/index.md
index b7edcb9486c..d9f5b96041f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -19,21 +19,25 @@ to host any mainstream language for smart contracts development.
## Releases
-The fabric releases are documented
-[here](https://github.com/hyperledger/fabric/wiki/Fabric-Releases). We have just
-released our first release under the governance of the Hyperledger Project -
-v0.5-developer-preview.
+The fabric releases are documented [here](releases.md). We have just
+released our second release under the governance of the Hyperledger Project -
+v0.6-preview.
+
+## Fabric Starter Kit
+
+If you'd like to dive right in and get an operational experience on your local
+server or laptop to begin development, we have just the thing for you. We have
+created a standalone Docker-based [starter kit](starter/fabric-starter-kit.md)
+that leverages the latest published Docker images that you can run on your
+laptop and be up and running in no time. That should get you going with a
+sample application and some simple chaincode. From there, you can go deeper
+by exploring our [developer guides](#developer-guides).
## Contributing to the project
We welcome contributions to the Hyperledger Project in many forms. There's
always plenty to do! Full details of how to contribute to this project are
-documented in the [Fabric developer's guide](#fabric-developer-guide) below.
-
-To contribute to this documentation, create an issue for any requests for
-clarification or to highlight any errors, or you may clone and update the
-[source](https://gerrit.hyperledger.org/r/#/admin/projects/fabric), and submit a
-Gerrit review (essentially the same process as for fabric development).
+documented in the [Fabric developer's guide](#fabric-developer's-guide) below.
## Maintainers
@@ -45,42 +49,46 @@ Project's Technical Steering Committee (TSC).
## Communication
We use [Hyperledger Slack](https://slack.hyperledger.org/) for communication and
-Google Hangouts™ for screen sharing between developers.
+Google Hangouts™ for screen sharing between developers. Our development
+planning and prioritization is done in [JIRA](https://jira.hyperledger.org),
+and we take longer running discussions/decisions to the
+[mailing list](http://lists.hyperledger.org/mailman/listinfo/hyperledger-fabric).
+
+## Still Have Questions?
+We try to maintain a comprehensive set of documentation (see below) for various audiences.
+However, we realize that often there are questions that remain unanswered. For
+any technical questions relating to the Hyperledger Fabric project not answered
+in this documentation, please use
+[StackOverflow](http://stackoverflow.com/questions/tagged/hyperledger). If you
+need help finding things, please don't hesitate to send a note to the
+[mailing list](http://lists.hyperledger.org/mailman/listinfo/hyperledger-fabric),
+or ask on [Slack]((https://slack.hyperledger.org/)).
# Hyperledger Fabric Documentation
-The Hyperledger
-[fabric](https://gerrit.hyperledger.org/r/#/admin/projects/fabric) is an
-implementation of blockchain technology, that has been collaboratively developed
-under the Linux Foundation's [Hyperledger Project](http://hyperledger.org). It
-leverages familiar and proven technologies, and offers a modular architecture
+The Hyperledger fabric is an implementation of blockchain technology, that has
+been collaboratively developed under the Linux Foundation's
+[Hyperledger Project](http://hyperledger.org). It leverages familiar and
+proven technologies, and offers a modular architecture
that allows pluggable implementations of various function including membership
services, consensus, and smart contracts (Chaincode) execution. It features
powerful container technology to host any mainstream language for smart
contracts development.
-## Still Have Questions?
-We try to maintain a comprehensive set of documentation for various audiences.
-However, we realize that often there are questions that remain unanswered. For
-any technical questions relating to the Hyperledger Fabric project not answered
-in this documentation, please use
-[StackOverflow](http://stackoverflow.com/questions/tagged/hyperledger).
-
-## TOC
+## Table of Contents
Below, you'll find the following sections:
-- [Getting started](#getting-started)
-- [Quickstart](#quickstart-documentation)
+- [Read All About It](#read-all-about-it)
- [Developer guides](#developer-guides)
- - [Fabric developer's guide](#fabric-developer-guide)
- [Chaincode developer's guide](#chaincode-developer-guide)
- - [API developer's guide](#api-developer-guide)
+ - [Application developer's guide](#application-developer-guide)
+ - [Fabric developer's guide](#fabric-developer-guide)
- [Operations guide](#operations-guide)
-# Getting started
+## Read all about it
If you are new to the project, you can begin by reviewing the following links.
If you'd prefer to dive right in, see the
@@ -96,47 +104,8 @@ where the community is developing use cases and requirements.
the Fabric project's documentation.
- [Fabric FAQs](https://github.com/hyperledger/fabric/tree/master/docs/FAQ)
-# Quickstart documentation
-
-- [Development environment set-up](dev-setup/devenv.md): if you are considering
-helping with development of the Hyperledger Fabric or Fabric-API projects
-themselves, this guide will help you install and configure all you'll need. The
-development environment is also useful (but, not necessary) for developing
-blockchain applications and/or Chaincode.
-- [Network setup](Setup/Network-setup.md): This document covers setting up a
-network on your local machine for development.
-- [Chaincode development environment](Setup/Chaincode-setup.md): Chaincode
-developers need a way to test and debug their Chaincode without having to set up
-a complete peer network. This document describes how to write, build, and test
-Chaincode in a local development environment.
-- [APIs](API/CoreAPI.md): This document covers the available APIs for
-interacting with a peer node.
-
# Developer guides
-## Fabric developer guide
-
-When you are ready to start contributing to the Hyperledger fabric project, we
-strongly recommend that you read the [protocol specification](protocol-spec.md)
-for the technical details so that you have a better understanding of how the
-code fits together.
-
-- [Making code contributions](CONTRIBUTING.md): First, you'll want to familiarize
-yourself with the project's contribution guidelines.
-- [Setting up the development environment](dev-setup/devenv.md): after that, you
-will want to set up your development environment.
-- [Building the fabric core](dev-setup/build.md): next, try building the project
-in your local development environment to ensure that everything is set up
-correctly.
-- [Building outside of Vagrant](dev-setup/build.md#building-outside-of-vagrant):
-for the adventurous, you might try to build outside of the standard Vagrant
-development environment.
-- [Logging control](Setup/logging-control.md): describes how to tweak the logging
-levels of various components within the fabric.
-- [License header](dev-setup/headers.txt): every source file must include this
-license header modified to include a copyright statement for the principle
-author(s).
-
## Chaincode developer guide
- [Setting up the development environment](dev-setup/devenv.md): when developing
@@ -152,22 +121,40 @@ testing Chaincode.
- [Chaincode FAQ](FAQ/chaincode_FAQ.md): a FAQ for all of your burning questions
relating to Chaincode.
-## API developer guide
-
-- [APIs - CLI, REST, and Node.js](API/CoreAPI.md)
- - [CLI](API/CoreAPI.md#cli): working with the command-line interface.
- - [REST](API/CoreAPI.md#rest-api): working with the REST API.
- - [Node.js SDK](https://github.com/hyperledger/fabric/blob/master/sdk/node/README.md): working with the Node.js SDK.
-
+## Application developer guide
+```
+ - [APIs - CLI, REST, and Node.js](API/CoreAPI.md)
+ - [CLI](API/CoreAPI.md#cli): working with the command-line interface.
+ - [REST](API/CoreAPI.md#rest-api): working with the REST API (*deprecated*).
+ - [Node.js SDK](nodeSDK/node-sdk-guide.md): working with the Node.js SDK.
+```
+## Fabric developer guide
+```
+ - [Making code contributions](CONTRIBUTING.md): First, you'll want to familiarize
+ yourself with the project's contribution guidelines.
+ - [Setting up the development environment](dev-setup/devenv.md): after that, you
+ will want to set up your development environment.
+ - [Building the fabric core](dev-setup/build.md): next, try building the project
+ in your local development environment to ensure that everything is set up
+ correctly.
+ - [Building outside of Vagrant](dev-setup/build.md#building-outside-of-vagrant):
+ for the *adventurous*, you might try to build outside of the standard Vagrant
+ development environment.
+ - [Logging control](Setup/logging-control.md): describes how to tweak the logging
+ levels of various components within the fabric.
+ - [License header](dev-setup/headers.txt): every source file must include this
+ license header modified to include a copyright statement for the principle
+ author(s).
+```
# Operations guide
-
-- [Setting Up a Network](Setup/Network-setup.md): instructions for setting up a
-network of fabric peers.
-- [Certificate Authority (CA) Setup](Setup/ca-setup.md): setting up a CA to
-support identity, security (authentication/authorization), privacy and
-confidentiality.
-- [Application ACL](tech/application-ACL.md): working with access control lists.
-
-## License
+```
+ - [Setting Up a Network](Setup/Network-setup.md): instructions for setting up a
+ network of fabric peers.
+ - [Certificate Authority (CA) Setup](Setup/ca-setup.md): setting up a CA to
+ support identity, security (authentication/authorization), privacy and
+ confidentiality.
+ - [Application ACL](tech/application-ACL.md): working with access control lists.
+```
+# License
The Hyperledger Project uses the [Apache License Version 2.0](LICENSE) software
license.
diff --git a/docs/nodeSDK/app-developer-env-setup.md b/docs/nodeSDK/app-developer-env-setup.md
new file mode 100755
index 00000000000..004db12b8b3
--- /dev/null
+++ b/docs/nodeSDK/app-developer-env-setup.md
@@ -0,0 +1,50 @@
+# Setting up the Full Hyperledger fabric Developer's Environment
+
+ * See [Setting Up The Development Environment](../dev-setup/devenv.md) to set up your development environment.
+
+ * The following commands are all issued from the vagrant environment. The following will open a terminal session:
+
+```
+ cd 
+
+In the diagram above, the blue boxes are Hyperledger fabric components and the green boxes are application developer components. Each outer box represents a separate process.
+
+The **Standalone Application** may be developed in Node.js by using the Hyperledger fabric Client (HFC) SDK for Node.js. This SDK handles all interactions with other Hyperledger fabric components.
+
+
+#### SDK interactions
+
+The **SDK** interacts with a **Peer** process. If the Peer process fails, the Node.js Client SDK can fail-over to another Peer as shown by the dotted line from the Node.js Client SDK to another Peer.
+
+This interaction with the Peer consists of submitting transactions to the blockchain. There are three types of transactions:
+
+ * deploy - to deploy developer's chaincode as depicted by the green **CC1** boxes in the diagram;
+ * invoke - to execute a chaincode function which changes the state of the *blockchain database*;
+ * query - to execute a chaincode function which may return state information related to the *blockchain database*.
+
+The **SDK** also interacts with a **Membership Services** process. In fact, if security is enabled in the Peer (strongly recommended), the Node.js client SDK must interact with Membership Services first in order to retrieve credential certificates which are then used to interact with the Peer.
+
+The interaction with the Membership Services consists of:
+
+ * register - to invite a new user to the blockchain
+ * enroll - to get access to the blockchain
+
+
+## Web Application
+
+The following diagram provides an overview of the major components of Hyperledger fabric for the web application developer.
+
+At a high-level, you can think of the blockchain as a database with which the web application interacts; therefore, it is similar to the following topology.
+
+```
+browser --> web tier --> database tier
+
+```
+
+
+
+In the diagram above, the blue boxes are Hyperledger fabric components and the green boxes are application developer components. Each outer box represents a separate process.
+
+The browser interacts with the developer's Node.js web application using the Hyperledger fabric's Node.js client SDK. The SDK handles all interactions with other Hyperledger fabric components as described in the [SDK interactions](#sdk-interactions) section of [Standalone Application](#standaloneApp).
diff --git a/docs/nodeSDK/images/standalone-app-developer.png b/docs/nodeSDK/images/standalone-app-developer.png
new file mode 100644
index 00000000000..1fb8ac82268
Binary files /dev/null and b/docs/nodeSDK/images/standalone-app-developer.png differ
diff --git a/docs/nodeSDK/images/web-app-developer.png b/docs/nodeSDK/images/web-app-developer.png
new file mode 100644
index 00000000000..1fb8ac82268
Binary files /dev/null and b/docs/nodeSDK/images/web-app-developer.png differ
diff --git a/docs/nodeSDK/node-sdk-guide.md b/docs/nodeSDK/node-sdk-guide.md
new file mode 100755
index 00000000000..e47079757e6
--- /dev/null
+++ b/docs/nodeSDK/node-sdk-guide.md
@@ -0,0 +1,32 @@
+# Hyperledger fabric Client (HFC) SDK for Node.js
+
+The Hyperledger fabric Client (HFC) SDK for Node.js provides a powerful and easy to use API to interact with a Hyperledger fabric blockchain. The HFC is designed to be used in the Node.js JavaScript runtime.
+
+#### Overview and Deep Dive
+
+* [Application Developer's Overview](app-overview.md) for a topological overview of applications and a blockchain.
+
+* [Hyperledger fabric Client (HFC) SDK for Node.js](node-sdk-indepth.md) the Node.js client SDK in more depth
+
+#### Development Environment Choices
+
+* *Recommended:* [Self Contained Node.js Environment](node-sdk-self-contained.md) uses pre-built docker images for the Node.js client application interacting with Hyperledger fabric blockchain. This environment may suffice for a majority of Node.js application developers. The environment contains a built-in standalone sample ready to go.
+
+* [Full Hyperledger fabric development environment](app-developer-env-setup.md) on how to set up an environment for developing chaincode and applications.
+
+ **Note:** Only recommended for development of the Hyperledger fabric Client SDK itself.
+
+
+#### Sample Code
+
+* [Node.js Standalone Application in Vagrant](sample-standalone-app.md) for a sample standalone Node.js application running in the full development environment within Vagrant.
+
+* [Node.js Web Application](sample-web-app.md) for a sample web application and to see how to use the Node.js client SDK for a sample web app leveraging the client SDK to interact with a blockchain network.
+
+
+
+#### Related information
+
+ * To build the reference documentation for the Node.js client SDK APIs follow the instructions [here](app-developer-env-setup.md).
+
+ * To learn more about chaincode, see [Writing, Building, and Running Chaincode in a Development Environment](../Setup/Chaincode-setup.md).
\ No newline at end of file
diff --git a/docs/nodeSDK/node-sdk-indepth.md b/docs/nodeSDK/node-sdk-indepth.md
new file mode 100755
index 00000000000..58eec77378b
--- /dev/null
+++ b/docs/nodeSDK/node-sdk-indepth.md
@@ -0,0 +1,169 @@
+# Hyperledger fabric Client (HFC) SDK for Node.js
+
+The Hyperledger fabric Client (HFC) SDK provides a powerful and easy to use API to interact with a Hyperledger fabric blockchain.
+
+Below, you'll find the following sections:
+
+- [Installing only the SDK](#installing-only-the-sdk)
+- [Terminology](#terminology)
+- [HFC Objects](#hfc-objects)
+- [Pluggability](#pluggability)
+- [Chaincode Deployment](#chaincode-deployment)
+- [Enabling TLS](#enabling-tls)
+- [Troubleshooting](#troubleshooting)
+
+## Installing only the SDK
+
+If you are an experienced node.js developer and already have a blockchain environment set up and running elsewhere, you can set up a client-only environment to run the node.js client by installing the HFC node module as shown below. This assumes a minimum of npm version 2.11.3 and node.js version 0.12.7 are already installed.
+
+* To install the latest HFC module of Hyperledger fabric
+
+```
+ npm install hfc
+```
+
+### Terminology
+
+In order to transact on a Hyperledger fabric blockchain, you must first have an identity which has been both **registered** and **enrolled** with Membership Services. For a topological overview of how the components interact, see [Application Developer's Overview](app-overview.md).
+
+Think of **registration** as *issuing a user invitation* to join a blockchain. It consists of adding a new user name (also called an *enrollment ID*) to the membership service configuration. This can be done programatically with the `Member.register` method, or by adding the enrollment ID directly to the [membersrvc.yaml](https://github.com/hyperledger/fabric/blob/master/membersrvc/membersrvc.yaml) configuration file.
+
+Think of **enrollment** as *accepting a user invitation* to join a blockchain. This is always done by the entity that will transact on the blockchain. This can be done programatically via the `Member.enroll` method.
+
+## HFC Objects
+
+HFC is written primarily in typescript. The source can be found in the `fabric/sdk/node/src` directory. The reference documentation is generated automatically from this source code and can be found in`fabric/sdk/node/doc` after building the project.
+
+The following is a high-level description of the HFC objects (classes and interfaces) to help guide you through the object hierarchy.
+
+* **Chain**
+
+ This is the main top-level class which is the client's representation of a chain. HFC allows you to interact with multiple chains and to share a single `KeyValStore` and `MemberServices` object with multiple chains if needed. For each chain, you add one or more `Peer` objects which represents the endpoint(s) to which HFC connects to transact on the chain. The second peer is used only if the first peer fails. The third peer is used only if both the first and second peers fail, etc.
+
+* **KeyValStore**
+
+ This is a very simple interface which HFC uses to store and retrieve all persistent data. This data includes private keys, so it is very important to keep this storage secure. The default implementation is a simple file-based version found in the `FileKeyValStore` class. If running in a clustered web application, you will need to either ensure that a shared file system is used, or you must implement your own `KeyValStore` that can be shared among all cluster members.
+
+* **MemberServices**
+
+ This is an interface representing Membership Services and is implemented by the `MemberServicesImpl` class. It provides security and identity related features such as privacy, unlinkability, and confidentiality. This implementation issues *ECerts* (enrollment certificates) and *TCerts* (transaction certificates). ECerts are for enrollment identity and TCerts are for transactions.
+
+* **Member** or **User**
+
+ The Member class most often represents an end User who transacts on the chain, but it may also represent other types of members such as peers. From the Member class, you can *register* and *enroll* members or users. This interacts with the `MemberServices` object. You can also deploy, query, and invoke chaincode directly, which interacts with the `Peer`. The implementation for deploy, query and invoke simply creates a temporary `TransactionContext` object and delegates the work to it.
+
+* **TransactionContext**
+
+ This class implements the bulk of the deploy, invoke, and query logic. It interacts with Membership Services to get a TCert to perform these operations. Note that there is a one-to-one relationship between TCert and TransactionContext. In other words, a single TransactionContext will always use the same TCert. If you want to issue multiple transactions with the same TCert, then you can get a `TransactionContext` object from a `Member` object directly and issue multiple deploy, invoke, or query operations on it. Note however that if you do this, these transactions are linkable, which means someone could tell that they came from the same user, though not know which user. For this reason, you will typically just call deploy, invoke, and query on the Member or User object.
+
+## Pluggability
+
+HFC was designed to support two pluggable components:
+
+1. Pluggable `KeyValStore` key value store which is used to retrieve and store keys associated with a member. The key value store is used to store sensitive private keys, so care must be taken to properly protect access.
+
+ **IMPORTANT NOTE**: The default KeyValStore is file-based. If multiple instances of a web application run in a cluster, you must provide an implementation of the KeyValStore which is used by all members of the cluster.
+
+2. Pluggable `MemberServices` which is used to register and enroll members. Member services enables hyperledger to be a permissioned blockchain, providing security services such as anonymity, unlinkability of transactions, and confidentiality
+
+## Chaincode Deployment
+
+### 'net' mode
+
+To have the chaincode deployment succeed in network mode, you must properly set
+up the chaincode project outside of your Hyperledger fabric source tree to include all the **golang** dependencies such that when tarred up and sent to the peer, the peer will be able to build the chain code and then deploy it. The
+following instructions will demonstrate how to properly set up the directory
+structure to deploy *chaincode_example02* in network mode.
+
+The chaincode project must be placed under the `$GOPATH/src` directory. For example, the [chaincode_example02](https://github.com/hyperledger/fabric/blob/master/examples/chaincode/go/chaincode_example02/chaincode_example02.go)
+project should be placed under `$GOPATH/src/` as shown below.
+
+```
+ mkdir -p $GOPATH/src/github.com/chaincode_example02/
+ cd $GOPATH/src/github.com/chaincode_example02
+ curl GET https://raw.githubusercontent.com/hyperledger/fabric/master/examples/chaincode/go/chaincode_example02/chaincode_example02.go > chaincode_example02.go
+```
+
+After you have placed your chaincode project under the `$GOPATH/src`, you will need to vendor the dependencies. From the directory containing your chaincode source, run the following commands:
+
+```
+ go get -u github.com/kardianos/govendor
+ cd $GOPATH/src/github.com/chaincode_example02
+ govendor init
+ govendor fetch github.com/hyperledger/fabric
+```
+
+Now, execute `go build` to verify that all of the chaincode dependencies are
+present.
+
+```
+ go build
+```
+
+### 'dev' mode
+For deploying chaincode in development mode see [Writing, Building, and Running Chaincode in a Development Environment](../Setup/Chaincode-setup.md).
+The chaincode must be running and connected to the peer before issuing the `deploy()` from the Node.js application. The hfc `chain` object must be set to dev mode.
+
+```javascript
+chain.setDevMode(true);
+```
+The deploy request must include the `chaincodeName` that the chaincode registered with the peer. The built-in chaincode example checks an environment variable `CORE_CHAINCODE_ID_NAME=mycc` when it starts.
+
+```json
+ var deployRequest = {
+ chaincodeName: 'mycc',
+ fcn: "init",
+ args: ["a", "100", "b", "200"]
+ };
+```
+
+### Enabling TLS
+
+If you wish to configure TLS with the Membership Services server, the following steps are required:
+
+- Modify `$GOPATH/src/github.com/hyperledger/fabric/membersrvc/membersrvc.yaml` as follows:
+
+```
+ server:
+ tls:
+ cert:
+ file: "/var/hyperledger/production/.membersrvc/tlsca.cert"
+ key:
+ file: "/var/hyperledger/production/.membersrvc/tlsca.priv"
+```
+
+To specify to the Membership Services (TLS) Certificate Authority (TLSCA) what X.509 v3 Certificate (with a corresponding Private Key) to use:
+
+- Modify `$GOPATH/src/github.com/hyperledger/fabric/peer/core.yaml` as follows:
+
+```
+ peer:
+ pki:
+ tls:
+ enabled: true
+ rootcert:
+ file: "/var/hyperledger/production/.membersrvc/tlsca.cert"
+```
+
+To configure the peer to connect to the Membership Services server over TLS (otherwise, the connection will fail).
+
+- Bootstrap your Membership Services and the peer. This is needed in order to have the file *tlsca.cert* generated by the member services.
+
+- Copy `/var/hyperledger/production/.membersrvc/tlsca.cert` to `$GOPATH/src/github.com/hyperledger/fabric/sdk/node`.
+
+*Note:* If you cleanup the folder `/var/hyperledger/production` then don't forget to copy again the *tlsca.cert* file as described above.
+
+### Troubleshooting
+If you see errors stating that the client has already been registered/enrolled, keep in mind that you can perform the enrollment process only once, as the enrollmentSecret is a one-time-use password. You will see these errors if you have performed a user registration/enrollment and subsequently deleted the cryptographic tokens stored on the client side. The next time you try to enroll, errors similar to the ones below will be seen.
+
+```
+ Error: identity or token do not match
+
+```
+
+```
+ Error: user is already registered
+
+```
+
+To address this, remove any stored cryptographic material from the CA server by following the instructions [here](https://github.com/hyperledger/fabric/blob/master/docs/Setup/Chaincode-setup.md#removing-temporary-files-when-security-is-enabled). You will also need to remove any of the cryptographic tokens stored on the client side by deleting the KeyValStore directory. That directory is configurable and is set to `/tmp/keyValStore` within the unit tests.
diff --git a/docs/nodeSDK/sample-standalone-app.md b/docs/nodeSDK/sample-standalone-app.md
new file mode 100755
index 00000000000..8ee2c6249f8
--- /dev/null
+++ b/docs/nodeSDK/sample-standalone-app.md
@@ -0,0 +1,49 @@
+# Node.js Standalone Application in Vagrant
+
+This section describes how to run a sample standalone Node.js application which interacts with a Hyperledger fabric blockchain.
+
+* If you haven't already done so, see [Setting Up The Application Development Environment](app-developer-env-setup.md) to get your environment set up. The remaining steps assume that you are running **inside the vagrant environment**.
+
+* Issue the following commands to build the Node.js Client SDK:
+
+```
+ cd /opt/gopath/src/github.com/hyperledger/fabric
+ make node-sdk
+```
+
+* Start the membership services and peer processes. We run the peer in dev mode for simplicity.
+
+```
+ cd /opt/gopath/src/github.com/hyperledger/fabric/build/bin
+ membersrvc > membersrvc.log 2>&1&
+ peer node start --peer-chaincodedev > peer.log 2>&1&
+```
+
+* Build and run chaincode example 2:
+
+```
+ cd /opt/gopath/src/github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02
+ go build
+ CORE_CHAINCODE_ID_NAME=mycc CORE_PEER_ADDRESS=0.0.0.0:7051 ./chaincode_example02 > log 2>&1&
+```
+
+* Put the following sample app in a file named **app.js** in the */tmp* directory. Take a moment (now or later) to read the comments and code to begin to learn the Node.js Client SDK APIs.
+
+ You may retrieve the [sample application](https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/app.js) file:
+```
+ cd /tmp
+ curl -o app.js https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/app.js
+```
+* Run **npm** to install Hyperledger Fabric Node.js SDK in the `/tmp` directory
+```
+ npm install /opt/gopath/src/github.com/hyperledger/fabric/sdk/node
+```
+
+* To run the application :
+
+```
+ CORE_CHAINCODE_ID_NAME=mycc CORE_PEER_ADDRESS=0.0.0.0:7051 MEMBERSRVC_ADDRESS=0.0.0.0:7054 DEPLOY_MODE=dev node app
+```
+
+Congratulations! You've successfully run your first Hyperledger fabric application.
+
diff --git a/docs/nodeSDK/sample-web-app.md b/docs/nodeSDK/sample-web-app.md
new file mode 100755
index 00000000000..911942ce083
--- /dev/null
+++ b/docs/nodeSDK/sample-web-app.md
@@ -0,0 +1,13 @@
+# Node.js Web Application
+
+The following is a web application template. It is NOT a complete program.
+
+This template code demonstrates how to communicate with a blockchain from a Node.js web application. It does not show how to listen for incoming requests nor how to authenticate your web users as this is application specific. The code below is intended to demonstrate how to interact with a Hyperledger fabric blockchain from an existing web application.
+
+You may retrieve the [sample application]( https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/web-app.js) file:
+
+```
+ curl -o app.js https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/web-app.js
+```
+
+
diff --git a/docs/protocol-spec.md b/docs/protocol-spec.md
index fcd204d2822..e80b4d1894e 100644
--- a/docs/protocol-spec.md
+++ b/docs/protocol-spec.md
@@ -2520,7 +2520,7 @@ POST host:port/chaincode
"params": {
"type": "GOLANG",
"chaincodeID":{
- "path":"github.com/hyperledger/fabic/examples/chaincode/go/chaincode_example02"
+ "path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
},
"ctorMsg": {
"function":"init",
@@ -2555,7 +2555,7 @@ POST host:port/chaincode
"params": {
"type": "GOLANG",
"chaincodeID":{
- "path":"github.com/hyperledger/fabic/examples/chaincode/go/chaincode_example02"
+ "path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
},
"ctorMsg": {
"function":"init",
diff --git a/docs/protocol-spec_zh.md b/docs/protocol-spec_zh.md
index 9e26824780c..c8be3d94c57 100755
--- a/docs/protocol-spec_zh.md
+++ b/docs/protocol-spec_zh.md
@@ -2219,7 +2219,7 @@ POST host:port/chaincode
"params": {
"type": "GOLANG",
"chaincodeID":{
- "path":"github.com/hyperledger/fabic/examples/chaincode/go/chaincode_example02"
+ "path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
},
"ctorMsg": {
"function":"init",
@@ -2254,7 +2254,7 @@ POST host:port/chaincode
"params": {
"type": "GOLANG",
"chaincodeID":{
- "path":"github.com/hyperledger/fabic/examples/chaincode/go/chaincode_example02"
+ "path":"github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02"
},
"ctorMsg": {
"function":"init",
@@ -2603,7 +2603,7 @@ To see what CLI commands are currently available in the implementation, execute
要查看当前可用的CLI命令，执行如下命令
- cd $GOPATH/src/github.com/hyperledger/fabic/peer
+ cd $GOPATH/src/github.com/hyperledger/fabric/peer
./peer
你可以获得和下面类似的响应：
diff --git a/docs/releases.md b/docs/releases.md
new file mode 100644
index 00000000000..51ba90eadfc
--- /dev/null
+++ b/docs/releases.md
@@ -0,0 +1,62 @@
+
+
+[v0.6-preview](https://github.com/hyperledger/fabric/tree/v0.6) September 16, 2016
+
+A developer preview release of the Hyperledger Fabric intended
+to exercise the release logistics and stabilize a set of capabilities for
+developers to try out. This will be the last release under the original
+architecture. All subsequent releases will deliver on the
+[v1.0 architecture](TODO).
+
+Key enhancements:
+
+* 8de58ed - NodeSDK doc changes -- FAB-146
+* 62d866d - Add flow control to SYNC_STATE_SNAPSHOT
+* 4d97069 - Adding TLS changes to SDK
+* e9d3ac2 - Node-SDK: add support for fabric events(block, chaincode, transactional)
+* 7ed9533 - Allow deploying Java chaincode from remote git repositories
+* 4bf9b93 - Move Docker-Compose files into their own folder
+* ce9fcdc - Print ChaincodeName when deploy with CLI
+* 4fa1360 - Upgrade go protobuf from 3-beta to 3
+* 4b13232 - Table implementation in java shim with example
+* df741bc - Add support for dynamically registering a user with attributes
+* 4203ea8 - Check for duplicates when adding peers to the chain
+* 518f3c9 - Update docker openjdk image
+* 47053cd - Add GetTxID function to Stub interface (FAB-306)
+* ac182fa - Remove deprecated devops REST API
+* ad4645d - Support hyperledger fabric build on ppc64le platform
+* 21a4a8a - SDK now properly adding a peer with an invalid URL
+* 1d8114f - Fix setting of watermark on restore from crash
+* a98c59a - Upgrade go protobuff from 3-beta to 3
+* 937039c - DEVENV: Provide strong feedback when provisioning fails
+* d74b1c5 - Make pbft broadcast timeout configurable
+* 97ed71f - Java shim/chaincode project reorg, separate java docker env
+* a76dd3d - Start container with HostConfig was deprecated since v1.10 and removed since v1.12
+* 8b63a26 - Add ability to unregister for events
+* 3f5b2fa - Add automatic peer command detection
+* 6daedfd - Re-enable sending of chaincode events
+* b39c93a - Update Cobra and pflag vendor libraries
+* dad7a9d - Reassign port numbers to 7050-7060 range
+
+[v0.5-developer-preview](https://github.com/hyperledger-archives/fabric/tree/v0.5-developer-preview)
+June 17, 2016
+
+A developer preview release of the Hyperledger Fabric intended
+to exercise the release logistics and stabilize a set of capabilities for
+developers to try out.
+
+Key features:
+
+Permissioned blockchain with immediate finality
+Chaincode (aka smart contract) execution environments
+Docker container (user chaincode)
+In-process with peer (system chaincode)
+Pluggable consensus with PBFT, NOOPS (development mode), SIEVE (prototype)
+Event framework supports pre-defined and custom events
+Client SDK (Node.js), basic REST APIs and CLIs
+Known Key Bugs and work in progress
+
+* 1895 - Client SDK interfaces may crash if wrong parameter specified
+* 1901 - Slow response after a few hours of stress testing
+* 1911 - Missing peer event listener on the client SDK
+* 889 - The attributes in the TCert are not encrypted. This work is still on-going
diff --git a/docs/starter/fabric-starter-kit.md b/docs/starter/fabric-starter-kit.md
new file mode 100755
index 00000000000..7d199ad1281
--- /dev/null
+++ b/docs/starter/fabric-starter-kit.md
@@ -0,0 +1,170 @@
+# Fabric Starter Kit
+
+This section describes how to set up a self-contained environment for
+application development with the Hyperledger fabric. The setup
+uses **Docker** to provide a controlled environment with all the necessary
+Hyperledger fabric components to support a Node.js application built with
+the fabric's Node.js SDK, and chaincode written in Go.
+
+There are three Docker images that, when run, will provide a basic
+network environment. There is an image to run a single `peer`, one to run
+the `membersrvc`, and one to run both your Node.js application and your
+chaincode. See [Application Developer's Overview](../nodeSDK/app-overview.md) on how the
+components running within the containers will communicate.
+
+The starter kit comes with a sample Node.js application ready to execute and
+sample chaincode. The starter kit will be running in chaincode developer mode.
+In this mode, the chaincode is built and started prior to the application
+making a call to deploy it.
+
+**Note:** The deployment of chaincode in network mode requires that the
+Hyperledger fabric Node.js SDK has access to the chaincode source code and all
+of its dependencies, in order to properly build a deploy request. It also
+requires that the `peer` have access to the Docker daemon to be able to build
+and deploy the new Docker image that will run the chaincode. *This is a more
+complicated configuration and not suitable to an introduction to the
+Hyperledger fabric.* We recommend first running in chaincode development mode.
+
+## Further exploration
+
+If you wish, there are a number of chaincode examples near by.
+```
+ cd ../../chaincode
+```
+## Getting started
+
+**Note:** This sample was prepared using Docker for Mac 1.12.0
+
+* Prerequisite software to install:
+
+ * [Docker](https://www.docker.com/products/overview)
+ * docker-compose (may be packaged with Docker)
+
+* Copy our [docker-compose.yml](https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/docker-compose.yml) file to a local directory:
+
+```
+ curl -o docker-compose.yml https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/docker-compose.yml
+```
+ The docker-compose environment uses three Docker images. Two are published to
+ DockerHub. However, with the third, we provide you the source to build your own,
+ so that you can customize it to inject your application code for development. The following [Dockerfile](https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/Dockerfile)
+ is used to build the base **fabric-starter-kit** image and may be used as
+ a starting point for your own customizations.
+
+```
+ curl -o Dockerfile https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/Dockerfile
+ docker build -t hyperledger/fabric-starter-kit:latest .
+```
+
+* Start the fabric network environment using docker-compose. From a terminal
+session that has the working directory of where the above *docker-compose.yml*
+is located, execute one of following `docker-compose` commands.
+
+ * to run as detached containers:
+
+```
+ docker-compose up -d
+```
+ **note:** to see the logs for the `peer` container use the
+ `docker logs peer` command
+
+ * to run in the foreground and see the log output in the current terminal
+ session:
+
+```
+ docker-compose up
+```
+
+ Both commands will start three Docker containers. To view the container
+ status use the `docker ps` command. The first time this is run, the Docker
+ images will be downloaded. This may take 10 minutes or more depending on the
+ network connections of the system running the command.
+
+```
+ docker ps
+```
+ You should see something similar to the following:
+
+```
+ CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
+ bb01a2fa96ef hyperledger/fabric-starter-kit "sh -c 'sleep 20; /op" About a minute ago Up 59 seconds starter
+ ec7572e65f12 hyperledger/fabric-peer "sh -c 'sleep 10; pee" About a minute ago Up About a minute peer
+ 118ef6da1709 hyperledger/fabric-membersrvc "membersrvc" About a minute ago Up About a minute membersrvc
+```
+
+* Start a terminal session in the **starter** container. This is where the
+Node.js application is located.
+
+ **note:** Be sure to wait 20 seconds after starting the network using the
+ `docker-compose up` command before executing the following command to allow
+ the network to initialize:
+
+```
+ docker exec -it starter /bin/bash
+```
+
+* From the terminal session in the **starter** container execute the standalone
+Node.js application. The Docker terminal session should be in the working
+directory of the sample application called **app.js** (*/opt/gopath/src/github.com/hyperledger/fabric/examples/sdk/node*). Execute
+the following Node.js command to run the application:
+
+```
+ node app
+```
+ In another terminal session on the host you can view the logs for the peer
+ by executing the following command (not in the docker shell above, in a new
+ terminal session of the real system):
+
+```
+ docker logs peer
+```
+
+* If you wish to run your own Node.js application using the pre-built Docker
+images:
+ * use the directories in the `volumes` tag under **starter** in the
+ `docker-compose.yml` file as a place to store your programs from the host
+ system into the docker container. The first path is the top level system
+ (host system) and the second is created in the Docker container. If you wish
+ to use a host location that is not under the `/Users` directory (`~` is
+ under `/Users') then you must add that to the Docker file sharing
+ under Docker preferences.
+
+```yaml
+ volumes:
+ - ~/mytest:/user/mytest
+```
+ * copy or create and edit your application in the `~/mytest` directory as
+ stated in the `docker-compose.yml` `volumes` tag under **starter** container.
+ * run npm to install Hyperledger fabric Node.js SDK in the `mytest` directory:
+
+```
+ npm install /opt/gopath/src/github.com/hyperledger/fabric/sdk/node
+```
+ * run the application from within the **starter** Docker container using the
+ following commands:
+
+```
+ docker exec -it starter /bin/bash
+```
+ once in the shell, and assuming your Node.js application is called `app.js`:
+
+```
+ cd /user/mytest
+ node app
+```
+* To shutdown the environment, execute the following **docker-compose** command
+in the directory where the *docker-compose.yml* is located. Any changes you made
+to the sample application or deployment of a chaincode will be lost. Only
+changes made to the shared area defined in the 'volumes' tag of the **starter**
+container will persist. This will shutdown each of the containers and remove
+the containers from Docker:
+
+```
+ docker-compose down
+```
+ or if you wish to keep your changes and just stop the containers, which will
+ be restarted on the next `up` command:
+
+```
+ docker-compose kill
+```
diff --git a/events/producer/handler.go b/events/producer/handler.go
index 57befb82308..4ffe8e2022d 100644
--- a/events/producer/handler.go
+++ b/events/producer/handler.go
@@ -25,7 +25,6 @@ import (
type handler struct {
ChatStream pb.Events_ChatServer
- doneChan chan bool
interestedEvents map[string]*pb.Interest
}
@@ -34,7 +33,6 @@ func newEventHandler(stream pb.Events_ChatServer) (*handler, error) {
ChatStream: stream,
}
d.interestedEvents = make(map[string]*pb.Interest)
- d.doneChan = make(chan bool)
return d, nil
}
@@ -42,7 +40,6 @@ func newEventHandler(stream pb.Events_ChatServer) (*handler, error) {
func (d *handler) Stop() error {
d.deregisterAll()
d.interestedEvents = nil
- d.doneChan <- true
return nil
}
diff --git a/events/producer/producer.go b/events/producer/producer.go
index 4e70d0fd56a..85508b936fe 100644
--- a/events/producer/producer.go
+++ b/events/producer/producer.go
@@ -68,7 +68,7 @@ func (p *EventsServer) Chat(stream pb.Events_ChatServer) error {
err = handler.HandleMessage(in)
if err != nil {
producerLogger.Errorf("Error handling message: %s", err)
- //return err
+ return err
}
}
diff --git a/examples/chaincode/go/asset_management/app/app_internal.go b/examples/chaincode/go/asset_management/app/app_internal.go
index 631ba346a42..f9adb444ba8 100644
--- a/examples/chaincode/go/asset_management/app/app_internal.go
+++ b/examples/chaincode/go/asset_management/app/app_internal.go
@@ -143,7 +143,7 @@ func deployInternal(deployer crypto.Client, adminCert crypto.CertificateHandler)
Type: 1,
ChaincodeID: &pb.ChaincodeID{Path: "github.com/hyperledger/fabric/examples/chaincode/go/asset_management"},
//ChaincodeID: &pb.ChaincodeID{Name: chaincodeName},
- CtorMsg: &pb.ChaincodeInput{Function: "init", Args: []string{}},
+ CtorMsg: &pb.ChaincodeInput{Args: util.ToChaincodeArgs("init")},
Metadata: adminCert.GetCertificate(),
ConfidentialityLevel: confidentialityLevel,
}
@@ -187,8 +187,7 @@ func assignOwnershipInternal(invoker crypto.Client, invokerCert crypto.Certifica
}
chaincodeInput := &pb.ChaincodeInput{
- Function: "assign",
- Args: []string{asset, base64.StdEncoding.EncodeToString(newOwnerCert.GetCertificate())},
+ Args: util.ToChaincodeArgs("assign", asset, base64.StdEncoding.EncodeToString(newOwnerCert.GetCertificate())),
}
chaincodeInputRaw, err := proto.Marshal(chaincodeInput)
if err != nil {
@@ -239,8 +238,7 @@ func transferOwnershipInternal(owner crypto.Client, ownerCert crypto.Certificate
}
chaincodeInput := &pb.ChaincodeInput{
- Function: "transfer",
- Args: []string{asset, base64.StdEncoding.EncodeToString(newOwnerCert.GetCertificate())},
+ Args: util.ToChaincodeArgs("transfer", asset, base64.StdEncoding.EncodeToString(newOwnerCert.GetCertificate())),
}
chaincodeInputRaw, err := proto.Marshal(chaincodeInput)
if err != nil {
@@ -275,7 +273,7 @@ func transferOwnershipInternal(owner crypto.Client, ownerCert crypto.Certificate
}
func whoIsTheOwner(invoker crypto.Client, asset string) (transaction *pb.Transaction, resp *pb.Response, err error) {
- chaincodeInput := &pb.ChaincodeInput{Function: "query", Args: []string{asset}}
+ chaincodeInput := &pb.ChaincodeInput{Args: util.ToChaincodeArgs("query", asset)}
// Prepare spec and submit
spec := &pb.ChaincodeSpec{
diff --git a/examples/chaincode/go/asset_management/asset_management.go b/examples/chaincode/go/asset_management/asset_management.go
index 2ec8d15bae1..1734c2c672d 100644
--- a/examples/chaincode/go/asset_management/asset_management.go
+++ b/examples/chaincode/go/asset_management/asset_management.go
@@ -266,7 +266,7 @@ func (t *AssetManagementChaincode) Query(stub shim.ChaincodeStubInterface) ([]by
myLogger.Debugf("Query [%s]", function)
if function != "query" {
- return nil, errors.New("Invalid query function name. Expecting \"query\"")
+ return nil, errors.New("Invalid query function name. Expecting 'query' but found '" + function + "'")
}
var err error
diff --git a/examples/chaincode/go/asset_management02/asset_management02_test.go b/examples/chaincode/go/asset_management02/asset_management02_test.go
index 9f2d13831d3..14efcb800da 100755
--- a/examples/chaincode/go/asset_management02/asset_management02_test.go
+++ b/examples/chaincode/go/asset_management02/asset_management02_test.go
@@ -24,7 +24,6 @@ import (
"testing"
"time"
- "io/ioutil"
"os"
"path/filepath"
@@ -34,6 +33,7 @@ import (
"github.com/hyperledger/fabric/core/container"
"github.com/hyperledger/fabric/core/crypto"
"github.com/hyperledger/fabric/core/ledger"
+ "github.com/hyperledger/fabric/core/util"
"github.com/hyperledger/fabric/membersrvc/ca"
pb "github.com/hyperledger/fabric/protos"
"github.com/op/go-logging"
@@ -330,7 +330,7 @@ func deploy(admCert crypto.CertificateHandler) error {
spec := &pb.ChaincodeSpec{
Type: 1,
ChaincodeID: &pb.ChaincodeID{Name: "mycc"},
- CtorMsg: &pb.ChaincodeInput{Function: "init", Args: []string{}},
+ CtorMsg: &pb.ChaincodeInput{Args: util.ToChaincodeArgs("init")},
Metadata: []byte("issuer"),
ConfidentialityLevel: pb.ConfidentialityLevel_PUBLIC,
}
@@ -373,7 +373,7 @@ func assignOwnership(assigner crypto.Client, newOwnerCert crypto.CertificateHand
return err
}
- chaincodeInput := &pb.ChaincodeInput{Function: "assignOwnership", Args: []string{base64.StdEncoding.EncodeToString(newOwnerCert.GetCertificate()), attributeName, amount}}
+ chaincodeInput := &pb.ChaincodeInput{Args: util.ToChaincodeArgs("assignOwnership", base64.StdEncoding.EncodeToString(newOwnerCert.GetCertificate()), attributeName, amount)}
// Prepare spec and submit
spec := &pb.ChaincodeSpec{
@@ -419,12 +419,13 @@ func transferOwnership(owner crypto.Client, ownerCert crypto.CertificateHandler,
return err
}
- args := []string{base64.StdEncoding.EncodeToString(ownerCert.GetCertificate()),
+ chaincodeInput := &pb.ChaincodeInput{Args: util.ToChaincodeArgs(
+ "transferOwnership",
+ base64.StdEncoding.EncodeToString(ownerCert.GetCertificate()),
fromAttributes,
base64.StdEncoding.EncodeToString(newOwnerCert.GetCertificate()),
toAttributes,
- amount}
- chaincodeInput := &pb.ChaincodeInput{Function: "transferOwnership", Args: args}
+ amount)}
// Prepare spec and submit
spec := &pb.ChaincodeSpec{
@@ -466,7 +467,7 @@ func getBalance(accountID string) ([]byte, error) {
}
func Query(function, accountID string) ([]byte, error) {
- chaincodeInput := &pb.ChaincodeInput{Function: function, Args: []string{accountID}}
+ chaincodeInput := &pb.ChaincodeInput{Args: util.ToChaincodeArgs(function, accountID)}
// Prepare spec and submit
spec := &pb.ChaincodeSpec{
@@ -526,10 +527,11 @@ func setup() {
}
func initMembershipSrvc() {
- ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
+ // ca.LogInit seems to have been removed
+ //ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
ca.CacheConfiguration() // Cache configuration
aca = ca.NewACA()
- eca = ca.NewECA()
+ eca = ca.NewECA(aca)
tca = ca.NewTCA(eca)
tlsca = ca.NewTLSCA(eca)
diff --git a/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles.go b/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles.go
index 2329f1aedac..b2e2d729a90 100644
--- a/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles.go
+++ b/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles.go
@@ -114,7 +114,7 @@ func (t *AssetManagementChaincode) assign(stub shim.ChaincodeStubInterface, args
callerRole, err := stub.ReadCertAttribute("role")
if err != nil {
- fmt.Printf("Error reading attribute [%v] \n", err)
+ fmt.Printf("Error reading attribute 'role' [%v] \n", err)
return nil, fmt.Errorf("Failed fetching caller role. Error was [%v]", err)
}
@@ -237,7 +237,7 @@ func (t *AssetManagementChaincode) Invoke(stub shim.ChaincodeStubInterface) ([]b
func (t *AssetManagementChaincode) Query(stub shim.ChaincodeStubInterface) ([]byte, error) {
function, args := stub.GetFunctionAndParameters()
if function != "query" {
- return nil, errors.New("Invalid query function name. Expecting \"query\"")
+ return nil, errors.New("Invalid query function name. Expecting 'query' but found '" + function + "'")
}
var err error
diff --git a/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles_test.go b/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles_test.go
index d90f50ae1ef..7c087bd6502 100644
--- a/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles_test.go
+++ b/examples/chaincode/go/asset_management_with_roles/asset_management_with_roles_test.go
@@ -366,7 +366,7 @@ func setup() {
func initMembershipSrvc() {
ca.CacheConfiguration() // Cache configuration
aca = ca.NewACA()
- eca = ca.NewECA()
+ eca = ca.NewECA(aca)
tca = ca.NewTCA(eca)
tlsca = ca.NewTLSCA(eca)
diff --git a/examples/chaincode/go/attributes_to_state/attributes_to_state.go b/examples/chaincode/go/attributes_to_state/attributes_to_state.go
index 211d0b81500..d33a9327947 100644
--- a/examples/chaincode/go/attributes_to_state/attributes_to_state.go
+++ b/examples/chaincode/go/attributes_to_state/attributes_to_state.go
@@ -50,7 +50,7 @@ func (t *Attributes2State) setStateToAttributes(stub shim.ChaincodeStubInterface
// Init intializes the chaincode by reading the transaction attributes and storing
// the attrbute values in the state
func (t *Attributes2State) Init(stub shim.ChaincodeStubInterface) ([]byte, error) {
- function, args := stub.GetFunctionAndParameters()
+ _, args := stub.GetFunctionAndParameters()
err := t.setStateToAttributes(stub, args)
if err != nil {
return nil, err
diff --git a/examples/chaincode/go/chaincode_example02/chaincode_example02.go b/examples/chaincode/go/chaincode_example02/chaincode_example02.go
index a4148f3fb8d..104b75645bb 100644
--- a/examples/chaincode/go/chaincode_example02/chaincode_example02.go
+++ b/examples/chaincode/go/chaincode_example02/chaincode_example02.go
@@ -113,6 +113,9 @@ func (t *SimpleChaincode) Invoke(stub shim.ChaincodeStubInterface) ([]byte, erro
// Perform the execution
X, err = strconv.Atoi(args[2])
+ if err != nil {
+ return nil, errors.New("Invalid transaction amount, expecting a integer value")
+ }
Aval = Aval - X
Bval = Bval + X
fmt.Printf("Aval = %d, Bval = %d\n", Aval, Bval)
diff --git a/examples/chaincode/go/chaincode_example04/chaincode_example04.go b/examples/chaincode/go/chaincode_example04/chaincode_example04.go
index d6aa2fae7ad..6394c3ba0cd 100644
--- a/examples/chaincode/go/chaincode_example04/chaincode_example04.go
+++ b/examples/chaincode/go/chaincode_example04/chaincode_example04.go
@@ -34,7 +34,7 @@ type SimpleChaincode struct {
func (t *SimpleChaincode) GetChaincodeToCall() string {
//This is the hashcode for github.com/hyperledger/fabric/core/example/chaincode/chaincode_example02
//if the example is modifed this hashcode will change!!
- chainCodeToCall := "dbf03d6840375cf5dd188a745311a34f6c449cfe5e0d5dbfffa1b22106b08bbb64669662684e71d9c1c2f476e5ba24ff35b93314e35b09124ea72c8297480be8"
+ chainCodeToCall := "d8f2ef95a72aa85b0f92580580176479fcd0874f6b0855ae21b98dcb926353d357e94cc80b5fb9b789d3a0acfdf143166b3bdc3e483feabeb4ab0b0a530b83a6"
return chainCodeToCall
}
diff --git a/examples/chaincode/go/rbac_tcerts_no_attrs/rbac_test.go b/examples/chaincode/go/rbac_tcerts_no_attrs/rbac_test.go
index f611b2a814f..fe9affdb6a8 100644
--- a/examples/chaincode/go/rbac_tcerts_no_attrs/rbac_test.go
+++ b/examples/chaincode/go/rbac_tcerts_no_attrs/rbac_test.go
@@ -25,7 +25,6 @@ import (
"testing"
"time"
- "io/ioutil"
"os"
"path/filepath"
@@ -35,6 +34,7 @@ import (
"github.com/hyperledger/fabric/core/container"
"github.com/hyperledger/fabric/core/crypto"
"github.com/hyperledger/fabric/core/ledger"
+ "github.com/hyperledger/fabric/core/util"
"github.com/hyperledger/fabric/membersrvc/ca"
pb "github.com/hyperledger/fabric/protos"
"github.com/op/go-logging"
@@ -175,7 +175,7 @@ func deploy(admCert crypto.CertificateHandler) error {
spec := &pb.ChaincodeSpec{
Type: 1,
ChaincodeID: &pb.ChaincodeID{Name: "mycc"},
- CtorMsg: &pb.ChaincodeInput{Function: "init", Args: []string{}},
+ CtorMsg: &pb.ChaincodeInput{Args: util.ToChaincodeArgs("init")},
Metadata: admCert.GetCertificate(),
ConfidentialityLevel: pb.ConfidentialityLevel_PUBLIC,
}
@@ -197,7 +197,7 @@ func deploy(admCert crypto.CertificateHandler) error {
ledger, err := ledger.GetLedger()
ledger.BeginTxBatch("1")
- _, err = chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
+ _, _, err = chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
if err != nil {
return fmt.Errorf("Error deploying chaincode: %s", err)
}
@@ -222,7 +222,7 @@ func addRole(admCert crypto.CertificateHandler, idCert crypto.CertificateHandler
return err
}
- chaincodeInput := &pb.ChaincodeInput{Function: "addRole", Args: []string{string(idCert.GetCertificate()), role}}
+ chaincodeInput := &pb.ChaincodeInput{Args: util.ToChaincodeArgs("addRole", string(idCert.GetCertificate()), role)}
chaincodeInputRaw, err := proto.Marshal(chaincodeInput)
if err != nil {
return err
@@ -263,7 +263,7 @@ func addRole(admCert crypto.CertificateHandler, idCert crypto.CertificateHandler
ledger, err := ledger.GetLedger()
ledger.BeginTxBatch("1")
- _, err = chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
+ _, _, err = chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
if err != nil {
return fmt.Errorf("Error deploying chaincode: %s", err)
}
@@ -289,7 +289,7 @@ func write(invoker crypto.Client, invokerCert crypto.CertificateHandler, value [
return err
}
- chaincodeInput := &pb.ChaincodeInput{Function: "write", Args: []string{string(value)}}
+ chaincodeInput := &pb.ChaincodeInput{Args: util.ToChaincodeArgs("write", string(value))}
chaincodeInputRaw, err := proto.Marshal(chaincodeInput)
if err != nil {
return err
@@ -330,7 +330,7 @@ func write(invoker crypto.Client, invokerCert crypto.CertificateHandler, value [
ledger, err := ledger.GetLedger()
ledger.BeginTxBatch("1")
- _, err = chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
+ _, _, err = chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
if err != nil {
return fmt.Errorf("Error deploying chaincode: %s", err)
}
@@ -357,7 +357,7 @@ func read(invoker crypto.Client, invokerCert crypto.CertificateHandler) ([]byte,
return nil, err
}
- chaincodeInput := &pb.ChaincodeInput{Function: "read", Args: []string{}}
+ chaincodeInput := &pb.ChaincodeInput{Args: util.ToChaincodeArgs("read")}
chaincodeInputRaw, err := proto.Marshal(chaincodeInput)
if err != nil {
return nil, err
@@ -398,7 +398,7 @@ func read(invoker crypto.Client, invokerCert crypto.CertificateHandler) ([]byte,
ledger, err := ledger.GetLedger()
ledger.BeginTxBatch("1")
- result, err := chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
+ result, _, err := chaincode.Execute(ctx, chaincode.GetChain(chaincode.DefaultChain), transaction)
if err != nil {
return nil, fmt.Errorf("Error deploying chaincode: %s", err)
}
@@ -440,9 +440,8 @@ func setup() {
}
func initMemershipServices() {
- ca.LogInit(ioutil.Discard, os.Stdout, os.Stdout, os.Stderr, os.Stdout)
ca.CacheConfiguration() // Cache configuration
- eca = ca.NewECA()
+ eca = ca.NewECA(nil)
tca = ca.NewTCA(eca)
tlsca = ca.NewTLSCA(eca)
diff --git a/examples/chaincode/go/utxo/Dockerfile b/examples/chaincode/go/utxo/Dockerfile
index 927b746931c..807632d9c30 100644
--- a/examples/chaincode/go/utxo/Dockerfile
+++ b/examples/chaincode/go/utxo/Dockerfile
@@ -1,4 +1,5 @@
-from hyperledger/fabric-baseimage
+# FIXME: someone from the UTXO team will need to verify or rework this
+FROM ubuntu:latest
RUN apt-get update && apt-get install pkg-config autoconf libtool -y
RUN cd /tmp && git clone https://github.com/bitcoin/secp256k1.git && cd secp256k1/
diff --git a/examples/chaincode/go/utxo/util/dah.pb.go b/examples/chaincode/go/utxo/util/dah.pb.go
index 0d694eec855..50f1df3b8f4 100644
--- a/examples/chaincode/go/utxo/util/dah.pb.go
+++ b/examples/chaincode/go/utxo/util/dah.pb.go
@@ -22,6 +22,12 @@ var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
type TX struct {
Version uint32 `protobuf:"varint,1,opt,name=version" json:"version,omitempty"`
LockTime uint32 `protobuf:"varint,2,opt,name=lockTime" json:"lockTime,omitempty"`
@@ -31,9 +37,10 @@ type TX struct {
Fee uint64 `protobuf:"varint,6,opt,name=fee" json:"fee,omitempty"`
}
-func (m *TX) Reset() { *m = TX{} }
-func (m *TX) String() string { return proto.CompactTextString(m) }
-func (*TX) ProtoMessage() {}
+func (m *TX) Reset() { *m = TX{} }
+func (m *TX) String() string { return proto.CompactTextString(m) }
+func (*TX) ProtoMessage() {}
+func (*TX) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
func (m *TX) GetTxin() []*TX_TXIN {
if m != nil {
@@ -56,9 +63,10 @@ type TX_TXIN struct {
Sequence uint32 `protobuf:"varint,4,opt,name=sequence" json:"sequence,omitempty"`
}
-func (m *TX_TXIN) Reset() { *m = TX_TXIN{} }
-func (m *TX_TXIN) String() string { return proto.CompactTextString(m) }
-func (*TX_TXIN) ProtoMessage() {}
+func (m *TX_TXIN) Reset() { *m = TX_TXIN{} }
+func (m *TX_TXIN) String() string { return proto.CompactTextString(m) }
+func (*TX_TXIN) ProtoMessage() {}
+func (*TX_TXIN) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
type TX_TXOUT struct {
Value uint64 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
@@ -67,6 +75,37 @@ type TX_TXOUT struct {
Quantity uint64 `protobuf:"varint,4,opt,name=quantity" json:"quantity,omitempty"`
}
-func (m *TX_TXOUT) Reset() { *m = TX_TXOUT{} }
-func (m *TX_TXOUT) String() string { return proto.CompactTextString(m) }
-func (*TX_TXOUT) ProtoMessage() {}
+func (m *TX_TXOUT) Reset() { *m = TX_TXOUT{} }
+func (m *TX_TXOUT) String() string { return proto.CompactTextString(m) }
+func (*TX_TXOUT) ProtoMessage() {}
+func (*TX_TXOUT) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 1} }
+
+func init() {
+ proto.RegisterType((*TX)(nil), "util.TX")
+ proto.RegisterType((*TX_TXIN)(nil), "util.TX.TXIN")
+ proto.RegisterType((*TX_TXOUT)(nil), "util.TX.TXOUT")
+}
+
+func init() { proto.RegisterFile("dah.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+ // 277 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x91, 0xcf, 0x4b, 0xc3, 0x30,
+ 0x1c, 0xc5, 0x59, 0x9b, 0x56, 0xfd, 0xba, 0x0d, 0xf9, 0x22, 0x12, 0x7a, 0x90, 0x29, 0x1e, 0x76,
+ 0xea, 0x41, 0xff, 0x09, 0xbd, 0x28, 0x84, 0x0a, 0xbb, 0x76, 0x31, 0xba, 0x68, 0x6d, 0xb6, 0xfc,
+ 0x18, 0xf5, 0xea, 0x5f, 0x6e, 0x92, 0x76, 0xa3, 0x42, 0x0f, 0xf9, 0xf4, 0x3d, 0xde, 0x7b, 0x21,
+ 0x70, 0xf6, 0x56, 0x6f, 0xca, 0xad, 0x56, 0x56, 0x21, 0x71, 0x56, 0x36, 0xb7, 0xbf, 0x29, 0x24,
+ 0xd5, 0x0a, 0x29, 0x9c, 0xec, 0x85, 0x36, 0x52, 0xb5, 0x74, 0xb2, 0x98, 0x2c, 0x67, 0xec, 0x80,
+ 0x58, 0xc0, 0x69, 0xa3, 0xf8, 0x57, 0x25, 0xbf, 0x05, 0x4d, 0xa2, 0x74, 0x64, 0xbc, 0x01, 0x62,
+ 0x3b, 0xd9, 0xd2, 0x74, 0x91, 0x2e, 0xcf, 0xef, 0x67, 0x65, 0x48, 0x2c, 0xab, 0x95, 0xff, 0x9e,
+ 0x9e, 0x59, 0x94, 0xf0, 0x0e, 0x32, 0xdb, 0x29, 0x67, 0x29, 0x89, 0x9e, 0xf9, 0xc8, 0xf3, 0xf2,
+ 0x5a, 0xb1, 0x5e, 0xc4, 0x2b, 0xc8, 0xd7, 0x21, 0xd5, 0xd0, 0xcc, 0xdb, 0xa6, 0x6c, 0x20, 0xbc,
+ 0x80, 0xf4, 0x5d, 0x08, 0x9a, 0xfb, 0x5e, 0xc2, 0xc2, 0xb1, 0xf8, 0x04, 0x12, 0xd2, 0x71, 0x0e,
+ 0x89, 0xec, 0x86, 0xad, 0xfe, 0x84, 0xd7, 0x00, 0x46, 0x39, 0xcd, 0xc5, 0x63, 0x6d, 0x36, 0x71,
+ 0xe8, 0x94, 0x8d, 0xfe, 0x84, 0x06, 0xc3, 0xb5, 0xdc, 0x5a, 0x3f, 0x36, 0x68, 0x03, 0x85, 0xeb,
+ 0x19, 0xb1, 0x73, 0xa2, 0xe5, 0xc2, 0x4f, 0x8c, 0xd7, 0x3b, 0x70, 0xf1, 0x01, 0x59, 0x5c, 0x89,
+ 0x97, 0x90, 0xed, 0xeb, 0xc6, 0x89, 0xd8, 0x47, 0x58, 0x0f, 0xa3, 0xc8, 0xe4, 0x5f, 0xa4, 0x77,
+ 0x73, 0xd5, 0x28, 0x3d, 0x34, 0xf5, 0x10, 0x8a, 0x76, 0xae, 0x6e, 0xad, 0xb4, 0x3f, 0xb1, 0x88,
+ 0xb0, 0x23, 0xaf, 0xf3, 0xf8, 0x22, 0x0f, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x96, 0x91, 0x0f,
+ 0xdd, 0x9e, 0x01, 0x00, 0x00,
+}
diff --git a/examples/events/block-listener/block-listener.go b/examples/events/block-listener/block-listener.go
index 30405eb142f..d7dae16e8b8 100644
--- a/examples/events/block-listener/block-listener.go
+++ b/examples/events/block-listener/block-listener.go
@@ -57,16 +57,17 @@ func (a *adapter) Recv(msg *pb.Event) (bool, error) {
a.notfy <- o
return true, nil
}
- if o, e := msg.Event.(*pb.Event_Rejection); e && a.listenToRejections {
- a.rejected <- o
+ if o, e := msg.Event.(*pb.Event_Rejection); e {
+ if a.listenToRejections {
+ a.rejected <- o
+ }
return true, nil
}
if o, e := msg.Event.(*pb.Event_ChaincodeEvent); e {
a.cEvent <- o
return true, nil
}
- a.notfy <- nil
- return false, nil
+ return false, fmt.Errorf("Receive unkown type event: %v", msg)
}
//Disconnected implements consumer.EventAdapter interface for disconnecting
diff --git a/examples/sdk/node/Dockerfile b/examples/sdk/node/Dockerfile
new file mode 100644
index 00000000000..0d2218dfe00
--- /dev/null
+++ b/examples/sdk/node/Dockerfile
@@ -0,0 +1,11 @@
+FROM hyperledger/fabric-peer:latest
+# setup the chaincode sample
+WORKDIR $GOPATH/src/github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02
+RUN go build
+# build the node SDK
+WORKDIR $GOPATH/src/github.com/hyperledger/fabric/sdk/node
+RUN make all
+# now switch to the sample node app location when the shell is opened in the docker
+WORKDIR $GOPATH/src/github.com/hyperledger/fabric/examples/sdk/node
+# install the hfc locally for use by the application
+RUN npm install $GOPATH/src/github.com/hyperledger/fabric/sdk/node
diff --git a/examples/sdk/node/app.js b/examples/sdk/node/app.js
new file mode 100644
index 00000000000..dfc5f401025
--- /dev/null
+++ b/examples/sdk/node/app.js
@@ -0,0 +1,163 @@
+/*
+ Copyright IBM Corp 2016 All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+/*
+ * A simple application utilizing the Node.js Client SDK to:
+ * 1) Enroll a user
+ * 2) User deploys chaincode
+ * 3) User queries chaincode
+ */
+// "HFC" stands for "Hyperledger Fabric Client"
+var hfc = require("hfc");
+
+console.log(" **** starting HFC sample ****");
+
+
+// get the addresses from the docker-compose environment
+var PEER_ADDRESS = process.env.CORE_PEER_ADDRESS;
+var MEMBERSRVC_ADDRESS = process.env.MEMBERSRVC_ADDRESS;
+
+var chain, chaincodeID;
+
+// Create a chain object used to interact with the chain.
+// You can name it anything you want as it is only used by client.
+chain = hfc.newChain("mychain");
+// Initialize the place to store sensitive private key information
+chain.setKeyValStore( hfc.newFileKeyValStore('/tmp/keyValStore') );
+// Set the URL to membership services and to the peer
+console.log("member services address ="+MEMBERSRVC_ADDRESS);
+console.log("peer address ="+PEER_ADDRESS);
+chain.setMemberServicesUrl("grpc://"+MEMBERSRVC_ADDRESS);
+chain.addPeer("grpc://"+PEER_ADDRESS);
+
+// The following is required when the peer is started in dev mode
+// (i.e. with the '--peer-chaincodedev' option)
+var mode = process.env['DEPLOY_MODE'];
+console.log("DEPLOY_MODE=" + mode);
+if (mode === 'dev') {
+ chain.setDevMode(true);
+ //Deploy will not take long as the chain should already be running
+ chain.setDeployWaitTime(10);
+} else {
+ chain.setDevMode(false);
+ //Deploy will take much longer in network mode
+ chain.setDeployWaitTime(120);
+}
+
+
+chain.setInvokeWaitTime(10);
+
+// Begin by enrolling the user
+enroll();
+
+// Enroll a user.
+function enroll() {
+ console.log("enrolling user admin ...");
+ // Enroll "admin" which is preregistered in the membersrvc.yaml
+ chain.enroll("admin", "Xurw3yU9zI0l", function(err, admin) {
+ if (err) {
+ console.log("ERROR: failed to register admin: %s",err);
+ process.exit(1);
+ }
+ // Set this user as the chain's registrar which is authorized to register other users.
+ chain.setRegistrar(admin);
+
+ var userName = "JohnDoe";
+ // registrationRequest
+ var registrationRequest = {
+ enrollmentID: userName,
+ affiliation: "bank_a"
+ };
+ chain.registerAndEnroll(registrationRequest, function(error, user) {
+ if (error) throw Error(" Failed to register and enroll " + userName + ": " + error);
+ console.log("Enrolled %s successfully\n", userName);
+ deploy(user);
+ });
+ });
+}
+
+// Deploy chaincode
+function deploy(user) {
+ console.log("deploying chaincode; please wait ...");
+ // Construct the deploy request
+ var deployRequest = {
+ chaincodeName: process.env.CORE_CHAINCODE_ID_NAME,
+ fcn: "init",
+ args: ["a", "100", "b", "200"]
+ };
+ // where is the chain code, ignored in dev mode
+ deployRequest.chaincodePath = "github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02";
+
+ // Issue the deploy request and listen for events
+ var tx = user.deploy(deployRequest);
+ tx.on('complete', function(results) {
+ // Deploy request completed successfully
+ console.log("deploy complete; results: %j",results);
+ // Set the testChaincodeID for subsequent tests
+ chaincodeID = results.chaincodeID;
+ invoke(user);
+ });
+ tx.on('error', function(error) {
+ console.log("Failed to deploy chaincode: request=%j, error=%k",deployRequest,error);
+ process.exit(1);
+ });
+
+}
+
+// Query chaincode
+function query(user) {
+ console.log("querying chaincode ...");
+ // Construct a query request
+ var queryRequest = {
+ chaincodeID: chaincodeID,
+ fcn: "query",
+ args: ["a"]
+ };
+ // Issue the query request and listen for events
+ var tx = user.query(queryRequest);
+ tx.on('complete', function (results) {
+ console.log("query completed successfully; results=%j",results);
+ process.exit(0);
+ });
+ tx.on('error', function (error) {
+ console.log("Failed to query chaincode: request=%j, error=%k",queryRequest,error);
+ process.exit(1);
+ });
+}
+
+//Invoke chaincode
+function invoke(user) {
+ console.log("invoke chaincode ...");
+ // Construct a query request
+ var invokeRequest = {
+ chaincodeID: chaincodeID,
+ fcn: "invoke",
+ args: ["a", "b", "1"]
+ };
+ // Issue the invoke request and listen for events
+ var tx = user.invoke(invokeRequest);
+ tx.on('submitted', function (results) {
+ console.log("invoke submitted successfully; results=%j",results);
+ });
+ tx.on('complete', function (results) {
+ console.log("invoke completed successfully; results=%j",results);
+ query(user);
+ });
+ tx.on('error', function (error) {
+ console.log("Failed to invoke chaincode: request=%j, error=%k",invokeRequest,error);
+ process.exit(1);
+ });
+}
diff --git a/examples/sdk/node/docker-compose.yml b/examples/sdk/node/docker-compose.yml
new file mode 100644
index 00000000000..64302ade722
--- /dev/null
+++ b/examples/sdk/node/docker-compose.yml
@@ -0,0 +1,50 @@
+membersrvc:
+ # try 'docker ps' to see the container status after starting this compose
+ container_name: membersrvc
+ image: hyperledger/fabric-membersrvc
+ command: membersrvc
+
+peer:
+ container_name: peer
+ image: hyperledger/fabric-peer
+ environment:
+ - CORE_PEER_ADDRESSAUTODETECT=true
+ - CORE_VM_ENDPOINT=unix:///var/run/docker.sock
+ - CORE_LOGGING_LEVEL=DEBUG
+ - CORE_PEER_ID=vp0
+ - CORE_SECURITY_ENABLED=true
+ - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054
+ - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054
+ - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054
+ - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=noops
+ # this gives access to the docker host daemon to deploy chain code in network mode
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock
+ # have the peer wait 10 sec for membersrvc to start
+ # the following is to run the peer in Developer mode - also set sample DEPLOY_MODE=dev
+ command: sh -c "sleep 10; peer node start --peer-chaincodedev"
+ #command: sh -c "sleep 10; peer node start"
+ links:
+ - membersrvc
+
+starter:
+ container_name: starter
+ image: hyperledger/fabric-starter-kit
+ volumes:
+ # tweak this to map a local developmnt directory tree into the container
+ - ~/mytest:/user/mytest
+ environment:
+ - MEMBERSRVC_ADDRESS=membersrvc:7054
+ - PEER_ADDRESS=peer:7051
+ - KEY_VALUE_STORE=/tmp/hl_sdk_node_key_value_store
+ # set to following to 'dev' if peer running in Developer mode
+ - DEPLOY_MODE=dev
+ - CORE_CHAINCODE_ID_NAME=mycc
+ - CORE_PEER_ADDRESS=peer:7051
+ # the following command will start the chain code when this container starts and ready it for deployment by the app
+ command: sh -c "sleep 20; /opt/gopath/src/github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02/chaincode_example02"
+ stdin_open: true
+ tty: true
+ links:
+ - membersrvc
+ - peer
diff --git a/examples/sdk/node/web-app.js b/examples/sdk/node/web-app.js
new file mode 100644
index 00000000000..6dff8f41719
--- /dev/null
+++ b/examples/sdk/node/web-app.js
@@ -0,0 +1,118 @@
+/*
+ Copyright IBM Corp 2016 All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+/**
+ * This example shows how to do the following in a web app.
+ * 1) At initialization time, enroll the web app with the blockchain.
+ * The identity must have already been registered.
+ * 2) At run time, after a user has authenticated with the web app:
+ * a) register and enroll an identity for the user;
+ * b) use this identity to deploy, query, and invoke a chaincode.
+ */
+var hfc = require('hfc');
+
+//get the addresses from the docker-compose environment
+var PEER_ADDRESS = process.env.PEER_ADDRESS;
+var MEMBERSRVC_ADDRESS = process.env.MEMBERSRVC_ADDRESS;
+
+// Create a client chain.
+// The name can be anything as it is only used internally.
+var chain = hfc.newChain("targetChain");
+
+// Configure the KeyValStore which is used to store sensitive keys
+// as so it is important to secure this storage.
+// The FileKeyValStore is a simple file-based KeyValStore, but you
+// can easily implement your own to store whereever you want.
+// To work correctly in a cluster, the file-based KeyValStore must
+// either be on a shared file system shared by all members of the cluster
+// or you must implement you own KeyValStore which all members of the
+// cluster can share.
+chain.setKeyValStore( hfc.newFileKeyValStore('/tmp/keyValStore') );
+
+// Set the URL for membership services
+chain.setMemberServicesUrl("grpc://MEMBERSRVC_ADDRESS");
+
+// Add at least one peer's URL. If you add multiple peers, it will failover
+// to the 2nd if the 1st fails, to the 3rd if both the 1st and 2nd fails, etc.
+chain.addPeer("grpc://PEER_ADDRESS");
+
+// Enroll "WebAppAdmin" which is already registered because it is
+// listed in fabric/membersrvc/membersrvc.yaml with its one time password.
+// If "WebAppAdmin" has already been registered, this will still succeed
+// because it stores the state in the KeyValStore
+// (i.e. in '/tmp/keyValStore' in this sample).
+chain.enroll("WebAppAdmin", "DJY27pEnl16d", function(err, webAppAdmin) {
+ if (err) return console.log("ERROR: failed to register %s: %s",err);
+ // Successfully enrolled WebAppAdmin during initialization.
+ // Set this user as the chain's registrar which is authorized to register other users.
+ chain.setRegistrar(webAppAdmin);
+ // Now begin listening for web app requests
+ listenForUserRequests();
+});
+
+// Main web app function to listen for and handle requests. This is specific to
+// your application but is provided here to demonstrate the pattern.
+function listenForUserRequests() {
+ for (;;) {
+ // WebApp-specific logic goes here to await the next request.
+ // ...
+ // Assume that we received a request from an authenticated user
+ // and have 'userName' and 'userAccount'.
+ // Then determined that we need to invoke the chaincode
+ // with 'chaincodeID' and function named 'fcn' with arguments 'args'.
+ handleUserRequest(userName,userAccount,chaincodeID,fcn,args);
+ }
+}
+
+// Handle a user request
+function handleUserRequest(userName, userAccount, chaincodeID, fcn, args) {
+ // Register and enroll this user.
+ // If this user has already been registered and/or enrolled, this will
+ // still succeed because the state is kept in the KeyValStore
+ // (i.e. in '/tmp/keyValStore' in this sample).
+ var registrationRequest = {
+ roles: [ 'client' ],
+ enrollmentID: userName,
+ affiliation: "bank_a",
+ attributes: [{name:'role',value:'client'},{name:'account',value:userAccount}]
+ };
+ chain.registerAndEnroll( registrationRequest, function(err, user) {
+ if (err) return console.log("ERROR: %s",err);
+ // Issue an invoke request
+ var invokeRequest = {
+ // Name (hash) required for invoke
+ chaincodeID: chaincodeID,
+ // Function to trigger
+ fcn: fcn,
+ // Parameters for the invoke function
+ args: args
+ };
+ // Invoke the request from the user object and wait for events to occur.
+ var tx = user.invoke(invokeRequest);
+ // Listen for the 'submitted' event
+ tx.on('submitted', function(results) {
+ console.log("submitted invoke: %j",results);
+ });
+ // Listen for the 'complete' event.
+ tx.on('complete', function(results) {
+ console.log("completed invoke: %j",results);
+ });
+ // Listen for the 'error' event.
+ tx.on('error', function(err) {
+ console.log("error on invoke: %j",err);
+ });
+ });
+}
\ No newline at end of file
diff --git a/gossip/proto/message.pb.go b/gossip/proto/message.pb.go
index ffbdd5514a0..72f311ab4a4 100644
--- a/gossip/proto/message.pb.go
+++ b/gossip/proto/message.pb.go
@@ -42,6 +42,12 @@ var _ = proto1.Marshal
var _ = fmt.Errorf
var _ = math.Inf
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto1.ProtoPackageIsVersion2 // please upgrade the proto package
+
type DataMessage_Type int32
const (
@@ -70,6 +76,7 @@ var DataMessage_Type_value = map[string]int32{
func (x DataMessage_Type) String() string {
return proto1.EnumName(DataMessage_Type_name, int32(x))
}
+func (DataMessage_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
type GossipMessage struct {
Nonce uint64 `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
@@ -89,9 +96,10 @@ type GossipMessage struct {
Content isGossipMessage_Content `protobuf_oneof:"content"`
}
-func (m *GossipMessage) Reset() { *m = GossipMessage{} }
-func (m *GossipMessage) String() string { return proto1.CompactTextString(m) }
-func (*GossipMessage) ProtoMessage() {}
+func (m *GossipMessage) Reset() { *m = GossipMessage{} }
+func (m *GossipMessage) String() string { return proto1.CompactTextString(m) }
+func (*GossipMessage) ProtoMessage() {}
+func (*GossipMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
type isGossipMessage_Content interface {
isGossipMessage_Content()
@@ -239,8 +247,8 @@ func (m *GossipMessage) GetChallengeResp() *ConnResponse {
}
// XXX_OneofFuncs is for the internal use of the proto package.
-func (*GossipMessage) XXX_OneofFuncs() (func(msg proto1.Message, b *proto1.Buffer) error, func(msg proto1.Message, tag, wire int, b *proto1.Buffer) (bool, error), []interface{}) {
- return _GossipMessage_OneofMarshaler, _GossipMessage_OneofUnmarshaler, []interface{}{
+func (*GossipMessage) XXX_OneofFuncs() (func(msg proto1.Message, b *proto1.Buffer) error, func(msg proto1.Message, tag, wire int, b *proto1.Buffer) (bool, error), func(msg proto1.Message) (n int), []interface{}) {
+ return _GossipMessage_OneofMarshaler, _GossipMessage_OneofUnmarshaler, _GossipMessage_OneofSizer, []interface{}{
(*GossipMessage_AliveMsg)(nil),
(*GossipMessage_MemReq)(nil),
(*GossipMessage_MemRes)(nil),
@@ -431,47 +439,123 @@ func _GossipMessage_OneofUnmarshaler(msg proto1.Message, tag, wire int, b *proto
}
}
+func _GossipMessage_OneofSizer(msg proto1.Message) (n int) {
+ m := msg.(*GossipMessage)
+ // content
+ switch x := m.Content.(type) {
+ case *GossipMessage_AliveMsg:
+ s := proto1.Size(x.AliveMsg)
+ n += proto1.SizeVarint(2<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_MemReq:
+ s := proto1.Size(x.MemReq)
+ n += proto1.SizeVarint(3<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_MemRes:
+ s := proto1.Size(x.MemRes)
+ n += proto1.SizeVarint(4<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_DataMsg:
+ s := proto1.Size(x.DataMsg)
+ n += proto1.SizeVarint(5<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_Hello:
+ s := proto1.Size(x.Hello)
+ n += proto1.SizeVarint(6<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_DataDig:
+ s := proto1.Size(x.DataDig)
+ n += proto1.SizeVarint(7<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_DataReq:
+ s := proto1.Size(x.DataReq)
+ n += proto1.SizeVarint(8<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_DataUpdate:
+ s := proto1.Size(x.DataUpdate)
+ n += proto1.SizeVarint(9<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_AckMsg:
+ s := proto1.Size(x.AckMsg)
+ n += proto1.SizeVarint(10<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_Empty:
+ s := proto1.Size(x.Empty)
+ n += proto1.SizeVarint(11<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_Challenge:
+ s := proto1.Size(x.Challenge)
+ n += proto1.SizeVarint(12<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case *GossipMessage_ChallengeResp:
+ s := proto1.Size(x.ChallengeResp)
+ n += proto1.SizeVarint(13<<3 | proto1.WireBytes)
+ n += proto1.SizeVarint(uint64(s))
+ n += s
+ case nil:
+ default:
+ panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+ }
+ return n
+}
+
type ConnChallenge struct {
Nonce uint64 `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
}
-func (m *ConnChallenge) Reset() { *m = ConnChallenge{} }
-func (m *ConnChallenge) String() string { return proto1.CompactTextString(m) }
-func (*ConnChallenge) ProtoMessage() {}
+func (m *ConnChallenge) Reset() { *m = ConnChallenge{} }
+func (m *ConnChallenge) String() string { return proto1.CompactTextString(m) }
+func (*ConnChallenge) ProtoMessage() {}
+func (*ConnChallenge) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
type ConnResponse struct {
PkiID []byte `protobuf:"bytes,1,opt,name=pkiID,proto3" json:"pkiID,omitempty"`
ChallengeResponse []byte `protobuf:"bytes,2,opt,name=challengeResponse,proto3" json:"challengeResponse,omitempty"`
}
-func (m *ConnResponse) Reset() { *m = ConnResponse{} }
-func (m *ConnResponse) String() string { return proto1.CompactTextString(m) }
-func (*ConnResponse) ProtoMessage() {}
+func (m *ConnResponse) Reset() { *m = ConnResponse{} }
+func (m *ConnResponse) String() string { return proto1.CompactTextString(m) }
+func (*ConnResponse) ProtoMessage() {}
+func (*ConnResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
type DataRequest struct {
Nonce uint64 `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
- SeqMap []uint64 `protobuf:"varint,2,rep,name=seqMap" json:"seqMap,omitempty"`
+ SeqMap []uint64 `protobuf:"varint,2,rep,packed,name=seqMap" json:"seqMap,omitempty"`
}
-func (m *DataRequest) Reset() { *m = DataRequest{} }
-func (m *DataRequest) String() string { return proto1.CompactTextString(m) }
-func (*DataRequest) ProtoMessage() {}
+func (m *DataRequest) Reset() { *m = DataRequest{} }
+func (m *DataRequest) String() string { return proto1.CompactTextString(m) }
+func (*DataRequest) ProtoMessage() {}
+func (*DataRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
type GossipHello struct {
Nonce uint64 `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
}
-func (m *GossipHello) Reset() { *m = GossipHello{} }
-func (m *GossipHello) String() string { return proto1.CompactTextString(m) }
-func (*GossipHello) ProtoMessage() {}
+func (m *GossipHello) Reset() { *m = GossipHello{} }
+func (m *GossipHello) String() string { return proto1.CompactTextString(m) }
+func (*GossipHello) ProtoMessage() {}
+func (*GossipHello) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
type DataUpdate struct {
Data []*DataMessage `protobuf:"bytes,1,rep,name=data" json:"data,omitempty"`
}
-func (m *DataUpdate) Reset() { *m = DataUpdate{} }
-func (m *DataUpdate) String() string { return proto1.CompactTextString(m) }
-func (*DataUpdate) ProtoMessage() {}
+func (m *DataUpdate) Reset() { *m = DataUpdate{} }
+func (m *DataUpdate) String() string { return proto1.CompactTextString(m) }
+func (*DataUpdate) ProtoMessage() {}
+func (*DataUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
func (m *DataUpdate) GetData() []*DataMessage {
if m != nil {
@@ -482,21 +566,23 @@ func (m *DataUpdate) GetData() []*DataMessage {
type DataDigest struct {
Nonce uint64 `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
- SeqMap []uint64 `protobuf:"varint,2,rep,name=seqMap" json:"seqMap,omitempty"`
+ SeqMap []uint64 `protobuf:"varint,2,rep,packed,name=seqMap" json:"seqMap,omitempty"`
}
-func (m *DataDigest) Reset() { *m = DataDigest{} }
-func (m *DataDigest) String() string { return proto1.CompactTextString(m) }
-func (*DataDigest) ProtoMessage() {}
+func (m *DataDigest) Reset() { *m = DataDigest{} }
+func (m *DataDigest) String() string { return proto1.CompactTextString(m) }
+func (*DataDigest) ProtoMessage() {}
+func (*DataDigest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
type DataMessage struct {
Type DataMessage_Type `protobuf:"varint,1,opt,name=type,enum=proto.DataMessage_Type" json:"type,omitempty"`
Payload *Payload `protobuf:"bytes,2,opt,name=payload" json:"payload,omitempty"`
}
-func (m *DataMessage) Reset() { *m = DataMessage{} }
-func (m *DataMessage) String() string { return proto1.CompactTextString(m) }
-func (*DataMessage) ProtoMessage() {}
+func (m *DataMessage) Reset() { *m = DataMessage{} }
+func (m *DataMessage) String() string { return proto1.CompactTextString(m) }
+func (*DataMessage) ProtoMessage() {}
+func (*DataMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
func (m *DataMessage) GetPayload() *Payload {
if m != nil {
@@ -511,17 +597,19 @@ type Payload struct {
Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
}
-func (m *Payload) Reset() { *m = Payload{} }
-func (m *Payload) String() string { return proto1.CompactTextString(m) }
-func (*Payload) ProtoMessage() {}
+func (m *Payload) Reset() { *m = Payload{} }
+func (m *Payload) String() string { return proto1.CompactTextString(m) }
+func (*Payload) ProtoMessage() {}
+func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
type AckMessage struct {
Nonce uint64 `protobuf:"varint,1,opt,name=nonce" json:"nonce,omitempty"`
}
-func (m *AckMessage) Reset() { *m = AckMessage{} }
-func (m *AckMessage) String() string { return proto1.CompactTextString(m) }
-func (*AckMessage) ProtoMessage() {}
+func (m *AckMessage) Reset() { *m = AckMessage{} }
+func (m *AckMessage) String() string { return proto1.CompactTextString(m) }
+func (*AckMessage) ProtoMessage() {}
+func (*AckMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
type AliveMessage struct {
Membership *Member `protobuf:"bytes,1,opt,name=membership" json:"membership,omitempty"`
@@ -529,9 +617,10 @@ type AliveMessage struct {
Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
}
-func (m *AliveMessage) Reset() { *m = AliveMessage{} }
-func (m *AliveMessage) String() string { return proto1.CompactTextString(m) }
-func (*AliveMessage) ProtoMessage() {}
+func (m *AliveMessage) Reset() { *m = AliveMessage{} }
+func (m *AliveMessage) String() string { return proto1.CompactTextString(m) }
+func (*AliveMessage) ProtoMessage() {}
+func (*AliveMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
func (m *AliveMessage) GetMembership() *Member {
if m != nil {
@@ -548,22 +637,24 @@ func (m *AliveMessage) GetTimestamp() *PeerTime {
}
type PeerTime struct {
- IncNumber uint64 `protobuf:"varint,1,opt,name=inc_number" json:"inc_number,omitempty"`
+ IncNumber uint64 `protobuf:"varint,1,opt,name=inc_number,json=incNumber" json:"inc_number,omitempty"`
SeqNum uint64 `protobuf:"varint,2,opt,name=seqNum" json:"seqNum,omitempty"`
}
-func (m *PeerTime) Reset() { *m = PeerTime{} }
-func (m *PeerTime) String() string { return proto1.CompactTextString(m) }
-func (*PeerTime) ProtoMessage() {}
+func (m *PeerTime) Reset() { *m = PeerTime{} }
+func (m *PeerTime) String() string { return proto1.CompactTextString(m) }
+func (*PeerTime) ProtoMessage() {}
+func (*PeerTime) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
type MembershipRequest struct {
SelfInformation *AliveMessage `protobuf:"bytes,1,opt,name=selfInformation" json:"selfInformation,omitempty"`
Known []string `protobuf:"bytes,2,rep,name=known" json:"known,omitempty"`
}
-func (m *MembershipRequest) Reset() { *m = MembershipRequest{} }
-func (m *MembershipRequest) String() string { return proto1.CompactTextString(m) }
-func (*MembershipRequest) ProtoMessage() {}
+func (m *MembershipRequest) Reset() { *m = MembershipRequest{} }
+func (m *MembershipRequest) String() string { return proto1.CompactTextString(m) }
+func (*MembershipRequest) ProtoMessage() {}
+func (*MembershipRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
func (m *MembershipRequest) GetSelfInformation() *AliveMessage {
if m != nil {
@@ -577,9 +668,10 @@ type MembershipResponse struct {
Dead []*AliveMessage `protobuf:"bytes,2,rep,name=dead" json:"dead,omitempty"`
}
-func (m *MembershipResponse) Reset() { *m = MembershipResponse{} }
-func (m *MembershipResponse) String() string { return proto1.CompactTextString(m) }
-func (*MembershipResponse) ProtoMessage() {}
+func (m *MembershipResponse) Reset() { *m = MembershipResponse{} }
+func (m *MembershipResponse) String() string { return proto1.CompactTextString(m) }
+func (*MembershipResponse) ProtoMessage() {}
+func (*MembershipResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
func (m *MembershipResponse) GetAlive() []*AliveMessage {
if m != nil {
@@ -602,18 +694,36 @@ type Member struct {
PkiID []byte `protobuf:"bytes,4,opt,name=pkiID,proto3" json:"pkiID,omitempty"`
}
-func (m *Member) Reset() { *m = Member{} }
-func (m *Member) String() string { return proto1.CompactTextString(m) }
-func (*Member) ProtoMessage() {}
+func (m *Member) Reset() { *m = Member{} }
+func (m *Member) String() string { return proto1.CompactTextString(m) }
+func (*Member) ProtoMessage() {}
+func (*Member) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
type Empty struct {
}
-func (m *Empty) Reset() { *m = Empty{} }
-func (m *Empty) String() string { return proto1.CompactTextString(m) }
-func (*Empty) ProtoMessage() {}
+func (m *Empty) Reset() { *m = Empty{} }
+func (m *Empty) String() string { return proto1.CompactTextString(m) }
+func (*Empty) ProtoMessage() {}
+func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
func init() {
+ proto1.RegisterType((*GossipMessage)(nil), "proto.GossipMessage")
+ proto1.RegisterType((*ConnChallenge)(nil), "proto.ConnChallenge")
+ proto1.RegisterType((*ConnResponse)(nil), "proto.ConnResponse")
+ proto1.RegisterType((*DataRequest)(nil), "proto.DataRequest")
+ proto1.RegisterType((*GossipHello)(nil), "proto.GossipHello")
+ proto1.RegisterType((*DataUpdate)(nil), "proto.DataUpdate")
+ proto1.RegisterType((*DataDigest)(nil), "proto.DataDigest")
+ proto1.RegisterType((*DataMessage)(nil), "proto.DataMessage")
+ proto1.RegisterType((*Payload)(nil), "proto.Payload")
+ proto1.RegisterType((*AckMessage)(nil), "proto.AckMessage")
+ proto1.RegisterType((*AliveMessage)(nil), "proto.AliveMessage")
+ proto1.RegisterType((*PeerTime)(nil), "proto.PeerTime")
+ proto1.RegisterType((*MembershipRequest)(nil), "proto.MembershipRequest")
+ proto1.RegisterType((*MembershipResponse)(nil), "proto.MembershipResponse")
+ proto1.RegisterType((*Member)(nil), "proto.Member")
+ proto1.RegisterType((*Empty)(nil), "proto.Empty")
proto1.RegisterEnum("proto.DataMessage_Type", DataMessage_Type_name, DataMessage_Type_value)
}
@@ -621,6 +731,10 @@ func init() {
var _ context.Context
var _ grpc.ClientConn
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion3
+
// Client API for Gossip service
type GossipClient interface {
@@ -713,16 +827,22 @@ func (x *gossipGossipStreamServer) Recv() (*GossipMessage, error) {
return m, nil
}
-func _Gossip_Ping_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error) (interface{}, error) {
+func _Gossip_Ping_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(Empty)
if err := dec(in); err != nil {
return nil, err
}
- out, err := srv.(GossipServer).Ping(ctx, in)
- if err != nil {
- return nil, err
+ if interceptor == nil {
+ return srv.(GossipServer).Ping(ctx, in)
}
- return out, nil
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: "/proto.Gossip/Ping",
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(GossipServer).Ping(ctx, req.(*Empty))
+ }
+ return interceptor(ctx, in, info, handler)
}
var _Gossip_serviceDesc = grpc.ServiceDesc{
@@ -742,4 +862,63 @@ var _Gossip_serviceDesc = grpc.ServiceDesc{
ClientStreams: true,
},
},
+ Metadata: fileDescriptor0,
+}
+
+func init() { proto1.RegisterFile("message.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+ // 823 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x95, 0xcb, 0x73, 0x3a, 0x45,
+ 0x10, 0xc7, 0x79, 0xec, 0x02, 0xdb, 0x40, 0x42, 0xda, 0x94, 0xae, 0x29, 0xad, 0xb2, 0xd6, 0x57,
+ 0x34, 0x4a, 0x29, 0xc9, 0xc9, 0x94, 0x55, 0x12, 0x40, 0x43, 0x19, 0x30, 0x4e, 0x12, 0xaf, 0xa9,
+ 0x0d, 0x4c, 0x60, 0x2b, 0xec, 0xec, 0x86, 0x5d, 0xb4, 0x72, 0xf5, 0xe8, 0x9f, 0xe2, 0x5f, 0xe9,
+ 0xbc, 0xf6, 0x25, 0x70, 0xf8, 0x5d, 0x92, 0xed, 0xee, 0xcf, 0x77, 0xa6, 0x7b, 0xa6, 0xa7, 0x81,
+ 0xb6, 0x4f, 0xa3, 0xc8, 0x5d, 0xd0, 0x6e, 0xb8, 0x0e, 0xe2, 0x00, 0x4d, 0xf9, 0xcf, 0xf9, 0xdb,
+ 0x84, 0xf6, 0x2f, 0x41, 0x14, 0x79, 0xe1, 0x44, 0x85, 0xf1, 0x18, 0x4c, 0x16, 0xb0, 0x19, 0xb5,
+ 0xcb, 0x9f, 0x94, 0x4f, 0x0d, 0xa2, 0x0c, 0xfc, 0x1e, 0x1a, 0xee, 0xca, 0xfb, 0x93, 0x4e, 0xa2,
+ 0x85, 0x5d, 0xe1, 0x81, 0x66, 0xef, 0x3d, 0xb5, 0x50, 0xb7, 0x2f, 0xdd, 0x4a, 0x7c, 0x5d, 0x22,
+ 0x29, 0x86, 0x3d, 0xa8, 0xf9, 0xd4, 0x27, 0xf4, 0xd5, 0xae, 0x4a, 0x81, 0xad, 0x05, 0x13, 0xea,
+ 0x3f, 0xd1, 0x75, 0xb4, 0xf4, 0x42, 0x1e, 0xdb, 0xd0, 0x28, 0xe6, 0x2a, 0x4d, 0xe2, 0xb9, 0xd6,
+ 0x44, 0xb6, 0x21, 0x35, 0x1f, 0xee, 0xd0, 0x44, 0x61, 0xc0, 0x22, 0x9a, 0x8a, 0x22, 0xec, 0x42,
+ 0x7d, 0xee, 0xc6, 0xae, 0x48, 0xcd, 0x94, 0x2a, 0xd4, 0xaa, 0xa1, 0xf0, 0xa6, 0x99, 0x25, 0x10,
+ 0x7e, 0x0d, 0xe6, 0x92, 0xae, 0x56, 0x81, 0x5d, 0x2b, 0xd0, 0xea, 0x18, 0xae, 0x45, 0x84, 0xd3,
+ 0x0a, 0xc1, 0x6f, 0xd5, 0xda, 0x43, 0x6f, 0x61, 0xd7, 0x25, 0x7d, 0x94, 0x5b, 0x9b, 0x7b, 0x55,
+ 0xfa, 0x09, 0x93, 0xa4, 0x22, 0x8a, 0x6e, 0x6c, 0xa5, 0x92, 0x95, 0x9b, 0x40, 0xbc, 0x5e, 0x10,
+ 0x9f, 0x0f, 0x21, 0xff, 0x4b, 0x6d, 0x6b, 0x6b, 0x07, 0x15, 0xe0, 0x8a, 0x1c, 0x86, 0x67, 0x50,
+ 0x73, 0x67, 0x2f, 0xa2, 0x5c, 0x28, 0x08, 0xfa, 0xdc, 0x99, 0x56, 0xab, 0x11, 0xfc, 0x0c, 0x4c,
+ 0xea, 0x87, 0xf1, 0x9b, 0xdd, 0x94, 0x6c, 0x4b, 0xb3, 0x23, 0xe1, 0x13, 0x65, 0xca, 0x20, 0x5e,
+ 0x80, 0x35, 0x5b, 0xba, 0xab, 0x15, 0x65, 0x0b, 0x6a, 0xb7, 0x24, 0x79, 0xac, 0xc9, 0x41, 0xc0,
+ 0xd8, 0x20, 0x89, 0x71, 0x45, 0x06, 0xe2, 0x25, 0xb4, 0x53, 0x43, 0xdc, 0x8b, 0xdd, 0x2e, 0x74,
+ 0x86, 0x50, 0xe6, 0xae, 0xab, 0xc8, 0x5e, 0x59, 0x50, 0x9f, 0x05, 0x2c, 0xa6, 0x2c, 0x76, 0x3e,
+ 0x87, 0x76, 0x61, 0x97, 0xdd, 0x3d, 0xe8, 0x10, 0x68, 0xe5, 0x97, 0x14, 0x54, 0xf8, 0xe2, 0x8d,
+ 0x87, 0x92, 0x6a, 0x11, 0x65, 0xe0, 0x37, 0x70, 0x54, 0xd8, 0x48, 0xa0, 0xb2, 0x65, 0x5b, 0x64,
+ 0x3b, 0xe0, 0x5c, 0x42, 0x33, 0x77, 0x35, 0x7b, 0x9a, 0xff, 0x7d, 0xa8, 0x45, 0xf4, 0x75, 0xe2,
+ 0x86, 0x7c, 0x9d, 0x2a, 0x77, 0x6b, 0xcb, 0xf9, 0x14, 0x9a, 0xb9, 0xa6, 0xd9, 0x93, 0xf5, 0x05,
+ 0x40, 0x76, 0x93, 0xf8, 0x05, 0x18, 0xe2, 0x26, 0x39, 0x52, 0xdd, 0xdd, 0xa8, 0x44, 0xc6, 0x9d,
+ 0x1f, 0x94, 0x4a, 0x75, 0xd8, 0x3b, 0xa6, 0xf5, 0x6f, 0x59, 0x15, 0x95, 0xbc, 0xe8, 0x33, 0x30,
+ 0xe2, 0xb7, 0x50, 0x89, 0x0f, 0x7a, 0x1f, 0x6c, 0xef, 0xd9, 0xbd, 0xe7, 0x61, 0x22, 0x21, 0x3c,
+ 0x85, 0x7a, 0xe8, 0xbe, 0xad, 0x02, 0x77, 0xae, 0xdf, 0xf9, 0x81, 0xe6, 0x6f, 0x95, 0x97, 0x24,
+ 0x61, 0x67, 0x08, 0x86, 0xd0, 0x61, 0x1b, 0xac, 0x87, 0xe9, 0x70, 0xf4, 0xf3, 0x78, 0x3a, 0x1a,
+ 0x76, 0x4a, 0x68, 0x81, 0x79, 0x75, 0xf3, 0xdb, 0xe0, 0xd7, 0x4e, 0x19, 0x9b, 0x50, 0xff, 0xa3,
+ 0x7f, 0xf3, 0x48, 0x46, 0xbf, 0x77, 0x2a, 0x99, 0x71, 0xd7, 0xa9, 0x62, 0x03, 0x8c, 0xc1, 0x88,
+ 0xdc, 0x77, 0x0c, 0x67, 0x0c, 0x75, 0xbd, 0xb2, 0xae, 0x67, 0xba, 0xf1, 0x75, 0x99, 0xda, 0x42,
+ 0x04, 0x63, 0xe9, 0x46, 0x4b, 0x99, 0x8f, 0x45, 0xe4, 0xb7, 0xf0, 0xc9, 0x73, 0xac, 0xca, 0x8b,
+ 0x55, 0x67, 0xe6, 0x00, 0x64, 0x4f, 0x60, 0xcf, 0x6d, 0xfc, 0x53, 0x86, 0x56, 0x7e, 0x62, 0xf1,
+ 0x07, 0x0e, 0x7e, 0x3a, 0x5c, 0x24, 0xdb, 0xec, 0xb5, 0x0b, 0x53, 0x87, 0xe4, 0x00, 0x8e, 0x5b,
+ 0xb1, 0xc7, 0x27, 0x69, 0xec, 0xfa, 0xa1, 0x3e, 0xa0, 0xc3, 0xe4, 0x80, 0x28, 0x5d, 0xdf, 0xf3,
+ 0x18, 0xc9, 0x08, 0xfc, 0x08, 0xac, 0xc8, 0x5b, 0x30, 0x37, 0xde, 0xac, 0xa9, 0xce, 0x35, 0x73,
+ 0x38, 0x7d, 0x68, 0x24, 0x22, 0xfc, 0x18, 0xc0, 0x63, 0xb3, 0x47, 0xb6, 0x11, 0x5b, 0xe9, 0x9c,
+ 0x2d, 0xee, 0x99, 0x4a, 0x47, 0xee, 0x6c, 0x2a, 0xf9, 0xb3, 0x71, 0x96, 0x70, 0xb4, 0x35, 0x4f,
+ 0xf1, 0x47, 0x38, 0x8c, 0xe8, 0xea, 0x79, 0xcc, 0x9e, 0x83, 0xb5, 0xef, 0xc6, 0x5e, 0xc0, 0x74,
+ 0x61, 0xbb, 0x66, 0x36, 0xf9, 0x3f, 0x2b, 0x4e, 0xee, 0x85, 0x05, 0x7f, 0x31, 0xd9, 0x56, 0x16,
+ 0x51, 0x06, 0xdf, 0x09, 0xb7, 0xa7, 0x30, 0x7e, 0x05, 0xa6, 0x1c, 0xf8, 0xba, 0xa1, 0x77, 0x6e,
+ 0xa0, 0x08, 0xfc, 0x92, 0x5f, 0x19, 0x95, 0x6d, 0xb5, 0x97, 0x94, 0x80, 0xf3, 0x0c, 0x35, 0xb5,
+ 0x13, 0x1e, 0x40, 0xc5, 0x9b, 0xcb, 0xdc, 0x2d, 0xc2, 0xbf, 0xf0, 0x04, 0x1a, 0x94, 0xcd, 0xc3,
+ 0xc0, 0x63, 0xb1, 0xee, 0x86, 0xd4, 0x16, 0x31, 0x9f, 0xc6, 0x6e, 0xae, 0x2b, 0x52, 0x3b, 0x9b,
+ 0x14, 0x46, 0x6e, 0x52, 0x38, 0x75, 0x30, 0xe5, 0x18, 0xec, 0x85, 0x50, 0x53, 0xef, 0x18, 0x7f,
+ 0x82, 0x96, 0xfa, 0xba, 0x8b, 0xd7, 0xd4, 0xf5, 0xf1, 0xb8, 0xf0, 0xdb, 0xa0, 0xd3, 0x3c, 0xd9,
+ 0xe9, 0x75, 0x4a, 0xa7, 0xe5, 0xef, 0xca, 0x7c, 0xde, 0x1a, 0xb7, 0x1e, 0x5b, 0x60, 0x61, 0xd0,
+ 0x9e, 0x14, 0x2c, 0xa7, 0xf4, 0x54, 0x93, 0xe6, 0xf9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x55,
+ 0x49, 0x77, 0x6f, 0x95, 0x07, 0x00, 0x00,
}
diff --git a/images/app/Dockerfile.in b/images/app/Dockerfile.in
index 3cff23f8181..6a971f3a871 100644
--- a/images/app/Dockerfile.in
+++ b/images/app/Dockerfile.in
@@ -1,4 +1,4 @@
-FROM hyperledger/fabric-src:latest
+FROM hyperledger/fabric-src:_TAG_
RUN mkdir -p /var/hyperledger/db
COPY bin/* $GOPATH/bin/
WORKDIR $GOPATH/src/github.com/hyperledger/fabric
diff --git a/images/base/.gitignore b/images/base/.gitignore
deleted file mode 100644
index 94143827ed0..00000000000
--- a/images/base/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile
diff --git a/images/base/Dockerfile.in b/images/base/Dockerfile.in
deleted file mode 100644
index 3babb952831..00000000000
--- a/images/base/Dockerfile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM _DOCKER_BASE_
-COPY scripts /hyperledger/baseimage/scripts
-RUN /hyperledger/baseimage/scripts/common/init.sh
-RUN /hyperledger/baseimage/scripts/docker/init.sh
-RUN /hyperledger/baseimage/scripts/common/setup.sh
diff --git a/images/base/Makefile b/images/base/Makefile
deleted file mode 100644
index 740274cd045..00000000000
--- a/images/base/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-NAME=hyperledger/fabric-baseimage
-VERSION=$(shell cat ./release)
-ARCH=$(shell uname -m)
-DOCKER_TAG ?= $(ARCH)-$(VERSION)
-VAGRANTIMAGE=packer_virtualbox-iso_virtualbox.box
-
-DOCKER_BASE_x86_64=ubuntu:trusty
-DOCKER_BASE_s390x=s390x/ubuntu:xenial
-
-DOCKER_BASE=$(DOCKER_BASE_$(ARCH))
-
-ifeq ($(DOCKER_BASE), )
-$(error "Architecture \"$(ARCH)\" is unsupported")
-endif
-
-
-# strips off the post-processors that try to upload artifacts to the cloud
-packer-local.json: packer.json
- jq 'del(."post-processors"[0][1]) | del(."post-processors"[1][1])' packer.json > $@
-
-all: vagrant docker
-
-$(VAGRANTIMAGE): packer-local.json
- BASEIMAGE_RELEASE=$(VERSION) \
- packer build -only virtualbox-iso packer-local.json
-
-Dockerfile: Dockerfile.in Makefile
- @echo "# Generated from Dockerfile.in. DO NOT EDIT!" > $@
- @cat Dockerfile.in | \
- sed -e "s|_DOCKER_BASE_|$(DOCKER_BASE)|" >> $@
-
-docker: Dockerfile release
- @echo "Generating docker"
- @docker build -t $(NAME):$(DOCKER_TAG) .
-
-vagrant: $(VAGRANTIMAGE) remove release
- vagrant box add -name $(NAME) $(VAGRANTIMAGE)
-
-push:
- @echo "You will need your ATLAS_TOKEN set for this to succeed"
- packer push -name $(NAME) packer.json
-
-remove:
- -vagrant box remove --box-version 0 $(NAME)
-
-clean: remove
- -rm $(VAGRANTIMAGE)
- -rm Dockerfile
- -rm packer-local.json
diff --git a/images/base/README.md b/images/base/README.md
deleted file mode 100644
index 6073455aca5..00000000000
--- a/images/base/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Baseimage Introduction
-This directory contains the infrastructure for creating a new baseimage used as the basis for various functions within the Hyperledger workflow such as our Vagrant based development environment, chaincode compilation/execution, unit-testing, and even cluster simulation. It is based on ubuntu-14.04 with various opensource projects added such as golang, rocksdb, grpc, and node.js. The actual Hyperledger code is injected just-in-time before deployment. The resulting images are published to public repositories such as [atlas.hashicorp.com](https://atlas.hashicorp.com/hyperledger/boxes/fabric-baseimage) for consumption by Vagrant/developers and [hub.docker.com](https://hub.docker.com/r/hyperledger/fabric-baseimage/) for consumption by docker-based workflows.
-
-
-
-The purpose of this baseimage is to act as a bridge between a raw ubuntu/trusty64 configuration and the customizations required for supporting a hyperledger environment. Some of the FOSS components that need to be added to Ubuntu do not have convenient native packages. Therefore, they are built from source. However, the build process is generally expensive (often taking in excess of 30 minutes) so it is fairly inefficient to JIT assemble these components on demand.
-
-Therefore, the expensive FOSS components are built into this baseimage once and subsequently cached on the public repositories so that workflows may simply consume the objects without requiring a local build cycle.
-
-# Intended Audience
-This is only intended for release managers curating the base images on atlas and docker-hub. Typical developers may safely ignore this directory completely.
-
-Anyone wishing to customize their image is encouraged to do so via downstream means, such as the vagrant infrastructure in the root directory of this project or the Dockerfile.
-
-## Exceptions
-
-If a component is found to be both broadly applicable and expensive to build JIT, it may be a candidate for inclusion in a future baseimage.
-
-# Usage
-
-## Usage Pattern 1 - Local baseimage builds for testing a proposed change
-
-* "make vagrant" will build just the vagrant image and install it into the local environment as "hyperledger/fabric-baseimage:v0", making it suitable to local testing.
- * To utilize the new base image in your local tests, run `vagrant destroy` then `USE_LOCAL_BASEIMAGE=true vagrant up`, also preface `vagrant ssh` as `USE_LOCAL_BASEIMAGE=true vagrant ssh` or simply export that variable, or Vagrant will fail to find the ssh key.
-* "make docker" will build just the docker image and commit it to your local environment as "hyperledger/fabric-baseimage"
-
-## Usage Pattern 2 - Release manager promoting a new base image to the public repositories
-
-- Step 1: Decide on the version number to be used and update the packer.json template variables:release
-- Step 2: Initiate a build
-
-Note: You will need credentials to the public repositories, as discussed in Uploading Permissions below. If you do not have these credentials, you are probably not an image release manager. Otherwise, discuss it on the Hyperledger slack to see if you should be added.
-
-### Hosted Build Method
-
-"make push" will push the build configuration to atlas for cloud-hosted building of the images. You only need to have the ATLAS_TOKEN defined for this to succeed, as the atlas build server will push the artifacts out to the respective hosts once the build completes. Therefore, the repository credentials are already cached on the build server and you only need credentials for the build-server itself. You can check the status of the build [here](https://atlas.hashicorp.com/hyperledger/build-configurations/baseimage/)
-
-### Local Build Method
-
-"make [all]" will generate both a vagrant and docker image and push them out to the cloud. This method requires both ATLAS and DOCKERHUB credentials since the artifacts are pushed directly to the hosting providers from your build machine.
-
-## Uploading Permissions
-
-The system relies on several environment variables to establish credentials with the hosting repositories:
-
-* ATLAS_TOKEN - used to push both vagrant images and packer templates to atlas.hashicorp.com
-* DOCKERHUB_[EMAIL|USERNAME|PASSWORD] - used to push docker images to hub.docker.com
-
-Note that if you only plan on pushing the build to the atlas packer build service, you only need the ATLAS_TOKEN set as the dockerhub interaction will occur from the atlas side of the process where the docker credentials are presumably already configured.
-
-## Versioning
-
-Vagrant boxes are only versioned when they are submitted to a repository. Vagrant does not support applying a version to a vagrant box via the `vagrant box add` command. Adding the box gives it an implicit version of 0. Setting `USE_LOCAL_BASEIMAGE=true` in the `vagrant up` command causes the Vagrant file in the the parent directory to pick version 0, instead of the default.
diff --git a/images/base/http/preseed.cfg b/images/base/http/preseed.cfg
deleted file mode 100644
index d3619ce76f7..00000000000
--- a/images/base/http/preseed.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-debconf debconf/frontend select Noninteractive
-choose-mirror-bin mirror/http/proxy string
-d-i clock-setup/utc boolean true
-d-i clock-setup/utc-auto boolean true
-d-i finish-install/reboot_in_progress note
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean true
-d-i partman-auto/choose_recipe select atomic
-d-i partman-auto/method string regular
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-d-i partman/confirm_write_new_label boolean true
-
-# Set the kernel
-d-i base-installer/kernel/override-image string linux-virtual
-
-# Default user
-d-i passwd/user-fullname string vagrant
-d-i passwd/username string vagrant
-d-i passwd/user-password password vagrant
-d-i passwd/user-password-again password vagrant
-d-i passwd/username string vagrant
-
-# Minimum packages (see postinstall.sh)
-d-i pkgsel/include string openssh-server
-d-i pkgsel/install-language-support boolean false
-d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select none
-
-d-i time/zone string UTC
-d-i user-setup/allow-password-weak boolean true
-d-i user-setup/encrypt-home boolean false
-tasksel tasksel/first multiselect standard, server
diff --git a/images/base/images/packer-overview.graffle/data.plist b/images/base/images/packer-overview.graffle/data.plist
deleted file mode 100644
index c6fc4f1b778..00000000000
--- a/images/base/images/packer-overview.graffle/data.plist
+++ /dev/null
@@ -1,1383 +0,0 @@
-
-
--
+
The 'network' and 'chaincodes' commands simply print the current 'network' and
'chaincodes' files respectively from the implied $BUSYWORK_HOME.
@@ -110,6 +113,17 @@ queries fail. If the ping query succeeds then the output of the ping queries
is returned. This function currently assumes that the chaincode implments a
'ping' query function with no parameters.
+The 'pid' command simply returns the PID of each of the
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
- The test is read from a server that supports HTTP.
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
- The default encoding for the browser you are testing is not set to ISO 8859-15. +
- The test is read from a server that supports HTTP.
-
+
+Note that leading/trailing whitespace is removed from the result.
+
Examples:
busy chaincodes
@@ -124,6 +138,9 @@ Examples:
busy ping "*" cc2
+ busy pid vp0
+ busy ps vp0 etime,cputime
+
Optional arguments, with defaults after the colon:
-h | -help | --help : N/A
@@ -149,12 +166,12 @@ Optional arguments, with defaults after the colon:
The -waitFor option is supported for the 'deploy', 'invoke' and 'ping'
commands only. The semantics are explained below in the section headed
- "Semantics of -waitFor"
+ "Semantics of -waitFor"
-json : See below
Select -json to force even single-peer operations to print as a JSON
- object, rather than simply as a value. This opiton is ignored for the
+ object, rather than simply as a value. This option is ignored for the
'chaincodes' and 'network' commands.
@@ -191,6 +208,14 @@ proc singletonCommand {cmd} {
}
+proc fixedArgs {cmd nArgs} {
+
+ if {[llength [parms args]] != $nArgs} {
+ errorExit "The '$cmd' command expects $nArgs arguments."
+ }
+}
+
+
proc chaincodes {} {
singletonCommand chaincodes
@@ -294,7 +319,7 @@ proc invoke {} {
"Deployed IDs are $a(ids)"
}
set name $a($ccId.name)
-
+
if {![null [parms waitFor]]} {
set heights \
[mapeach address [parms restAddresses] {
@@ -322,7 +347,7 @@ proc invoke {} {
}
}
-
+
proc query {} {
waitForNotOK query
@@ -344,7 +369,7 @@ proc query {} {
errorExit
}
set name $a($ccId.name)
-
+
parms results \
[mapeach address [parms restAddresses] {
return [fabric::query $address [parms user] $name $function $args]
@@ -369,7 +394,7 @@ proc ping {} {
errorExit
}
set name $a($ccId.name)
-
+
proc _ping {name} {
set results {}
foreach address [parms restAddresses] {
@@ -395,7 +420,33 @@ proc ping {} {
}
}
-
+
+proc pid {} {
+
+ waitForNotOK pid
+ fixedArgs pid 0
+
+ parms results [mapeach peer [parms peers] {
+ return [parms network.peer.$peer.pid]
+ }]
+}
+
+
+proc ps {} {
+
+ waitForNotOK ps
+ fixedArgs ps 1
+
+ parms results [mapeach peer [parms peers] {
+ set pid [parms network.peer.$peer.pid]
+ if {[catch {exec ps -p $pid -ww --noheader -o [parms args]} result]} {
+ errorExit "Exec of 'ps' failed : $result"
+ }
+ return [string trim $result]; # Remove leading/trailing whitespace
+ }]
+}
+
+
############################################################################
# The script
############################################################################
@@ -410,11 +461,11 @@ setLoggingLevel {} warn
set options {
{enum {-h -help --help} parms(help) 0 p_help}
{key -home parms(home) {}}
- {bool -user parms(user) {} p_user}
+ {key -user parms(user) {} p_user}
{key -waitFor parms(waitFor) {}}
{bool -json parms(json) 0}
}
-
+
mapKeywordArgs $argv $options parms(other)
if {$p_help} {
@@ -430,7 +481,7 @@ parms command [first [parms other]]
switch [parms command] {
chaincodes {chaincodes}
network {network}
-}
+}
parms peers [busywork::peersFromSpec [second [parms other]]]
parms args [restn [parms other] 2]
@@ -459,6 +510,8 @@ switch [parms command] {
invoke {invoke}
query {query}
ping {ping}
+ pid {pid}
+ ps {ps}
default {errorExit "Unrecognized command: [parms command]"}
}
@@ -489,9 +542,3 @@ if {[parms json] || [expr {[llength [parms results]] > 1}]} {
puts [first [parms results]]
}
-
-
-
-
-
-
diff --git a/tools/busywork/bin/pprofClient b/tools/busywork/bin/pprofClient
index 888c06f6a23..0e8df692184 100755
--- a/tools/busywork/bin/pprofClient
+++ b/tools/busywork/bin/pprofClient
@@ -1,13 +1,13 @@
#!/usr/bin/tclsh
# Copyright IBM Corp. 2016. All Rights Reserved.
-#
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -66,7 +66,7 @@ of the profile files - they are named by the host:port of the profiling port,
and given sequence numbers to make them unique. When this script is run
against busywork networks, the final act of the script is to create symbolic
links that substitute the host:port portion of the file names with the peer
-names (vp[0,...N]).
+names (vp[0,...N]).
Optional arguments, with defaults after the colon:
@@ -140,7 +140,7 @@ set options {
{key -peers parms(peers) {} p_peers}
{key -port parms(port) 6060}
}
-
+
mapKeywordArgs $argv $options parms(other)
if {$p_help} {
@@ -153,12 +153,12 @@ if {[parms quiet]} {
} else {
setLoggingLevel {} note
}
-
+
parms home [busywork::home [parms home]]
# Handle implicit vs. explict peers. With implicit peers we can give the files
# recognizable names. With explicit peers we can only use the host:port as the
-# names.
+# names.
if {$p_peers} {
@@ -175,34 +175,34 @@ if {$p_peers} {
parms profileAddresses [parms ids]
} else {
-
+
# Implicit peers
-
+
if {[catch {busywork::networkToArray ::parms network.} msg]} {
errorExit $msg
}
-
+
switch [llength [parms other]] {
-
+
1 {
# All peers
-
+
parms service [parms other]
parms ids [parms network.peer.ids]
parms profileAddresses [parms network.peer.profileAddresses]
}
2 {
# Subset of peers
-
+
set spec [first [parms other]]
parms service [second [parms other]]
-
+
if {[catch {enumerate $spec} result]} {
errorExit \
"Error parsing peer specification : $result"
}
set nPeers [llength [parms network.peer.ids]]
-
+
parms ids \
[mapeach n $result {
if {$n > $nPeers} {
@@ -214,7 +214,7 @@ if {$p_peers} {
[mapeach n $result {
return [lindex [parms network.peer.profileAddresses] $n]
}]
-
+
}
default {
puts $usage
@@ -283,7 +283,8 @@ if {[waitPIDs $pids]} {
# find the profile files that the tool just created and link the names given
# by the tool with names based on the peer IDs. The Go pprof tool does not
# support providing names for the profile files - it names them based on their
-# http addresses using the form 'pprof.
HTTP charset
+ + + + + +
+
+
+The character encoding of a page can be set using the HTTP header charset declaration.
+The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ÜÀÚ. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.
The only character encoding declaration for this HTML file is in the HTTP header, which sets the encoding to ISO 8859-15.
+HTML5
+the-input-byte-stream-001
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+HTTP vs UTF-8 BOM
+ + + + + +
+
+
+A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.
+The HTTP header attempts to set the character encoding to ISO 8859-15. The page starts with a UTF-8 signature.
The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ýäè. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.
If the test is unsuccessful, the characters  should appear at the top of the page. These represent the bytes that make up the UTF-8 signature when encountered in the ISO 8859-15 encoding.
+HTML5
+the-input-byte-stream-034
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+HTTP vs meta charset
+ + + + + +
+
+
+The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.
+The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-1.
The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ÜÀÚ. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.
HTML5
+the-input-byte-stream-018
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+HTTP vs meta content
+ + + + + +
+
+
+The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.
+The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-1.
The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ÜÀÚ. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.
HTML5
+the-input-byte-stream-016
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+No encoding declaration
+ + + + + +
+
+
+A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.
+The test on this page contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ýäè. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.
HTML5
+the-input-byte-stream-015
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+UTF-8 BOM vs meta charset
+ + + + + +
+
+
+A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.
+The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.
The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ýäè. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.
HTML5
+the-input-byte-stream-038
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+UTF-8 BOM vs meta content
+ + + + + +
+
+
+A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.
+The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.
The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ýäè. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.
HTML5
+the-input-byte-stream-037
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+meta charset attribute
+ + + + + +
+
+
+The character encoding of the page can be set by a meta element with charset attribute.
+The only character encoding declaration for this HTML file is in the charset attribute of the meta element, which declares the encoding to be ISO 8859-15.
The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ÜÀÚ. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.
HTML5
+the-input-byte-stream-009
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+meta content attribute
+ + + + + +
+
+
+The character encoding of the page can be set by a meta element with http-equiv and content attributes.
+The only character encoding declaration for this HTML file is in the content attribute of the meta element, which declares the encoding to be ISO 8859-15.
The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector .test div.ÜÀÚ. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.
HTML5
+the-input-byte-stream-007
Result summary & related tests
Detailed results for this test
Link to spec
Assumptions:
+Links:
` + doc, err := html.Parse(strings.NewReader(s)) + if err != nil { + log.Fatal(err) + } + var f func(*html.Node) + f = func(n *html.Node) { + if n.Type == html.ElementNode && n.Data == "a" { + for _, a := range n.Attr { + if a.Key == "href" { + fmt.Println(a.Val) + break + } + } + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + f(c) + } + } + f(doc) + // Output: + // foo + // /bar/baz +} diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go new file mode 100644 index 00000000000..d3b3844099b --- /dev/null +++ b/vendor/golang.org/x/net/html/foreign.go @@ -0,0 +1,226 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package html + +import ( + "strings" +) + +func adjustAttributeNames(aa []Attribute, nameMap map[string]string) { + for i := range aa { + if newName, ok := nameMap[aa[i].Key]; ok { + aa[i].Key = newName + } + } +} + +func adjustForeignAttributes(aa []Attribute) { + for i, a := range aa { + if a.Key == "" || a.Key[0] != 'x' { + continue + } + switch a.Key { + case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show", + "xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink": + j := strings.Index(a.Key, ":") + aa[i].Namespace = a.Key[:j] + aa[i].Key = a.Key[j+1:] + } + } +} + +func htmlIntegrationPoint(n *Node) bool { + if n.Type != ElementNode { + return false + } + switch n.Namespace { + case "math": + if n.Data == "annotation-xml" { + for _, a := range n.Attr { + if a.Key == "encoding" { + val := strings.ToLower(a.Val) + if val == "text/html" || val == "application/xhtml+xml" { + return true + } + } + } + } + case "svg": + switch n.Data { + case "desc", "foreignObject", "title": + return true + } + } + return false +} + +func mathMLTextIntegrationPoint(n *Node) bool { + if n.Namespace != "math" { + return false + } + switch n.Data { + case "mi", "mo", "mn", "ms", "mtext": + return true + } + return false +} + +// Section 12.2.5.5. +var breakout = map[string]bool{ + "b": true, + "big": true, + "blockquote": true, + "body": true, + "br": true, + "center": true, + "code": true, + "dd": true, + "div": true, + "dl": true, + "dt": true, + "em": true, + "embed": true, + "h1": true, + "h2": true, + "h3": true, + "h4": true, + "h5": true, + "h6": true, + "head": true, + "hr": true, + "i": true, + "img": true, + "li": true, + "listing": true, + "menu": true, + "meta": true, + "nobr": true, + "ol": true, + "p": true, + "pre": true, + "ruby": true, + "s": true, + "small": true, + "span": true, + "strong": true, + "strike": true, + "sub": true, + "sup": true, + "table": true, + "tt": true, + "u": true, + "ul": true, + "var": true, +} + +// Section 12.2.5.5. +var svgTagNameAdjustments = map[string]string{ + "altglyph": "altGlyph", + "altglyphdef": "altGlyphDef", + "altglyphitem": "altGlyphItem", + "animatecolor": "animateColor", + "animatemotion": "animateMotion", + "animatetransform": "animateTransform", + "clippath": "clipPath", + "feblend": "feBlend", + "fecolormatrix": "feColorMatrix", + "fecomponenttransfer": "feComponentTransfer", + "fecomposite": "feComposite", + "feconvolvematrix": "feConvolveMatrix", + "fediffuselighting": "feDiffuseLighting", + "fedisplacementmap": "feDisplacementMap", + "fedistantlight": "feDistantLight", + "feflood": "feFlood", + "fefunca": "feFuncA", + "fefuncb": "feFuncB", + "fefuncg": "feFuncG", + "fefuncr": "feFuncR", + "fegaussianblur": "feGaussianBlur", + "feimage": "feImage", + "femerge": "feMerge", + "femergenode": "feMergeNode", + "femorphology": "feMorphology", + "feoffset": "feOffset", + "fepointlight": "fePointLight", + "fespecularlighting": "feSpecularLighting", + "fespotlight": "feSpotLight", + "fetile": "feTile", + "feturbulence": "feTurbulence", + "foreignobject": "foreignObject", + "glyphref": "glyphRef", + "lineargradient": "linearGradient", + "radialgradient": "radialGradient", + "textpath": "textPath", +} + +// Section 12.2.5.1 +var mathMLAttributeAdjustments = map[string]string{ + "definitionurl": "definitionURL", +} + +var svgAttributeAdjustments = map[string]string{ + "attributename": "attributeName", + "attributetype": "attributeType", + "basefrequency": "baseFrequency", + "baseprofile": "baseProfile", + "calcmode": "calcMode", + "clippathunits": "clipPathUnits", + "contentscripttype": "contentScriptType", + "contentstyletype": "contentStyleType", + "diffuseconstant": "diffuseConstant", + "edgemode": "edgeMode", + "externalresourcesrequired": "externalResourcesRequired", + "filterres": "filterRes", + "filterunits": "filterUnits", + "glyphref": "glyphRef", + "gradienttransform": "gradientTransform", + "gradientunits": "gradientUnits", + "kernelmatrix": "kernelMatrix", + "kernelunitlength": "kernelUnitLength", + "keypoints": "keyPoints", + "keysplines": "keySplines", + "keytimes": "keyTimes", + "lengthadjust": "lengthAdjust", + "limitingconeangle": "limitingConeAngle", + "markerheight": "markerHeight", + "markerunits": "markerUnits", + "markerwidth": "markerWidth", + "maskcontentunits": "maskContentUnits", + "maskunits": "maskUnits", + "numoctaves": "numOctaves", + "pathlength": "pathLength", + "patterncontentunits": "patternContentUnits", + "patterntransform": "patternTransform", + "patternunits": "patternUnits", + "pointsatx": "pointsAtX", + "pointsaty": "pointsAtY", + "pointsatz": "pointsAtZ", + "preservealpha": "preserveAlpha", + "preserveaspectratio": "preserveAspectRatio", + "primitiveunits": "primitiveUnits", + "refx": "refX", + "refy": "refY", + "repeatcount": "repeatCount", + "repeatdur": "repeatDur", + "requiredextensions": "requiredExtensions", + "requiredfeatures": "requiredFeatures", + "specularconstant": "specularConstant", + "specularexponent": "specularExponent", + "spreadmethod": "spreadMethod", + "startoffset": "startOffset", + "stddeviation": "stdDeviation", + "stitchtiles": "stitchTiles", + "surfacescale": "surfaceScale", + "systemlanguage": "systemLanguage", + "tablevalues": "tableValues", + "targetx": "targetX", + "targety": "targetY", + "textlength": "textLength", + "viewbox": "viewBox", + "viewtarget": "viewTarget", + "xchannelselector": "xChannelSelector", + "ychannelselector": "yChannelSelector", + "zoomandpan": "zoomAndPan", +} diff --git a/vendor/golang.org/x/net/html/node.go b/vendor/golang.org/x/net/html/node.go new file mode 100644 index 00000000000..26b657aec83 --- /dev/null +++ b/vendor/golang.org/x/net/html/node.go @@ -0,0 +1,193 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package html + +import ( + "golang.org/x/net/html/atom" +) + +// A NodeType is the type of a Node. +type NodeType uint32 + +const ( + ErrorNode NodeType = iota + TextNode + DocumentNode + ElementNode + CommentNode + DoctypeNode + scopeMarkerNode +) + +// Section 12.2.3.3 says "scope markers are inserted when entering applet +// elements, buttons, object elements, marquees, table cells, and table +// captions, and are used to prevent formatting from 'leaking'". +var scopeMarker = Node{Type: scopeMarkerNode} + +// A Node consists of a NodeType and some Data (tag name for element nodes, +// content for text) and are part of a tree of Nodes. Element nodes may also +// have a Namespace and contain a slice of Attributes. Data is unescaped, so +// that it looks like "aare treated as start tags, except that + // hasSelfClosingToken is set while they are being processed. + hasSelfClosingToken bool + // doc is the document root element. + doc *Node + // The stack of open elements (section 12.2.3.2) and active formatting + // elements (section 12.2.3.3). + oe, afe nodeStack + // Element pointers (section 12.2.3.4). + head, form *Node + // Other parsing state flags (section 12.2.3.5). + scripting, framesetOK bool + // im is the current insertion mode. + im insertionMode + // originalIM is the insertion mode to go back to after completing a text + // or inTableText insertion mode. + originalIM insertionMode + // fosterParenting is whether new elements should be inserted according to + // the foster parenting rules (section 12.2.5.3). + fosterParenting bool + // quirks is whether the parser is operating in "quirks mode." + quirks bool + // fragment is whether the parser is parsing an HTML fragment. + fragment bool + // context is the context element when parsing an HTML fragment + // (section 12.4). + context *Node +} + +func (p *parser) top() *Node { + if n := p.oe.top(); n != nil { + return n + } + return p.doc +} + +// Stop tags for use in popUntil. These come from section 12.2.3.2. +var ( + defaultScopeStopTags = map[string][]a.Atom{ + "": {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object, a.Template}, + "math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext}, + "svg": {a.Desc, a.ForeignObject, a.Title}, + } +) + +type scope int + +const ( + defaultScope scope = iota + listItemScope + buttonScope + tableScope + tableRowScope + tableBodyScope + selectScope +) + +// popUntil pops the stack of open elements at the highest element whose tag +// is in matchTags, provided there is no higher element in the scope's stop +// tags (as defined in section 12.2.3.2). It returns whether or not there was +// such an element. If there was not, popUntil leaves the stack unchanged. +// +// For example, the set of stop tags for table scope is: "html", "table". If +// the stack was: +// ["html", "body", "font", "table", "b", "i", "u"] +// then popUntil(tableScope, "font") would return false, but +// popUntil(tableScope, "i") would return true and the stack would become: +// ["html", "body", "font", "table", "b"] +// +// If an element's tag is in both the stop tags and matchTags, then the stack +// will be popped and the function returns true (provided, of course, there was +// no higher element in the stack that was also in the stop tags). For example, +// popUntil(tableScope, "table") returns true and leaves: +// ["html", "body", "font"] +func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool { + if i := p.indexOfElementInScope(s, matchTags...); i != -1 { + p.oe = p.oe[:i] + return true + } + return false +} + +// indexOfElementInScope returns the index in p.oe of the highest element whose +// tag is in matchTags that is in scope. If no matching element is in scope, it +// returns -1. +func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int { + for i := len(p.oe) - 1; i >= 0; i-- { + tagAtom := p.oe[i].DataAtom + if p.oe[i].Namespace == "" { + for _, t := range matchTags { + if t == tagAtom { + return i + } + } + switch s { + case defaultScope: + // No-op. + case listItemScope: + if tagAtom == a.Ol || tagAtom == a.Ul { + return -1 + } + case buttonScope: + if tagAtom == a.Button { + return -1 + } + case tableScope: + if tagAtom == a.Html || tagAtom == a.Table { + return -1 + } + case selectScope: + if tagAtom != a.Optgroup && tagAtom != a.Option { + return -1 + } + default: + panic("unreachable") + } + } + switch s { + case defaultScope, listItemScope, buttonScope: + for _, t := range defaultScopeStopTags[p.oe[i].Namespace] { + if t == tagAtom { + return -1 + } + } + } + } + return -1 +} + +// elementInScope is like popUntil, except that it doesn't modify the stack of +// open elements. +func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool { + return p.indexOfElementInScope(s, matchTags...) != -1 +} + +// clearStackToContext pops elements off the stack of open elements until a +// scope-defined element is found. +func (p *parser) clearStackToContext(s scope) { + for i := len(p.oe) - 1; i >= 0; i-- { + tagAtom := p.oe[i].DataAtom + switch s { + case tableScope: + if tagAtom == a.Html || tagAtom == a.Table { + p.oe = p.oe[:i+1] + return + } + case tableRowScope: + if tagAtom == a.Html || tagAtom == a.Tr { + p.oe = p.oe[:i+1] + return + } + case tableBodyScope: + if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead { + p.oe = p.oe[:i+1] + return + } + default: + panic("unreachable") + } + } +} + +// generateImpliedEndTags pops nodes off the stack of open elements as long as +// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt. +// If exceptions are specified, nodes with that name will not be popped off. +func (p *parser) generateImpliedEndTags(exceptions ...string) { + var i int +loop: + for i = len(p.oe) - 1; i >= 0; i-- { + n := p.oe[i] + if n.Type == ElementNode { + switch n.DataAtom { + case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt: + for _, except := range exceptions { + if n.Data == except { + break loop + } + } + continue + } + } + break + } + + p.oe = p.oe[:i+1] +} + +// addChild adds a child node n to the top element, and pushes n onto the stack +// of open elements if it is an element node. +func (p *parser) addChild(n *Node) { + if p.shouldFosterParent() { + p.fosterParent(n) + } else { + p.top().AppendChild(n) + } + + if n.Type == ElementNode { + p.oe = append(p.oe, n) + } +} + +// shouldFosterParent returns whether the next node to be added should be +// foster parented. +func (p *parser) shouldFosterParent() bool { + if p.fosterParenting { + switch p.top().DataAtom { + case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr: + return true + } + } + return false +} + +// fosterParent adds a child node according to the foster parenting rules. +// Section 12.2.5.3, "foster parenting". +func (p *parser) fosterParent(n *Node) { + var table, parent, prev *Node + var i int + for i = len(p.oe) - 1; i >= 0; i-- { + if p.oe[i].DataAtom == a.Table { + table = p.oe[i] + break + } + } + + if table == nil { + // The foster parent is the html element. + parent = p.oe[0] + } else { + parent = table.Parent + } + if parent == nil { + parent = p.oe[i-1] + } + + if table != nil { + prev = table.PrevSibling + } else { + prev = parent.LastChild + } + if prev != nil && prev.Type == TextNode && n.Type == TextNode { + prev.Data += n.Data + return + } + + parent.InsertBefore(n, table) +} + +// addText adds text to the preceding node if it is a text node, or else it +// calls addChild with a new text node. +func (p *parser) addText(text string) { + if text == "" { + return + } + + if p.shouldFosterParent() { + p.fosterParent(&Node{ + Type: TextNode, + Data: text, + }) + return + } + + t := p.top() + if n := t.LastChild; n != nil && n.Type == TextNode { + n.Data += text + return + } + p.addChild(&Node{ + Type: TextNode, + Data: text, + }) +} + +// addElement adds a child element based on the current token. +func (p *parser) addElement() { + p.addChild(&Node{ + Type: ElementNode, + DataAtom: p.tok.DataAtom, + Data: p.tok.Data, + Attr: p.tok.Attr, + }) +} + +// Section 12.2.3.3. +func (p *parser) addFormattingElement() { + tagAtom, attr := p.tok.DataAtom, p.tok.Attr + p.addElement() + + // Implement the Noah's Ark clause, but with three per family instead of two. + identicalElements := 0 +findIdenticalElements: + for i := len(p.afe) - 1; i >= 0; i-- { + n := p.afe[i] + if n.Type == scopeMarkerNode { + break + } + if n.Type != ElementNode { + continue + } + if n.Namespace != "" { + continue + } + if n.DataAtom != tagAtom { + continue + } + if len(n.Attr) != len(attr) { + continue + } + compareAttributes: + for _, t0 := range n.Attr { + for _, t1 := range attr { + if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val { + // Found a match for this attribute, continue with the next attribute. + continue compareAttributes + } + } + // If we get here, there is no attribute that matches a. + // Therefore the element is not identical to the new one. + continue findIdenticalElements + } + + identicalElements++ + if identicalElements >= 3 { + p.afe.remove(n) + } + } + + p.afe = append(p.afe, p.top()) +} + +// Section 12.2.3.3. +func (p *parser) clearActiveFormattingElements() { + for { + n := p.afe.pop() + if len(p.afe) == 0 || n.Type == scopeMarkerNode { + return + } + } +} + +// Section 12.2.3.3. +func (p *parser) reconstructActiveFormattingElements() { + n := p.afe.top() + if n == nil { + return + } + if n.Type == scopeMarkerNode || p.oe.index(n) != -1 { + return + } + i := len(p.afe) - 1 + for n.Type != scopeMarkerNode && p.oe.index(n) == -1 { + if i == 0 { + i = -1 + break + } + i-- + n = p.afe[i] + } + for { + i++ + clone := p.afe[i].clone() + p.addChild(clone) + p.afe[i] = clone + if i == len(p.afe)-1 { + break + } + } +} + +// Section 12.2.4. +func (p *parser) acknowledgeSelfClosingTag() { + p.hasSelfClosingToken = false +} + +// An insertion mode (section 12.2.3.1) is the state transition function from +// a particular state in the HTML5 parser's state machine. It updates the +// parser's fields depending on parser.tok (where ErrorToken means EOF). +// It returns whether the token was consumed. +type insertionMode func(*parser) bool + +// setOriginalIM sets the insertion mode to return to after completing a text or +// inTableText insertion mode. +// Section 12.2.3.1, "using the rules for". +func (p *parser) setOriginalIM() { + if p.originalIM != nil { + panic("html: bad parser state: originalIM was set twice") + } + p.originalIM = p.im +} + +// Section 12.2.3.1, "reset the insertion mode". +func (p *parser) resetInsertionMode() { + for i := len(p.oe) - 1; i >= 0; i-- { + n := p.oe[i] + if i == 0 && p.context != nil { + n = p.context + } + + switch n.DataAtom { + case a.Select: + p.im = inSelectIM + case a.Td, a.Th: + p.im = inCellIM + case a.Tr: + p.im = inRowIM + case a.Tbody, a.Thead, a.Tfoot: + p.im = inTableBodyIM + case a.Caption: + p.im = inCaptionIM + case a.Colgroup: + p.im = inColumnGroupIM + case a.Table: + p.im = inTableIM + case a.Head: + p.im = inBodyIM + case a.Body: + p.im = inBodyIM + case a.Frameset: + p.im = inFramesetIM + case a.Html: + p.im = beforeHeadIM + default: + continue + } + return + } + p.im = inBodyIM +} + +const whitespace = " \t\r\n\f" + +// Section 12.2.5.4.1. +func initialIM(p *parser) bool { + switch p.tok.Type { + case TextToken: + p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace) + if len(p.tok.Data) == 0 { + // It was all whitespace, so ignore it. + return true + } + case CommentToken: + p.doc.AppendChild(&Node{ + Type: CommentNode, + Data: p.tok.Data, + }) + return true + case DoctypeToken: + n, quirks := parseDoctype(p.tok.Data) + p.doc.AppendChild(n) + p.quirks = quirks + p.im = beforeHTMLIM + return true + } + p.quirks = true + p.im = beforeHTMLIM + return false +} + +// Section 12.2.5.4.2. +func beforeHTMLIM(p *parser) bool { + switch p.tok.Type { + case DoctypeToken: + // Ignore the token. + return true + case TextToken: + p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace) + if len(p.tok.Data) == 0 { + // It was all whitespace, so ignore it. + return true + } + case StartTagToken: + if p.tok.DataAtom == a.Html { + p.addElement() + p.im = beforeHeadIM + return true + } + case EndTagToken: + switch p.tok.DataAtom { + case a.Head, a.Body, a.Html, a.Br: + p.parseImpliedToken(StartTagToken, a.Html, a.Html.String()) + return false + default: + // Ignore the token. + return true + } + case CommentToken: + p.doc.AppendChild(&Node{ + Type: CommentNode, + Data: p.tok.Data, + }) + return true + } + p.parseImpliedToken(StartTagToken, a.Html, a.Html.String()) + return false +} + +// Section 12.2.5.4.3. +func beforeHeadIM(p *parser) bool { + switch p.tok.Type { + case TextToken: + p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace) + if len(p.tok.Data) == 0 { + // It was all whitespace, so ignore it. + return true + } + case StartTagToken: + switch p.tok.DataAtom { + case a.Head: + p.addElement() + p.head = p.top() + p.im = inHeadIM + return true + case a.Html: + return inBodyIM(p) + } + case EndTagToken: + switch p.tok.DataAtom { + case a.Head, a.Body, a.Html, a.Br: + p.parseImpliedToken(StartTagToken, a.Head, a.Head.String()) + return false + default: + // Ignore the token. + return true + } + case CommentToken: + p.addChild(&Node{ + Type: CommentNode, + Data: p.tok.Data, + }) + return true + case DoctypeToken: + // Ignore the token. + return true + } + + p.parseImpliedToken(StartTagToken, a.Head, a.Head.String()) + return false +} + +// Section 12.2.5.4.4. +func inHeadIM(p *parser) bool { + switch p.tok.Type { + case TextToken: + s := strings.TrimLeft(p.tok.Data, whitespace) + if len(s) < len(p.tok.Data) { + // Add the initial whitespace to the current node. + p.addText(p.tok.Data[:len(p.tok.Data)-len(s)]) + if s == "" { + return true + } + p.tok.Data = s + } + case StartTagToken: + switch p.tok.DataAtom { + case a.Html: + return inBodyIM(p) + case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta: + p.addElement() + p.oe.pop() + p.acknowledgeSelfClosingTag() + return true + case a.Script, a.Title, a.Noscript, a.Noframes, a.Style: + p.addElement() + p.setOriginalIM() + p.im = textIM + return true + case a.Head: + // Ignore the token. + return true + } + case EndTagToken: + switch p.tok.DataAtom { + case a.Head: + n := p.oe.pop() + if n.DataAtom != a.Head { + panic("html: bad parser state: element not found, in the in-head insertion mode") + } + p.im = afterHeadIM + return true + case a.Body, a.Html, a.Br: + p.parseImpliedToken(EndTagToken, a.Head, a.Head.String()) + return false + default: + // Ignore the token. + return true + } + case CommentToken: + p.addChild(&Node{ + Type: CommentNode, + Data: p.tok.Data, + }) + return true + case DoctypeToken: + // Ignore the token. + return true + } + + p.parseImpliedToken(EndTagToken, a.Head, a.Head.String()) + return false +} + +// Section 12.2.5.4.6. +func afterHeadIM(p *parser) bool { + switch p.tok.Type { + case TextToken: + s := strings.TrimLeft(p.tok.Data, whitespace) + if len(s) < len(p.tok.Data) { + // Add the initial whitespace to the current node. + p.addText(p.tok.Data[:len(p.tok.Data)-len(s)]) + if s == "" { + return true + } + p.tok.Data = s + } + case StartTagToken: + switch p.tok.DataAtom { + case a.Html: + return inBodyIM(p) + case a.Body: + p.addElement() + p.framesetOK = false + p.im = inBodyIM + return true + case a.Frameset: + p.addElement() + p.im = inFramesetIM + return true + case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title: + p.oe = append(p.oe, p.head) + defer p.oe.remove(p.head) + return inHeadIM(p) + case a.Head: + // Ignore the token. + return true + } + case EndTagToken: + switch p.tok.DataAtom { + case a.Body, a.Html, a.Br: + // Drop down to creating an implied tag. + default: + // Ignore the token. + return true + } + case CommentToken: + p.addChild(&Node{ + Type: CommentNode, + Data: p.tok.Data, + }) + return true + case DoctypeToken: + // Ignore the token. + return true + } + + p.parseImpliedToken(StartTagToken, a.Body, a.Body.String()) + p.framesetOK = true + return false +} + +// copyAttributes copies attributes of src not found on dst to dst. +func copyAttributes(dst *Node, src Token) { + if len(src.Attr) == 0 { + return + } + attr := map[string]string{} + for _, t := range dst.Attr { + attr[t.Key] = t.Val + } + for _, t := range src.Attr { + if _, ok := attr[t.Key]; !ok { + dst.Attr = append(dst.Attr, t) + attr[t.Key] = t.Val + } + } +} + +// Section 12.2.5.4.7. +func inBodyIM(p *parser) bool { + switch p.tok.Type { + case TextToken: + d := p.tok.Data + switch n := p.oe.top(); n.DataAtom { + case a.Pre, a.Listing: + if n.FirstChild == nil { + // Ignore a newline at the start of a
block.
+ if d != "" && d[0] == '\r' {
+ d = d[1:]
+ }
+ if d != "" && d[0] == '\n' {
+ d = d[1:]
+ }
+ }
+ }
+ d = strings.Replace(d, "\x00", "", -1)
+ if d == "" {
+ return true
+ }
+ p.reconstructActiveFormattingElements()
+ p.addText(d)
+ if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
+ // There were non-whitespace characters inserted.
+ p.framesetOK = false
+ }
+ case StartTagToken:
+ switch p.tok.DataAtom {
+ case a.Html:
+ copyAttributes(p.oe[0], p.tok)
+ case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+ return inHeadIM(p)
+ case a.Body:
+ if len(p.oe) >= 2 {
+ body := p.oe[1]
+ if body.Type == ElementNode && body.DataAtom == a.Body {
+ p.framesetOK = false
+ copyAttributes(body, p.tok)
+ }
+ }
+ case a.Frameset:
+ if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
+ // Ignore the token.
+ return true
+ }
+ body := p.oe[1]
+ if body.Parent != nil {
+ body.Parent.RemoveChild(body)
+ }
+ p.oe = p.oe[:1]
+ p.addElement()
+ p.im = inFramesetIM
+ return true
+ case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
+ p.popUntil(buttonScope, a.P)
+ p.addElement()
+ case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+ p.popUntil(buttonScope, a.P)
+ switch n := p.top(); n.DataAtom {
+ case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+ p.oe.pop()
+ }
+ p.addElement()
+ case a.Pre, a.Listing:
+ p.popUntil(buttonScope, a.P)
+ p.addElement()
+ // The newline, if any, will be dealt with by the TextToken case.
+ p.framesetOK = false
+ case a.Form:
+ if p.form == nil {
+ p.popUntil(buttonScope, a.P)
+ p.addElement()
+ p.form = p.top()
+ }
+ case a.Li:
+ p.framesetOK = false
+ for i := len(p.oe) - 1; i >= 0; i-- {
+ node := p.oe[i]
+ switch node.DataAtom {
+ case a.Li:
+ p.oe = p.oe[:i]
+ case a.Address, a.Div, a.P:
+ continue
+ default:
+ if !isSpecialElement(node) {
+ continue
+ }
+ }
+ break
+ }
+ p.popUntil(buttonScope, a.P)
+ p.addElement()
+ case a.Dd, a.Dt:
+ p.framesetOK = false
+ for i := len(p.oe) - 1; i >= 0; i-- {
+ node := p.oe[i]
+ switch node.DataAtom {
+ case a.Dd, a.Dt:
+ p.oe = p.oe[:i]
+ case a.Address, a.Div, a.P:
+ continue
+ default:
+ if !isSpecialElement(node) {
+ continue
+ }
+ }
+ break
+ }
+ p.popUntil(buttonScope, a.P)
+ p.addElement()
+ case a.Plaintext:
+ p.popUntil(buttonScope, a.P)
+ p.addElement()
+ case a.Button:
+ p.popUntil(defaultScope, a.Button)
+ p.reconstructActiveFormattingElements()
+ p.addElement()
+ p.framesetOK = false
+ case a.A:
+ for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
+ if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
+ p.inBodyEndTagFormatting(a.A)
+ p.oe.remove(n)
+ p.afe.remove(n)
+ break
+ }
+ }
+ p.reconstructActiveFormattingElements()
+ p.addFormattingElement()
+ case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+ p.reconstructActiveFormattingElements()
+ p.addFormattingElement()
+ case a.Nobr:
+ p.reconstructActiveFormattingElements()
+ if p.elementInScope(defaultScope, a.Nobr) {
+ p.inBodyEndTagFormatting(a.Nobr)
+ p.reconstructActiveFormattingElements()
+ }
+ p.addFormattingElement()
+ case a.Applet, a.Marquee, a.Object:
+ p.reconstructActiveFormattingElements()
+ p.addElement()
+ p.afe = append(p.afe, &scopeMarker)
+ p.framesetOK = false
+ case a.Table:
+ if !p.quirks {
+ p.popUntil(buttonScope, a.P)
+ }
+ p.addElement()
+ p.framesetOK = false
+ p.im = inTableIM
+ return true
+ case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
+ p.reconstructActiveFormattingElements()
+ p.addElement()
+ p.oe.pop()
+ p.acknowledgeSelfClosingTag()
+ if p.tok.DataAtom == a.Input {
+ for _, t := range p.tok.Attr {
+ if t.Key == "type" {
+ if strings.ToLower(t.Val) == "hidden" {
+ // Skip setting framesetOK = false
+ return true
+ }
+ }
+ }
+ }
+ p.framesetOK = false
+ case a.Param, a.Source, a.Track:
+ p.addElement()
+ p.oe.pop()
+ p.acknowledgeSelfClosingTag()
+ case a.Hr:
+ p.popUntil(buttonScope, a.P)
+ p.addElement()
+ p.oe.pop()
+ p.acknowledgeSelfClosingTag()
+ p.framesetOK = false
+ case a.Image:
+ p.tok.DataAtom = a.Img
+ p.tok.Data = a.Img.String()
+ return false
+ case a.Isindex:
+ if p.form != nil {
+ // Ignore the token.
+ return true
+ }
+ action := ""
+ prompt := "This is a searchable index. Enter search keywords: "
+ attr := []Attribute{{Key: "name", Val: "isindex"}}
+ for _, t := range p.tok.Attr {
+ switch t.Key {
+ case "action":
+ action = t.Val
+ case "name":
+ // Ignore the attribute.
+ case "prompt":
+ prompt = t.Val
+ default:
+ attr = append(attr, t)
+ }
+ }
+ p.acknowledgeSelfClosingTag()
+ p.popUntil(buttonScope, a.P)
+ p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
+ if action != "" {
+ p.form.Attr = []Attribute{{Key: "action", Val: action}}
+ }
+ p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+ p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
+ p.addText(prompt)
+ p.addChild(&Node{
+ Type: ElementNode,
+ DataAtom: a.Input,
+ Data: a.Input.String(),
+ Attr: attr,
+ })
+ p.oe.pop()
+ p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
+ p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+ p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
+ case a.Textarea:
+ p.addElement()
+ p.setOriginalIM()
+ p.framesetOK = false
+ p.im = textIM
+ case a.Xmp:
+ p.popUntil(buttonScope, a.P)
+ p.reconstructActiveFormattingElements()
+ p.framesetOK = false
+ p.addElement()
+ p.setOriginalIM()
+ p.im = textIM
+ case a.Iframe:
+ p.framesetOK = false
+ p.addElement()
+ p.setOriginalIM()
+ p.im = textIM
+ case a.Noembed, a.Noscript:
+ p.addElement()
+ p.setOriginalIM()
+ p.im = textIM
+ case a.Select:
+ p.reconstructActiveFormattingElements()
+ p.addElement()
+ p.framesetOK = false
+ p.im = inSelectIM
+ return true
+ case a.Optgroup, a.Option:
+ if p.top().DataAtom == a.Option {
+ p.oe.pop()
+ }
+ p.reconstructActiveFormattingElements()
+ p.addElement()
+ case a.Rp, a.Rt:
+ if p.elementInScope(defaultScope, a.Ruby) {
+ p.generateImpliedEndTags()
+ }
+ p.addElement()
+ case a.Math, a.Svg:
+ p.reconstructActiveFormattingElements()
+ if p.tok.DataAtom == a.Math {
+ adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
+ } else {
+ adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
+ }
+ adjustForeignAttributes(p.tok.Attr)
+ p.addElement()
+ p.top().Namespace = p.tok.Data
+ if p.hasSelfClosingToken {
+ p.oe.pop()
+ p.acknowledgeSelfClosingTag()
+ }
+ return true
+ case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+ // Ignore the token.
+ default:
+ p.reconstructActiveFormattingElements()
+ p.addElement()
+ }
+ case EndTagToken:
+ switch p.tok.DataAtom {
+ case a.Body:
+ if p.elementInScope(defaultScope, a.Body) {
+ p.im = afterBodyIM
+ }
+ case a.Html:
+ if p.elementInScope(defaultScope, a.Body) {
+ p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
+ return false
+ }
+ return true
+ case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
+ p.popUntil(defaultScope, p.tok.DataAtom)
+ case a.Form:
+ node := p.form
+ p.form = nil
+ i := p.indexOfElementInScope(defaultScope, a.Form)
+ if node == nil || i == -1 || p.oe[i] != node {
+ // Ignore the token.
+ return true
+ }
+ p.generateImpliedEndTags()
+ p.oe.remove(node)
+ case a.P:
+ if !p.elementInScope(buttonScope, a.P) {
+ p.parseImpliedToken(StartTagToken, a.P, a.P.String())
+ }
+ p.popUntil(buttonScope, a.P)
+ case a.Li:
+ p.popUntil(listItemScope, a.Li)
+ case a.Dd, a.Dt:
+ p.popUntil(defaultScope, p.tok.DataAtom)
+ case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+ p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
+ case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+ p.inBodyEndTagFormatting(p.tok.DataAtom)
+ case a.Applet, a.Marquee, a.Object:
+ if p.popUntil(defaultScope, p.tok.DataAtom) {
+ p.clearActiveFormattingElements()
+ }
+ case a.Br:
+ p.tok.Type = StartTagToken
+ return false
+ default:
+ p.inBodyEndTagOther(p.tok.DataAtom)
+ }
+ case CommentToken:
+ p.addChild(&Node{
+ Type: CommentNode,
+ Data: p.tok.Data,
+ })
+ }
+
+ return true
+}
+
+func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
+ // This is the "adoption agency" algorithm, described at
+ // https://html.spec.whatwg.org/multipage/syntax.html#adoptionAgency
+
+ // TODO: this is a fairly literal line-by-line translation of that algorithm.
+ // Once the code successfully parses the comprehensive test suite, we should
+ // refactor this code to be more idiomatic.
+
+ // Steps 1-4. The outer loop.
+ for i := 0; i < 8; i++ {
+ // Step 5. Find the formatting element.
+ var formattingElement *Node
+ for j := len(p.afe) - 1; j >= 0; j-- {
+ if p.afe[j].Type == scopeMarkerNode {
+ break
+ }
+ if p.afe[j].DataAtom == tagAtom {
+ formattingElement = p.afe[j]
+ break
+ }
+ }
+ if formattingElement == nil {
+ p.inBodyEndTagOther(tagAtom)
+ return
+ }
+ feIndex := p.oe.index(formattingElement)
+ if feIndex == -1 {
+ p.afe.remove(formattingElement)
+ return
+ }
+ if !p.elementInScope(defaultScope, tagAtom) {
+ // Ignore the tag.
+ return
+ }
+
+ // Steps 9-10. Find the furthest block.
+ var furthestBlock *Node
+ for _, e := range p.oe[feIndex:] {
+ if isSpecialElement(e) {
+ furthestBlock = e
+ break
+ }
+ }
+ if furthestBlock == nil {
+ e := p.oe.pop()
+ for e != formattingElement {
+ e = p.oe.pop()
+ }
+ p.afe.remove(e)
+ return
+ }
+
+ // Steps 11-12. Find the common ancestor and bookmark node.
+ commonAncestor := p.oe[feIndex-1]
+ bookmark := p.afe.index(formattingElement)
+
+ // Step 13. The inner loop. Find the lastNode to reparent.
+ lastNode := furthestBlock
+ node := furthestBlock
+ x := p.oe.index(node)
+ // Steps 13.1-13.2
+ for j := 0; j < 3; j++ {
+ // Step 13.3.
+ x--
+ node = p.oe[x]
+ // Step 13.4 - 13.5.
+ if p.afe.index(node) == -1 {
+ p.oe.remove(node)
+ continue
+ }
+ // Step 13.6.
+ if node == formattingElement {
+ break
+ }
+ // Step 13.7.
+ clone := node.clone()
+ p.afe[p.afe.index(node)] = clone
+ p.oe[p.oe.index(node)] = clone
+ node = clone
+ // Step 13.8.
+ if lastNode == furthestBlock {
+ bookmark = p.afe.index(node) + 1
+ }
+ // Step 13.9.
+ if lastNode.Parent != nil {
+ lastNode.Parent.RemoveChild(lastNode)
+ }
+ node.AppendChild(lastNode)
+ // Step 13.10.
+ lastNode = node
+ }
+
+ // Step 14. Reparent lastNode to the common ancestor,
+ // or for misnested table nodes, to the foster parent.
+ if lastNode.Parent != nil {
+ lastNode.Parent.RemoveChild(lastNode)
+ }
+ switch commonAncestor.DataAtom {
+ case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+ p.fosterParent(lastNode)
+ default:
+ commonAncestor.AppendChild(lastNode)
+ }
+
+ // Steps 15-17. Reparent nodes from the furthest block's children
+ // to a clone of the formatting element.
+ clone := formattingElement.clone()
+ reparentChildren(clone, furthestBlock)
+ furthestBlock.AppendChild(clone)
+
+ // Step 18. Fix up the list of active formatting elements.
+ if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
+ // Move the bookmark with the rest of the list.
+ bookmark--
+ }
+ p.afe.remove(formattingElement)
+ p.afe.insert(bookmark, clone)
+
+ // Step 19. Fix up the stack of open elements.
+ p.oe.remove(formattingElement)
+ p.oe.insert(p.oe.index(furthestBlock)+1, clone)
+ }
+}
+
+// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
+// "Any other end tag" handling from 12.2.5.5 The rules for parsing tokens in foreign content
+// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inforeign
+func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
+ for i := len(p.oe) - 1; i >= 0; i-- {
+ if p.oe[i].DataAtom == tagAtom {
+ p.oe = p.oe[:i]
+ break
+ }
+ if isSpecialElement(p.oe[i]) {
+ break
+ }
+ }
+}
+
+// Section 12.2.5.4.8.
+func textIM(p *parser) bool {
+ switch p.tok.Type {
+ case ErrorToken:
+ p.oe.pop()
+ case TextToken:
+ d := p.tok.Data
+ if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
+ // Ignore a newline at the start of a -->
+#errors
+#document
+|
+|
+|
+| -->
+#errors
+#document
+|
+|
+|
+|
+#errors
+Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+#document
+|
+|
+|
+|
+#errors
+Line: 1 Col: 9 Unexpected end tag (strong). Expected DOCTYPE.
+Line: 1 Col: 9 Unexpected end tag (strong) after the (implied) root element.
+Line: 1 Col: 13 Unexpected end tag (b) after the (implied) root element.
+Line: 1 Col: 18 Unexpected end tag (em) after the (implied) root element.
+Line: 1 Col: 22 Unexpected end tag (i) after the (implied) root element.
+Line: 1 Col: 26 Unexpected end tag (u) after the (implied) root element.
+Line: 1 Col: 35 Unexpected end tag (strike) after the (implied) root element.
+Line: 1 Col: 39 Unexpected end tag (s) after the (implied) root element.
+Line: 1 Col: 47 Unexpected end tag (blink) after the (implied) root element.
+Line: 1 Col: 52 Unexpected end tag (tt) after the (implied) root element.
+Line: 1 Col: 58 Unexpected end tag (pre) after the (implied) root element.
+Line: 1 Col: 64 Unexpected end tag (big) after the (implied) root element.
+Line: 1 Col: 72 Unexpected end tag (small) after the (implied) root element.
+Line: 1 Col: 79 Unexpected end tag (font) after the (implied) root element.
+Line: 1 Col: 88 Unexpected end tag (select) after the (implied) root element.
+Line: 1 Col: 93 Unexpected end tag (h1) after the (implied) root element.
+Line: 1 Col: 98 Unexpected end tag (h2) after the (implied) root element.
+Line: 1 Col: 103 Unexpected end tag (h3) after the (implied) root element.
+Line: 1 Col: 108 Unexpected end tag (h4) after the (implied) root element.
+Line: 1 Col: 113 Unexpected end tag (h5) after the (implied) root element.
+Line: 1 Col: 118 Unexpected end tag (h6) after the (implied) root element.
+Line: 1 Col: 125 Unexpected end tag (body) after the (implied) root element.
+Line: 1 Col: 130 Unexpected end tag (br). Treated as br element.
+Line: 1 Col: 134 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 140 This element (img) has no end tag.
+Line: 1 Col: 148 Unexpected end tag (title). Ignored.
+Line: 1 Col: 155 Unexpected end tag (span). Ignored.
+Line: 1 Col: 163 Unexpected end tag (style). Ignored.
+Line: 1 Col: 172 Unexpected end tag (script). Ignored.
+Line: 1 Col: 180 Unexpected end tag (table). Ignored.
+Line: 1 Col: 185 Unexpected end tag (th). Ignored.
+Line: 1 Col: 190 Unexpected end tag (td). Ignored.
+Line: 1 Col: 195 Unexpected end tag (tr). Ignored.
+Line: 1 Col: 203 This element (frame) has no end tag.
+Line: 1 Col: 210 This element (area) has no end tag.
+Line: 1 Col: 217 Unexpected end tag (link). Ignored.
+Line: 1 Col: 225 This element (param) has no end tag.
+Line: 1 Col: 230 This element (hr) has no end tag.
+Line: 1 Col: 238 This element (input) has no end tag.
+Line: 1 Col: 244 Unexpected end tag (col). Ignored.
+Line: 1 Col: 251 Unexpected end tag (base). Ignored.
+Line: 1 Col: 258 Unexpected end tag (meta). Ignored.
+Line: 1 Col: 269 This element (basefont) has no end tag.
+Line: 1 Col: 279 This element (bgsound) has no end tag.
+Line: 1 Col: 287 This element (embed) has no end tag.
+Line: 1 Col: 296 This element (spacer) has no end tag.
+Line: 1 Col: 300 Unexpected end tag (p). Ignored.
+Line: 1 Col: 305 End tag (dd) seen too early. Expected other end tag.
+Line: 1 Col: 310 End tag (dt) seen too early. Expected other end tag.
+Line: 1 Col: 320 Unexpected end tag (caption). Ignored.
+Line: 1 Col: 331 Unexpected end tag (colgroup). Ignored.
+Line: 1 Col: 339 Unexpected end tag (tbody). Ignored.
+Line: 1 Col: 347 Unexpected end tag (tfoot). Ignored.
+Line: 1 Col: 355 Unexpected end tag (thead). Ignored.
+Line: 1 Col: 365 End tag (address) seen too early. Expected other end tag.
+Line: 1 Col: 378 End tag (blockquote) seen too early. Expected other end tag.
+Line: 1 Col: 387 End tag (center) seen too early. Expected other end tag.
+Line: 1 Col: 393 Unexpected end tag (dir). Ignored.
+Line: 1 Col: 399 End tag (div) seen too early. Expected other end tag.
+Line: 1 Col: 404 End tag (dl) seen too early. Expected other end tag.
+Line: 1 Col: 415 End tag (fieldset) seen too early. Expected other end tag.
+Line: 1 Col: 425 End tag (listing) seen too early. Expected other end tag.
+Line: 1 Col: 432 End tag (menu) seen too early. Expected other end tag.
+Line: 1 Col: 437 End tag (ol) seen too early. Expected other end tag.
+Line: 1 Col: 442 End tag (ul) seen too early. Expected other end tag.
+Line: 1 Col: 447 End tag (li) seen too early. Expected other end tag.
+Line: 1 Col: 454 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 460 This element (wbr) has no end tag.
+Line: 1 Col: 476 End tag (button) seen too early. Expected other end tag.
+Line: 1 Col: 486 End tag (marquee) seen too early. Expected other end tag.
+Line: 1 Col: 495 End tag (object) seen too early. Expected other end tag.
+Line: 1 Col: 513 Unexpected end tag (html). Ignored.
+Line: 1 Col: 513 Unexpected end tag (frameset). Ignored.
+Line: 1 Col: 520 Unexpected end tag (head). Ignored.
+Line: 1 Col: 529 Unexpected end tag (iframe). Ignored.
+Line: 1 Col: 537 This element (image) has no end tag.
+Line: 1 Col: 547 This element (isindex) has no end tag.
+Line: 1 Col: 557 Unexpected end tag (noembed). Ignored.
+Line: 1 Col: 568 Unexpected end tag (noframes). Ignored.
+Line: 1 Col: 579 Unexpected end tag (noscript). Ignored.
+Line: 1 Col: 590 Unexpected end tag (optgroup). Ignored.
+Line: 1 Col: 599 Unexpected end tag (option). Ignored.
+Line: 1 Col: 611 Unexpected end tag (plaintext). Ignored.
+Line: 1 Col: 622 Unexpected end tag (textarea). Ignored.
+#document
+|
+|
+|
+|
+|
+
+#data
+
+|