Skip to content

Commit

Permalink
Pull in hyperledger/burrow rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Silas Davis committed Apr 11, 2017
2 parents 50a9156 + 6f8151b commit 9fc9fb5
Show file tree
Hide file tree
Showing 131 changed files with 443 additions and 444 deletions.
30 changes: 15 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ of the architecture across the Monax Platform to support a quicker release
cadence.

#### Features and improvements (among others)
- [pull-510](https://github.com/monax/burrow/pull/510) upgrade consensus engine to Tendermint v0.8.0
- [pull-507](https://github.com/monax/burrow/pull/507) use sha3 for snative addresses for future-proofing
- [pull-506](https://github.com/monax/burrow/pull/506) alignment and consolidation for genesis and config between tooling and chains
- [pull-504](https://github.com/monax/burrow/pull/504) relicense burrow to Apache 2.0
- [pull-500](https://github.com/monax/burrow/pull/500) introduce more strongly types secure native contracts
- [pull-499](https://github.com/monax/burrow/pull/499) introduce word256 and remove dependency on tendermint/go-common
- [pull-493](https://github.com/monax/burrow/pull/493) re-introduce GenesisTime in GenesisDoc
- [pull-510](https://github.com/hyperledger/burrow/pull/510) upgrade consensus engine to Tendermint v0.8.0
- [pull-507](https://github.com/hyperledger/burrow/pull/507) use sha3 for snative addresses for future-proofing
- [pull-506](https://github.com/hyperledger/burrow/pull/506) alignment and consolidation for genesis and config between tooling and chains
- [pull-504](https://github.com/hyperledger/burrow/pull/504) relicense burrow to Apache 2.0
- [pull-500](https://github.com/hyperledger/burrow/pull/500) introduce more strongly types secure native contracts
- [pull-499](https://github.com/hyperledger/burrow/pull/499) introduce word256 and remove dependency on tendermint/go-common
- [pull-493](https://github.com/hyperledger/burrow/pull/493) re-introduce GenesisTime in GenesisDoc

- Logging system overhauled based on the central logging interface of go-kit log. Configuration lacking in this release but should be in 0.16.1. Allows powerful routing, filtering, and output options for better operations and increasing the observability of a burrow blockchain. More to follow.
- Genesis making is improved and moved into burrow.
- Config templating is moved into burrow for better synchronisation of server config between the consumer of it (burrow) and the producers of it (cli and other tools).
- Some documentation updates in code and in specs.
- [pull-462](https://github.com/monax/burrow/pull/499) Makefile added to capture conventions around building and testing and replicate them across different environments such as continuous integration systems.
- [pull-462](https://github.com/hyperledger/burrow/pull/499) Makefile added to capture conventions around building and testing and replicate them across different environments such as continuous integration systems.

#### Bugfixes (among others)
- [pull-516](https://github.com/monax/burrow/pull/516) Organize and add unit tests for rpc/v0
- [pull-453](https://github.com/monax/burrow/pull/453) Fix deserialisation for BroadcastTx on rpc/v0
- [pull-476](https://github.com/monax/burrow/pull/476) patch EXTCODESIZE for native contracts as solc ^v0.4 performs a safety check for non-zero contract code
- [pull-468](https://github.com/monax/burrow/pull/468) correct specifications for params on unsubscribe on rpc/tendermint
- [pull-465](https://github.com/monax/burrow/pull/465) fix divergence from JSON-RPC spec for Response object
- [pull-366](https://github.com/monax/burrow/pull/366) correction to circle ci script
- [pull-379](https://github.com/monax/burrow/pull/379) more descriptive error message for burrow-client
- [pull-516](https://github.com/hyperledger/burrow/pull/516) Organize and add unit tests for rpc/v0
- [pull-453](https://github.com/hyperledger/burrow/pull/453) Fix deserialisation for BroadcastTx on rpc/v0
- [pull-476](https://github.com/hyperledger/burrow/pull/476) patch EXTCODESIZE for native contracts as solc ^v0.4 performs a safety check for non-zero contract code
- [pull-468](https://github.com/hyperledger/burrow/pull/468) correct specifications for params on unsubscribe on rpc/tendermint
- [pull-465](https://github.com/hyperledger/burrow/pull/465) fix divergence from JSON-RPC spec for Response object
- [pull-366](https://github.com/hyperledger/burrow/pull/366) correction to circle ci script
- [pull-379](https://github.com/hyperledger/burrow/pull/379) more descriptive error message for burrow-client

## v0.12.0
This release marks the start of burrow as the full permissioned blockchain node
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
SHELL := /bin/bash
REPO := $(shell pwd)
GOFILES_NOVENDOR := $(shell find ${REPO} -type f -name '*.go' -not -path "${REPO}/vendor/*")
PACKAGES_NOVENDOR := $(shell go list github.com/monax/burrow/... | grep -v /vendor/)
PACKAGES_NOVENDOR := $(shell go list github.com/hyperledger/burrow/... | grep -v /vendor/)
VERSION := $(shell cat ${REPO}/version/version.go | tail -n 1 | cut -d \ -f 4 | tr -d '"')
VERSION_MIN := $(shell echo ${VERSION} | cut -d . -f 1-2)
COMMIT_SHA := $(shell echo `git rev-parse --short --verify HEAD`)
Expand Down Expand Up @@ -54,7 +54,7 @@ vet:
@echo "Running go vet."
@go vet ${PACKAGES_NOVENDOR}

### Dependency management for github.com/monax/burrow
### Dependency management for github.com/hyperledger/burrow

# erase vendor wipes the full vendor directory
.PHONY: erase_vendor
Expand All @@ -78,13 +78,13 @@ hell:
snatives:
@go run ./util/snatives/cmd/main.go

### Building github.com/monax/burrow
### Building github.com/hyperledger/burrow

# build all targets in github.com/monax/burrow
# build all targets in github.com/hyperledger/burrow
.PHONY: build
build: check build_db build_client

# build all targets in github.com/monax/burrow with checks for race conditions
# build all targets in github.com/hyperledger/burrow with checks for race conditions
.PHONY: build_race
build_race: check build_race_db build_race_client build_race_keys

Expand All @@ -108,7 +108,7 @@ build_race_db:
build_race_client:
go build -race -o ${REPO}/target/burrow-client-${COMMIT_SHA} ./client/cmd/burrow-client

### Testing github.com/monax/burrow
### Testing github.com/hyperledger/burrow

# test burrow
.PHONY: test
Expand All @@ -120,7 +120,7 @@ test: build
test_race: build_race
@go test -race ${PACKAGES_NOVENDOR}

### Build docker images for github.com/monax/burrow
### Build docker images for github.com/hyperledger/burrow

# build docker image for burrow
.PHONY: build_docker_db
Expand All @@ -135,7 +135,7 @@ build_docker_db: check
@rm ${REPO}/target/docker/burrow-client.dockerartefact
docker rmi ${DOCKER_NAMESPACE}/db:build-${COMMIT_SHA}

### Test docker images for github.com/monax/burrow
### Test docker images for github.com/hyperledger/burrow

# test docker image for burrow
.PHONY: test_docker_db
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Burrow v0.16

|[![GoDoc](https://godoc.org/github.com/burrow?status.png)](https://godoc.org/github.com/monax/burrow) | Linux |
|[![GoDoc](https://godoc.org/github.com/burrow?status.png)](https://godoc.org/github.com/hyperledger/burrow) | Linux |
|---|-------|
| Master | [![Circle CI](https://circleci.com/gh/monax/burrow/tree/master.svg?style=svg)](https://circleci.com/gh/monax/burrow/tree/master) |
| Develop | [![Circle CI (develop)](https://circleci.com/gh/monax/burrow/tree/develop.svg?style=svg)](https://circleci.com/gh/monax/burrow/tree/develop) |
Expand Down Expand Up @@ -47,8 +47,8 @@ Dependency management for Burrow is managed with [glide](github.com/Masterminds/
- Ensure you have `gmp` installed (`sudo apt-get install libgmp3-dev || brew install gmp`)
- and execute following commands in a terminal:
- `go get github.com/Masterminds/glide`
- `go get -d github.com/monax/burrow`
- `REPO=$($GOPATH/src/github.com/monax/burrow)`
- `go get -d github.com/hyperledger/burrow`
- `REPO=$($GOPATH/src/github.com/hyperledger/burrow)`
- `cd $REPO && glide install`
- `cd $REPO/cmd/burrow && go install`

Expand All @@ -57,11 +57,11 @@ To run `burrow`, just type `$ burrow serve --work-dir <path to chain directory>`

This will start the node using the provided folder as working dir. If the path is omitted it defaults to `~/.monax`.

For a Vagrant file see [monax-vagrant](https://github.com/monax/monax-vagrant) for drafts or soon this repo for [Vagrant](https://github.com/monax/burrow/issues/514) and Packer files.
For a Vagrant file see [monax-vagrant](https://github.com/monax/monax-vagrant) for drafts or soon this repo for [Vagrant](https://github.com/hyperledger/burrow/issues/514) and Packer files.

## Usage

Once the server has started, it will begin syncing up with the network. At that point you may begin using it. The preferred way is through our [javascript api](https://github.com/monax/burrow.js), but it is possible to connect directly via HTTP or websocket.
Once the server has started, it will begin syncing up with the network. At that point you may begin using it. The preferred way is through our [javascript api](https://github.com/hyperledger/burrow.js), but it is possible to connect directly via HTTP or websocket.

## Configuration

Expand All @@ -73,7 +73,7 @@ We welcome all contributions and have submitted the code base to the Hyperledger

You can find us on:
- [the Marmot Den (slack)](http://slack.monax.io)
- [here on Github](http://github.com/monax/burrow/issues)
- [here on Github](http://github.com/hyperledger/burrow/issues)
- [support.monax.io](http://support.monax.io)
- read the [Contributor file](.github/CONTRIBUTING.md)

Expand Down
4 changes: 2 additions & 2 deletions account/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"fmt"
"io"

"github.com/monax/burrow/common/sanity"
ptypes "github.com/monax/burrow/permission/types"
"github.com/hyperledger/burrow/common/sanity"
ptypes "github.com/hyperledger/burrow/permission/types"

"github.com/tendermint/go-crypto"
"github.com/tendermint/go-wire"
Expand Down
2 changes: 1 addition & 1 deletion account/priv_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package account
import (
"fmt"

"github.com/monax/burrow/common/sanity"
"github.com/hyperledger/burrow/common/sanity"

"github.com/tendermint/ed25519"
"github.com/tendermint/go-crypto"
Expand Down
8 changes: 4 additions & 4 deletions blockchain/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

"sync"

blockchain_types "github.com/monax/burrow/blockchain/types"
core_types "github.com/monax/burrow/core/types"
"github.com/monax/burrow/event"
"github.com/monax/burrow/util/architecture"
blockchain_types "github.com/hyperledger/burrow/blockchain/types"
core_types "github.com/hyperledger/burrow/core/types"
"github.com/hyperledger/burrow/event"
"github.com/hyperledger/burrow/util/architecture"
tendermint_types "github.com/tendermint/tendermint/types"
)

Expand Down
4 changes: 2 additions & 2 deletions client/cmd/burrow-client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"

"github.com/monax/burrow/definitions"
"github.com/monax/burrow/version"
"github.com/hyperledger/burrow/definitions"
"github.com/hyperledger/burrow/version"
)

// Global flags for persistent flags
Expand Down
2 changes: 1 addition & 1 deletion client/cmd/burrow-client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
commands "github.com/monax/burrow/client/cmd"
commands "github.com/hyperledger/burrow/client/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions client/cmd/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package commands
import (
"fmt"

"github.com/monax/burrow/common/sanity"
"github.com/monax/burrow/genesis"
"github.com/hyperledger/burrow/common/sanity"
"github.com/hyperledger/burrow/genesis"

"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions client/cmd/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package commands
import (
"github.com/spf13/cobra"

"github.com/monax/burrow/client/methods"
"github.com/monax/burrow/util"
"github.com/hyperledger/burrow/client/methods"
"github.com/hyperledger/burrow/util"
)

func buildStatusCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions client/cmd/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"github.com/spf13/cobra"

"github.com/monax/burrow/client/methods"
"github.com/monax/burrow/util"
"github.com/hyperledger/burrow/client/methods"
"github.com/hyperledger/burrow/util"
)

func buildTransactionCommand() *cobra.Command {
Expand Down
8 changes: 4 additions & 4 deletions client/methods/call.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package methods
import (
"fmt"

"github.com/monax/burrow/client"
"github.com/monax/burrow/client/rpc"
"github.com/monax/burrow/definitions"
"github.com/monax/burrow/keys"
"github.com/hyperledger/burrow/client"
"github.com/hyperledger/burrow/client/rpc"
"github.com/hyperledger/burrow/definitions"
"github.com/hyperledger/burrow/keys"
)

func Call(do *definitions.ClientDo) error {
Expand Down
12 changes: 6 additions & 6 deletions client/methods/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
package methods

import (
"github.com/monax/burrow/client/rpc"
"github.com/monax/burrow/core"
"github.com/monax/burrow/definitions"
"github.com/monax/burrow/logging"
"github.com/monax/burrow/logging/lifecycle"
"github.com/monax/burrow/logging/loggers"
"github.com/hyperledger/burrow/client/rpc"
"github.com/hyperledger/burrow/core"
"github.com/hyperledger/burrow/definitions"
"github.com/hyperledger/burrow/logging"
"github.com/hyperledger/burrow/logging/lifecycle"
"github.com/hyperledger/burrow/logging/loggers"
)

func unpackSignAndBroadcast(result *rpc.TxResult, logger loggers.InfoTraceLogger) {
Expand Down
8 changes: 4 additions & 4 deletions client/methods/send.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package methods
import (
"fmt"

"github.com/monax/burrow/client"
"github.com/monax/burrow/client/rpc"
"github.com/monax/burrow/definitions"
"github.com/monax/burrow/keys"
"github.com/hyperledger/burrow/client"
"github.com/hyperledger/burrow/client/rpc"
"github.com/hyperledger/burrow/definitions"
"github.com/hyperledger/burrow/keys"
)

func Send(do *definitions.ClientDo) error {
Expand Down
4 changes: 2 additions & 2 deletions client/methods/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package methods
import (
"fmt"

"github.com/monax/burrow/client"
"github.com/monax/burrow/definitions"
"github.com/hyperledger/burrow/client"
"github.com/hyperledger/burrow/definitions"
)

func Status(do *definitions.ClientDo) error {
Expand Down
12 changes: 6 additions & 6 deletions client/mock/client_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ package mock
import (
"github.com/tendermint/go-crypto"

acc "github.com/monax/burrow/account"
. "github.com/monax/burrow/client"
consensus_types "github.com/monax/burrow/consensus/types"
core_types "github.com/monax/burrow/core/types"
"github.com/monax/burrow/logging/loggers"
"github.com/monax/burrow/txs"
acc "github.com/hyperledger/burrow/account"
. "github.com/hyperledger/burrow/client"
consensus_types "github.com/hyperledger/burrow/consensus/types"
core_types "github.com/hyperledger/burrow/core/types"
"github.com/hyperledger/burrow/logging/loggers"
"github.com/hyperledger/burrow/txs"
)

var _ NodeClient = (*MockNodeClient)(nil)
Expand Down
16 changes: 8 additions & 8 deletions client/node_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import (

"github.com/tendermint/go-rpc/client"

acc "github.com/monax/burrow/account"
consensus_types "github.com/monax/burrow/consensus/types"
core_types "github.com/monax/burrow/core/types"
"github.com/monax/burrow/logging"
"github.com/monax/burrow/logging/loggers"
tendermint_client "github.com/monax/burrow/rpc/tendermint/client"
tendermint_types "github.com/monax/burrow/rpc/tendermint/core/types"
"github.com/monax/burrow/txs"
acc "github.com/hyperledger/burrow/account"
consensus_types "github.com/hyperledger/burrow/consensus/types"
core_types "github.com/hyperledger/burrow/core/types"
"github.com/hyperledger/burrow/logging"
"github.com/hyperledger/burrow/logging/loggers"
tendermint_client "github.com/hyperledger/burrow/rpc/tendermint/client"
tendermint_types "github.com/hyperledger/burrow/rpc/tendermint/core/types"
"github.com/hyperledger/burrow/txs"
tmLog15 "github.com/tendermint/log15"
)

Expand Down
8 changes: 4 additions & 4 deletions client/rpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"fmt"
"strconv"

ptypes "github.com/monax/burrow/permission/types"
ptypes "github.com/hyperledger/burrow/permission/types"

"github.com/monax/burrow/client"
"github.com/monax/burrow/keys"
"github.com/monax/burrow/txs"
"github.com/hyperledger/burrow/client"
"github.com/hyperledger/burrow/keys"
"github.com/hyperledger/burrow/txs"
)

//------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions client/rpc/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

// "github.com/stretchr/testify/assert"

mockclient "github.com/monax/burrow/client/mock"
mockkeys "github.com/monax/burrow/keys/mock"
mockclient "github.com/hyperledger/burrow/client/mock"
mockkeys "github.com/hyperledger/burrow/keys/mock"
)

func Test(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions client/rpc/client_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (

"github.com/tendermint/go-crypto"

acc "github.com/monax/burrow/account"
"github.com/monax/burrow/client"
"github.com/monax/burrow/keys"
"github.com/monax/burrow/logging"
ptypes "github.com/monax/burrow/permission/types"
"github.com/monax/burrow/txs"
acc "github.com/hyperledger/burrow/account"
"github.com/hyperledger/burrow/client"
"github.com/hyperledger/burrow/keys"
"github.com/hyperledger/burrow/logging"
ptypes "github.com/hyperledger/burrow/permission/types"
"github.com/hyperledger/burrow/txs"
)

//------------------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions client/websocket_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/tendermint/go-rpc/client"
"github.com/tendermint/go-wire"

"github.com/monax/burrow/logging"
"github.com/monax/burrow/logging/loggers"
ctypes "github.com/monax/burrow/rpc/tendermint/core/types"
"github.com/monax/burrow/txs"
"github.com/hyperledger/burrow/logging"
"github.com/hyperledger/burrow/logging/loggers"
ctypes "github.com/hyperledger/burrow/rpc/tendermint/core/types"
"github.com/hyperledger/burrow/txs"
)

const (
Expand Down
Loading

0 comments on commit 9fc9fb5

Please sign in to comment.