diff --git a/CHANGELOG.md b/CHANGELOG.md index 52282d50e..b33fa6165 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Makefile b/Makefile index d24d60488..06b6400be 100644 --- a/Makefile +++ b/Makefile @@ -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`) @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/README.md b/README.md index dbd177e1c..957eeb92a 100644 --- a/README.md +++ b/README.md @@ -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) | @@ -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` @@ -57,11 +57,11 @@ To run `burrow`, just type `$ burrow serve --work-dir ` 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 @@ -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) diff --git a/account/account.go b/account/account.go index 69f0ded86..b050c9079 100644 --- a/account/account.go +++ b/account/account.go @@ -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" diff --git a/account/priv_account.go b/account/priv_account.go index 5a57687f7..e2fa762ff 100644 --- a/account/priv_account.go +++ b/account/priv_account.go @@ -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" diff --git a/blockchain/filter.go b/blockchain/filter.go index 6e05a27f6..c61f77fb1 100644 --- a/blockchain/filter.go +++ b/blockchain/filter.go @@ -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" ) diff --git a/client/cmd/burrow-client.go b/client/cmd/burrow-client.go index 9bb113884..788d7fd16 100644 --- a/client/cmd/burrow-client.go +++ b/client/cmd/burrow-client.go @@ -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 diff --git a/client/cmd/burrow-client/main.go b/client/cmd/burrow-client/main.go index be211672e..dc79298a9 100644 --- a/client/cmd/burrow-client/main.go +++ b/client/cmd/burrow-client/main.go @@ -15,7 +15,7 @@ package main import ( - commands "github.com/monax/burrow/client/cmd" + commands "github.com/hyperledger/burrow/client/cmd" ) func main() { diff --git a/client/cmd/genesis.go b/client/cmd/genesis.go index 43d649e14..3eb7f4621 100644 --- a/client/cmd/genesis.go +++ b/client/cmd/genesis.go @@ -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" ) diff --git a/client/cmd/status.go b/client/cmd/status.go index 910839d45..dac02391f 100644 --- a/client/cmd/status.go +++ b/client/cmd/status.go @@ -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 { diff --git a/client/cmd/transaction.go b/client/cmd/transaction.go index 79152b3ad..21b97e657 100644 --- a/client/cmd/transaction.go +++ b/client/cmd/transaction.go @@ -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 { diff --git a/client/methods/call.go b/client/methods/call.go index 76e52b726..9df3a51ac 100644 --- a/client/methods/call.go +++ b/client/methods/call.go @@ -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 { diff --git a/client/methods/helpers.go b/client/methods/helpers.go index 061ea9939..15b0a4fee 100644 --- a/client/methods/helpers.go +++ b/client/methods/helpers.go @@ -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) { diff --git a/client/methods/send.go b/client/methods/send.go index 77b3ed1e6..9437a9dfd 100644 --- a/client/methods/send.go +++ b/client/methods/send.go @@ -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 { diff --git a/client/methods/status.go b/client/methods/status.go index da74605fc..d14c3290b 100644 --- a/client/methods/status.go +++ b/client/methods/status.go @@ -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 { diff --git a/client/mock/client_mock.go b/client/mock/client_mock.go index 292f31c6e..08ba2641c 100644 --- a/client/mock/client_mock.go +++ b/client/mock/client_mock.go @@ -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) diff --git a/client/node_client.go b/client/node_client.go index 206c7f9ea..775e29fda 100644 --- a/client/node_client.go +++ b/client/node_client.go @@ -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" ) diff --git a/client/rpc/client.go b/client/rpc/client.go index 0e3f40582..5a3652e36 100644 --- a/client/rpc/client.go +++ b/client/rpc/client.go @@ -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" ) //------------------------------------------------------------------------------------ diff --git a/client/rpc/client_test.go b/client/rpc/client_test.go index 5fc4418db..a805b99bc 100644 --- a/client/rpc/client_test.go +++ b/client/rpc/client_test.go @@ -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) { diff --git a/client/rpc/client_util.go b/client/rpc/client_util.go index 1025c1683..6711c1ad5 100644 --- a/client/rpc/client_util.go +++ b/client/rpc/client_util.go @@ -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" ) //------------------------------------------------------------------------------------ diff --git a/client/websocket_client.go b/client/websocket_client.go index aab9d14a2..2c84ecba5 100644 --- a/client/websocket_client.go +++ b/client/websocket_client.go @@ -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 ( diff --git a/cmd/burrow.go b/cmd/burrow.go index 3c101ff6b..bfa3b264a 100644 --- a/cmd/burrow.go +++ b/cmd/burrow.go @@ -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" ) var BurrowCmd = &cobra.Command{ diff --git a/cmd/burrow/main.go b/cmd/burrow/main.go index 6a391ea8a..e5133ab87 100644 --- a/cmd/burrow/main.go +++ b/cmd/burrow/main.go @@ -15,7 +15,7 @@ package main import ( - commands "github.com/monax/burrow/cmd" + commands "github.com/hyperledger/burrow/cmd" ) func main() { diff --git a/cmd/serve.go b/cmd/serve.go index d7bef4725..a0c65d4b5 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -21,12 +21,12 @@ import ( "path" "syscall" - "github.com/monax/burrow/core" - "github.com/monax/burrow/definitions" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/lifecycle" - vm "github.com/monax/burrow/manager/burrow-mint/evm" - "github.com/monax/burrow/util" + "github.com/hyperledger/burrow/core" + "github.com/hyperledger/burrow/definitions" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/lifecycle" + vm "github.com/hyperledger/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/util" "github.com/spf13/cobra" ) diff --git a/common/random/random.go b/common/random/random.go index b040189dc..4b1e4e9f0 100644 --- a/common/random/random.go +++ b/common/random/random.go @@ -19,7 +19,7 @@ import ( "math/rand" "time" - "github.com/monax/burrow/common/sanity" + "github.com/hyperledger/burrow/common/sanity" ) const ( diff --git a/consensus/config.go b/consensus/config.go index 72bb13d6e..1c197b6fc 100644 --- a/consensus/config.go +++ b/consensus/config.go @@ -15,8 +15,8 @@ package consensus import ( - // noops "github.com/monax/burrow/consensus/noops" - tendermint "github.com/monax/burrow/consensus/tendermint" + // noops "github.com/hyperledger/burrow/consensus/noops" + tendermint "github.com/hyperledger/burrow/consensus/tendermint" ) //------------------------------------------------------------------------------ diff --git a/consensus/consensus.go b/consensus/consensus.go index bbae9a5c8..f94dffb2e 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -17,9 +17,9 @@ package consensus import ( "fmt" - config "github.com/monax/burrow/config" - tendermint "github.com/monax/burrow/consensus/tendermint" - definitions "github.com/monax/burrow/definitions" + config "github.com/hyperledger/burrow/config" + tendermint "github.com/hyperledger/burrow/consensus/tendermint" + definitions "github.com/hyperledger/burrow/definitions" ) func LoadConsensusEngineInPipe(moduleConfig *config.ModuleConfig, diff --git a/consensus/tendermint/config.go b/consensus/tendermint/config.go index 4d905e623..0ea0a1d54 100644 --- a/consensus/tendermint/config.go +++ b/consensus/tendermint/config.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/viper" tendermintConfig "github.com/tendermint/go-config" - "github.com/monax/burrow/config" + "github.com/hyperledger/burrow/config" ) // NOTE [ben] Compiler check to ensure TendermintConfig successfully implements diff --git a/consensus/tendermint/tendermint.go b/consensus/tendermint/tendermint.go index bf135266b..c11a7c508 100644 --- a/consensus/tendermint/tendermint.go +++ b/consensus/tendermint/tendermint.go @@ -27,16 +27,16 @@ import ( proxy "github.com/tendermint/tendermint/proxy" tendermint_types "github.com/tendermint/tendermint/types" - edb_event "github.com/monax/burrow/event" - - config "github.com/monax/burrow/config" - manager_types "github.com/monax/burrow/manager/types" - // files "github.com/monax/burrow/files" - blockchain_types "github.com/monax/burrow/blockchain/types" - consensus_types "github.com/monax/burrow/consensus/types" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" - "github.com/monax/burrow/txs" + edb_event "github.com/hyperledger/burrow/event" + + config "github.com/hyperledger/burrow/config" + manager_types "github.com/hyperledger/burrow/manager/types" + // files "github.com/hyperledger/burrow/files" + blockchain_types "github.com/hyperledger/burrow/blockchain/types" + consensus_types "github.com/hyperledger/burrow/consensus/types" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/txs" "github.com/tendermint/go-wire" ) diff --git a/consensus/tendermint/version.go b/consensus/tendermint/version.go index 98bc8ddb8..7a20ac5c1 100644 --- a/consensus/tendermint/version.go +++ b/consensus/tendermint/version.go @@ -19,7 +19,7 @@ import ( tendermint_version "github.com/tendermint/tendermint/version" - version "github.com/monax/burrow/version" + version "github.com/hyperledger/burrow/version" ) const ( diff --git a/consensus/types/consensus_engine.go b/consensus/types/consensus_engine.go index 8bbde1590..26754db31 100644 --- a/consensus/types/consensus_engine.go +++ b/consensus/types/consensus_engine.go @@ -15,8 +15,8 @@ package types import ( - "github.com/monax/burrow/event" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/event" + "github.com/hyperledger/burrow/txs" abci_types "github.com/tendermint/abci/types" "github.com/tendermint/go-crypto" "github.com/tendermint/go-p2p" diff --git a/core/config.go b/core/config.go index 41ac8a97a..30d21034f 100644 --- a/core/config.go +++ b/core/config.go @@ -23,14 +23,14 @@ import ( "os" "path" - "github.com/monax/burrow/config" - "github.com/monax/burrow/consensus" - "github.com/monax/burrow/definitions" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/manager" - "github.com/monax/burrow/server" - "github.com/monax/burrow/util" - "github.com/monax/burrow/version" + "github.com/hyperledger/burrow/config" + "github.com/hyperledger/burrow/consensus" + "github.com/hyperledger/burrow/definitions" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/manager" + "github.com/hyperledger/burrow/server" + "github.com/hyperledger/burrow/util" + "github.com/hyperledger/burrow/version" "github.com/spf13/viper" ) diff --git a/core/core.go b/core/core.go index 35c25e8fa..6e6189829 100644 --- a/core/core.go +++ b/core/core.go @@ -20,19 +20,19 @@ import ( // TODO: [ben] swap out go-events with burrow/event (currently unused) events "github.com/tendermint/go-events" - "github.com/monax/burrow/config" - "github.com/monax/burrow/consensus" - "github.com/monax/burrow/definitions" - "github.com/monax/burrow/event" - "github.com/monax/burrow/manager" + "github.com/hyperledger/burrow/config" + "github.com/hyperledger/burrow/consensus" + "github.com/hyperledger/burrow/definitions" + "github.com/hyperledger/burrow/event" + "github.com/hyperledger/burrow/manager" // rpc_v0 is carried over from burrowv0.11 and before on port 1337 - rpc_v0 "github.com/monax/burrow/rpc/v0" + rpc_v0 "github.com/hyperledger/burrow/rpc/v0" // rpc_tendermint is carried over from burrowv0.11 and before on port 46657 - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" - rpc_tendermint "github.com/monax/burrow/rpc/tendermint/core" - "github.com/monax/burrow/server" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" + rpc_tendermint "github.com/hyperledger/burrow/rpc/tendermint/core" + "github.com/hyperledger/burrow/server" ) // Core is the high-level structure diff --git a/core/types/types.go b/core/types/types.go index 130be6d63..5b0934c16 100644 --- a/core/types/types.go +++ b/core/types/types.go @@ -22,7 +22,7 @@ import ( // NodeInfo (drop this!) "github.com/tendermint/tendermint/types" - account "github.com/monax/burrow/account" + account "github.com/hyperledger/burrow/account" ) type ( diff --git a/definitions/do.go b/definitions/do.go index 56ff9e6c5..8e31e596f 100644 --- a/definitions/do.go +++ b/definitions/do.go @@ -20,7 +20,7 @@ import ( viper "github.com/spf13/viper" - util "github.com/monax/burrow/util" + util "github.com/hyperledger/burrow/util" ) type Do struct { diff --git a/definitions/pipe.go b/definitions/pipe.go index a474a2711..7c1fddd9e 100644 --- a/definitions/pipe.go +++ b/definitions/pipe.go @@ -23,15 +23,15 @@ package definitions // these interfaces into an Engine, Communicator, NameReg, Permissions (suggestion) import ( - account "github.com/monax/burrow/account" - blockchain_types "github.com/monax/burrow/blockchain/types" - consensus_types "github.com/monax/burrow/consensus/types" - core_types "github.com/monax/burrow/core/types" - types "github.com/monax/burrow/core/types" - event "github.com/monax/burrow/event" - "github.com/monax/burrow/logging/loggers" - manager_types "github.com/monax/burrow/manager/types" - "github.com/monax/burrow/txs" + account "github.com/hyperledger/burrow/account" + blockchain_types "github.com/hyperledger/burrow/blockchain/types" + consensus_types "github.com/hyperledger/burrow/consensus/types" + core_types "github.com/hyperledger/burrow/core/types" + types "github.com/hyperledger/burrow/core/types" + event "github.com/hyperledger/burrow/event" + "github.com/hyperledger/burrow/logging/loggers" + manager_types "github.com/hyperledger/burrow/manager/types" + "github.com/hyperledger/burrow/txs" ) type Pipe interface { diff --git a/definitions/tendermint_pipe.go b/definitions/tendermint_pipe.go index 176a8596f..600bfbd19 100644 --- a/definitions/tendermint_pipe.go +++ b/definitions/tendermint_pipe.go @@ -15,9 +15,9 @@ package definitions import ( - "github.com/monax/burrow/account" - rpc_tm_types "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/account" + rpc_tm_types "github.com/hyperledger/burrow/rpc/tendermint/core/types" + "github.com/hyperledger/burrow/txs" ) // NOTE: [ben] TendermintPipe is the additional pipe to carry over diff --git a/docs/specs/api.md b/docs/specs/api.md index 11ec3a644..9290f607b 100644 --- a/docs/specs/api.md +++ b/docs/specs/api.md @@ -2,7 +2,7 @@ ### for burrow version 0.11.x -Burrow allows remote access to its functionality over http and websocket. It currently supports [JSON-RPC 2.0](http://www.jsonrpc.org/specification), and REST-like http. There is also javascript bindings available in the [burrow-js](https://github.com/monax/burrow.js) library. +Burrow allows remote access to its functionality over http and websocket. It currently supports [JSON-RPC 2.0](http://www.jsonrpc.org/specification), and REST-like http. There is also javascript bindings available in the [burrow-js](https://github.com/hyperledger/burrow.js) library. ## TOC diff --git a/event/event_cache.go b/event/event_cache.go index 61c39e483..99dc4f3fa 100644 --- a/event/event_cache.go +++ b/event/event_cache.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/txs" ) var ( diff --git a/event/event_cache_test.go b/event/event_cache_test.go index 79846039e..bd1954f6a 100644 --- a/event/event_cache_test.go +++ b/event/event_cache_test.go @@ -23,7 +23,7 @@ import ( "sync" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/txs" "github.com/stretchr/testify/assert" ) diff --git a/event/events.go b/event/events.go index c59b30491..a198dc51a 100644 --- a/event/events.go +++ b/event/events.go @@ -21,9 +21,9 @@ import ( "fmt" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/txs" go_events "github.com/tendermint/go-events" tm_types "github.com/tendermint/tendermint/types" ) diff --git a/event/events_test.go b/event/events_test.go index 129bd54a5..a4dcf84cd 100644 --- a/event/events_test.go +++ b/event/events_test.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/txs" "github.com/stretchr/testify/assert" ) diff --git a/genesis/genesis.go b/genesis/genesis.go index 84b1a456c..4eb99cbbc 100644 --- a/genesis/genesis.go +++ b/genesis/genesis.go @@ -19,7 +19,7 @@ import ( "encoding/json" "time" - ptypes "github.com/monax/burrow/permission/types" + ptypes "github.com/hyperledger/burrow/permission/types" wire "github.com/tendermint/go-wire" ) diff --git a/genesis/make_genesis_file.go b/genesis/make_genesis_file.go index 4ff28c049..624b73d23 100644 --- a/genesis/make_genesis_file.go +++ b/genesis/make_genesis_file.go @@ -24,8 +24,8 @@ import ( "strconv" "time" - ptypes "github.com/monax/burrow/permission/types" - "github.com/monax/burrow/util" + ptypes "github.com/hyperledger/burrow/permission/types" + "github.com/hyperledger/burrow/util" "github.com/tendermint/go-crypto" wire "github.com/tendermint/go-wire" diff --git a/genesis/maker.go b/genesis/maker.go index 89ade705d..f30ef3cbd 100644 --- a/genesis/maker.go +++ b/genesis/maker.go @@ -17,7 +17,7 @@ package genesis import ( "fmt" - ptypes "github.com/monax/burrow/permission/types" + ptypes "github.com/hyperledger/burrow/permission/types" "github.com/tendermint/go-crypto" ) diff --git a/genesis/types.go b/genesis/types.go index efa06b8d2..5f1d4ada0 100644 --- a/genesis/types.go +++ b/genesis/types.go @@ -19,7 +19,7 @@ import ( "os" "time" - ptypes "github.com/monax/burrow/permission/types" + ptypes "github.com/hyperledger/burrow/permission/types" "github.com/tendermint/go-crypto" "github.com/tendermint/go-wire" diff --git a/glide.yaml b/glide.yaml index 507eaf122..aa29fb5b2 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/monax/burrow +package: github.com/hyperledger/burrow import: - package: github.com/spf13/cobra - package: github.com/spf13/viper diff --git a/keys/key_client.go b/keys/key_client.go index b96fa35b0..184ca2f8c 100644 --- a/keys/key_client.go +++ b/keys/key_client.go @@ -18,8 +18,8 @@ import ( "encoding/hex" "fmt" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" ) type KeyClient interface { diff --git a/keys/key_client_util.go b/keys/key_client_util.go index 0777d7a1f..6046945aa 100644 --- a/keys/key_client_util.go +++ b/keys/key_client_util.go @@ -21,8 +21,8 @@ import ( "io/ioutil" "net/http" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" ) // Monax-Keys server connects over http request-response structures diff --git a/keys/mock/key_client_mock.go b/keys/mock/key_client_mock.go index 7a3619d6f..291ec748e 100644 --- a/keys/mock/key_client_mock.go +++ b/keys/mock/key_client_mock.go @@ -19,7 +19,7 @@ import ( "encoding/hex" "fmt" - . "github.com/monax/burrow/keys" + . "github.com/hyperledger/burrow/keys" // NOTE: prior to building out /crypto, use // tendermint/go-crypto for the mock client diff --git a/logging/adapters/stdlib/capture.go b/logging/adapters/stdlib/capture.go index c338556ac..ceeaaf9a6 100644 --- a/logging/adapters/stdlib/capture.go +++ b/logging/adapters/stdlib/capture.go @@ -19,7 +19,7 @@ import ( "log" kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/loggers" ) func Capture(stdLibLogger log.Logger, diff --git a/logging/adapters/tendermint_log15/capture.go b/logging/adapters/tendermint_log15/capture.go index f7bcfc960..f29ca76cd 100644 --- a/logging/adapters/tendermint_log15/capture.go +++ b/logging/adapters/tendermint_log15/capture.go @@ -16,7 +16,7 @@ package adapters import ( kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/loggers" "github.com/tendermint/log15" ) diff --git a/logging/adapters/tendermint_log15/convert.go b/logging/adapters/tendermint_log15/convert.go index 419548a27..a9a8e69a3 100644 --- a/logging/adapters/tendermint_log15/convert.go +++ b/logging/adapters/tendermint_log15/convert.go @@ -18,9 +18,9 @@ import ( "time" "github.com/go-stack/stack" - "github.com/monax/burrow/logging/loggers" - "github.com/monax/burrow/logging/structure" - . "github.com/monax/burrow/util/slice" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/structure" + . "github.com/hyperledger/burrow/util/slice" "github.com/tendermint/log15" ) diff --git a/logging/convention.go b/logging/convention.go index 23d56ca1f..fdd09f7fa 100644 --- a/logging/convention.go +++ b/logging/convention.go @@ -16,9 +16,9 @@ package logging import ( kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/loggers" - "github.com/monax/burrow/logging/structure" - "github.com/monax/burrow/util/slice" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/structure" + "github.com/hyperledger/burrow/util/slice" ) // Helper functions for InfoTraceLoggers, sort of extension methods to loggers diff --git a/logging/lifecycle/lifecycle.go b/logging/lifecycle/lifecycle.go index 7f1b0e32e..4a5e1235d 100644 --- a/logging/lifecycle/lifecycle.go +++ b/logging/lifecycle/lifecycle.go @@ -20,11 +20,11 @@ import ( "time" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/adapters/stdlib" - tmLog15adapter "github.com/monax/burrow/logging/adapters/tendermint_log15" - "github.com/monax/burrow/logging/loggers" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/adapters/stdlib" + tmLog15adapter "github.com/hyperledger/burrow/logging/adapters/tendermint_log15" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/structure" kitlog "github.com/go-kit/kit/log" "github.com/streadway/simpleuuid" diff --git a/logging/loggers/eris_format_logger.go b/logging/loggers/eris_format_logger.go index d9347a2b1..e9d65d3c8 100644 --- a/logging/loggers/eris_format_logger.go +++ b/logging/loggers/eris_format_logger.go @@ -17,7 +17,7 @@ package loggers import ( "fmt" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/structure" kitlog "github.com/go-kit/kit/log" ) diff --git a/logging/loggers/info_trace_logger.go b/logging/loggers/info_trace_logger.go index c937bd9e0..02016a3e4 100644 --- a/logging/loggers/info_trace_logger.go +++ b/logging/loggers/info_trace_logger.go @@ -16,7 +16,7 @@ package loggers import ( kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/structure" ) const ( diff --git a/logging/loggers/multiple_channel_logger.go b/logging/loggers/multiple_channel_logger.go index 5d04ce3eb..7e43d93db 100644 --- a/logging/loggers/multiple_channel_logger.go +++ b/logging/loggers/multiple_channel_logger.go @@ -18,7 +18,7 @@ import ( "fmt" kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/structure" ) // This represents a 'SELECT ONE' type logger. When logged to it will search diff --git a/logging/loggers/multiple_channel_logger_test.go b/logging/loggers/multiple_channel_logger_test.go index 107ce8e43..237729d8e 100644 --- a/logging/loggers/multiple_channel_logger_test.go +++ b/logging/loggers/multiple_channel_logger_test.go @@ -20,7 +20,7 @@ import ( "time" kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/structure" "github.com/stretchr/testify/assert" ) diff --git a/logging/loggers/vector_valued_logger.go b/logging/loggers/vector_valued_logger.go index dd521e109..c952aaf65 100644 --- a/logging/loggers/vector_valued_logger.go +++ b/logging/loggers/vector_valued_logger.go @@ -16,7 +16,7 @@ package loggers import ( kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/structure" ) // Treat duplicate key-values as consecutive entries in a vector-valued lookup diff --git a/logging/loggers/vector_valued_logger_test.go b/logging/loggers/vector_valued_logger_test.go index e4d181235..a9e66ffc1 100644 --- a/logging/loggers/vector_valued_logger_test.go +++ b/logging/loggers/vector_valued_logger_test.go @@ -17,7 +17,7 @@ package loggers import ( "testing" - . "github.com/monax/burrow/util/slice" + . "github.com/hyperledger/burrow/util/slice" "github.com/stretchr/testify/assert" ) diff --git a/logging/metadata.go b/logging/metadata.go index c1c7d71cc..846adf52b 100644 --- a/logging/metadata.go +++ b/logging/metadata.go @@ -19,8 +19,8 @@ import ( kitlog "github.com/go-kit/kit/log" "github.com/go-stack/stack" - "github.com/monax/burrow/logging/loggers" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/structure" ) const ( diff --git a/logging/structure/structure.go b/logging/structure/structure.go index d1eab959a..39ea04ae7 100644 --- a/logging/structure/structure.go +++ b/logging/structure/structure.go @@ -17,7 +17,7 @@ package structure import ( "reflect" - . "github.com/monax/burrow/util/slice" + . "github.com/hyperledger/burrow/util/slice" ) const ( diff --git a/logging/structure/structure_test.go b/logging/structure/structure_test.go index c3b4e68f7..29252df91 100644 --- a/logging/structure/structure_test.go +++ b/logging/structure/structure_test.go @@ -17,7 +17,7 @@ package structure import ( "testing" - . "github.com/monax/burrow/util/slice" + . "github.com/hyperledger/burrow/util/slice" "github.com/stretchr/testify/assert" ) diff --git a/logging/terminal.go b/logging/terminal.go index de4180fbd..156f602d7 100644 --- a/logging/terminal.go +++ b/logging/terminal.go @@ -16,7 +16,7 @@ package logging import ( "github.com/go-kit/kit/log/term" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/structure" ) func Colors(keyvals ...interface{}) term.FgBgColor { diff --git a/manager/burrow-mint/accounts.go b/manager/burrow-mint/accounts.go index 035586ee1..1443a653e 100644 --- a/manager/burrow-mint/accounts.go +++ b/manager/burrow-mint/accounts.go @@ -23,11 +23,11 @@ import ( "fmt" "sync" - account "github.com/monax/burrow/account" - core_types "github.com/monax/burrow/core/types" - definitions "github.com/monax/burrow/definitions" - event "github.com/monax/burrow/event" - word256 "github.com/monax/burrow/word256" + account "github.com/hyperledger/burrow/account" + core_types "github.com/hyperledger/burrow/core/types" + definitions "github.com/hyperledger/burrow/definitions" + event "github.com/hyperledger/burrow/event" + word256 "github.com/hyperledger/burrow/word256" ) // NOTE [ben] Compiler check to ensure Accounts successfully implements diff --git a/manager/burrow-mint/burrow-mint.go b/manager/burrow-mint/burrow-mint.go index c75486a46..92219def5 100644 --- a/manager/burrow-mint/burrow-mint.go +++ b/manager/burrow-mint/burrow-mint.go @@ -24,12 +24,12 @@ import ( tendermint_events "github.com/tendermint/go-events" wire "github.com/tendermint/go-wire" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" - sm "github.com/monax/burrow/manager/burrow-mint/state" - manager_types "github.com/monax/burrow/manager/types" - "github.com/monax/burrow/txs" + sm "github.com/hyperledger/burrow/manager/burrow-mint/state" + manager_types "github.com/hyperledger/burrow/manager/types" + "github.com/hyperledger/burrow/txs" ) //-------------------------------------------------------------------------------- diff --git a/manager/burrow-mint/evm/fake_app_state.go b/manager/burrow-mint/evm/fake_app_state.go index 828acd2f8..c9b1e7474 100644 --- a/manager/burrow-mint/evm/fake_app_state.go +++ b/manager/burrow-mint/evm/fake_app_state.go @@ -17,8 +17,8 @@ package vm import ( "fmt" - "github.com/monax/burrow/manager/burrow-mint/evm/sha3" - . "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/manager/burrow-mint/evm/sha3" + . "github.com/hyperledger/burrow/word256" ) type FakeAppState struct { diff --git a/manager/burrow-mint/evm/log_event_test.go b/manager/burrow-mint/evm/log_event_test.go index e576c338b..91431adc7 100644 --- a/manager/burrow-mint/evm/log_event_test.go +++ b/manager/burrow-mint/evm/log_event_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - . "github.com/monax/burrow/manager/burrow-mint/evm/opcodes" - "github.com/monax/burrow/txs" - . "github.com/monax/burrow/word256" + . "github.com/hyperledger/burrow/manager/burrow-mint/evm/opcodes" + "github.com/hyperledger/burrow/txs" + . "github.com/hyperledger/burrow/word256" "github.com/tendermint/go-events" ) diff --git a/manager/burrow-mint/evm/native.go b/manager/burrow-mint/evm/native.go index 3d788e5e4..ab4e32074 100644 --- a/manager/burrow-mint/evm/native.go +++ b/manager/burrow-mint/evm/native.go @@ -17,7 +17,7 @@ package vm import ( "crypto/sha256" - . "github.com/monax/burrow/word256" + . "github.com/hyperledger/burrow/word256" "golang.org/x/crypto/ripemd160" ) diff --git a/manager/burrow-mint/evm/opcodes/opcodes.go b/manager/burrow-mint/evm/opcodes/opcodes.go index 02a0441ea..d633b5e5f 100644 --- a/manager/burrow-mint/evm/opcodes/opcodes.go +++ b/manager/burrow-mint/evm/opcodes/opcodes.go @@ -17,7 +17,7 @@ package opcodes import ( "fmt" - "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/word256" "gopkg.in/fatih/set.v0" ) diff --git a/manager/burrow-mint/evm/snative.go b/manager/burrow-mint/evm/snative.go index 7becc6141..37e1031c3 100644 --- a/manager/burrow-mint/evm/snative.go +++ b/manager/burrow-mint/evm/snative.go @@ -17,14 +17,14 @@ package vm import ( "fmt" - "github.com/monax/burrow/common/sanity" - "github.com/monax/burrow/manager/burrow-mint/evm/sha3" - ptypes "github.com/monax/burrow/permission/types" - . "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/common/sanity" + "github.com/hyperledger/burrow/manager/burrow-mint/evm/sha3" + ptypes "github.com/hyperledger/burrow/permission/types" + . "github.com/hyperledger/burrow/word256" "strings" - "github.com/monax/burrow/manager/burrow-mint/evm/abi" + "github.com/hyperledger/burrow/manager/burrow-mint/evm/abi" ) // diff --git a/manager/burrow-mint/evm/snative_test.go b/manager/burrow-mint/evm/snative_test.go index bc119e577..18006ad65 100644 --- a/manager/burrow-mint/evm/snative_test.go +++ b/manager/burrow-mint/evm/snative_test.go @@ -20,11 +20,11 @@ import ( "strings" - "github.com/monax/burrow/manager/burrow-mint/evm/abi" - . "github.com/monax/burrow/manager/burrow-mint/evm/opcodes" - "github.com/monax/burrow/manager/burrow-mint/evm/sha3" - ptypes "github.com/monax/burrow/permission/types" - . "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/manager/burrow-mint/evm/abi" + . "github.com/hyperledger/burrow/manager/burrow-mint/evm/opcodes" + "github.com/hyperledger/burrow/manager/burrow-mint/evm/sha3" + ptypes "github.com/hyperledger/burrow/permission/types" + . "github.com/hyperledger/burrow/word256" "github.com/stretchr/testify/assert" ) diff --git a/manager/burrow-mint/evm/stack.go b/manager/burrow-mint/evm/stack.go index 471ff5792..e383be25d 100644 --- a/manager/burrow-mint/evm/stack.go +++ b/manager/burrow-mint/evm/stack.go @@ -17,9 +17,9 @@ package vm import ( "fmt" - "github.com/monax/burrow/common/math/integral" - "github.com/monax/burrow/common/sanity" - . "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/common/math/integral" + "github.com/hyperledger/burrow/common/sanity" + . "github.com/hyperledger/burrow/word256" ) // Not goroutine safe diff --git a/manager/burrow-mint/evm/types.go b/manager/burrow-mint/evm/types.go index 3dfc2b9bc..f083812e5 100644 --- a/manager/burrow-mint/evm/types.go +++ b/manager/burrow-mint/evm/types.go @@ -17,8 +17,8 @@ package vm import ( "fmt" - ptypes "github.com/monax/burrow/permission/types" - . "github.com/monax/burrow/word256" + ptypes "github.com/hyperledger/burrow/permission/types" + . "github.com/hyperledger/burrow/word256" ) const ( diff --git a/manager/burrow-mint/evm/vm.go b/manager/burrow-mint/evm/vm.go index cc1bce4ce..d2c6e88d2 100644 --- a/manager/burrow-mint/evm/vm.go +++ b/manager/burrow-mint/evm/vm.go @@ -20,13 +20,13 @@ import ( "fmt" "math/big" - "github.com/monax/burrow/common/math/integral" - "github.com/monax/burrow/common/sanity" - . "github.com/monax/burrow/manager/burrow-mint/evm/opcodes" - "github.com/monax/burrow/manager/burrow-mint/evm/sha3" - ptypes "github.com/monax/burrow/permission/types" - "github.com/monax/burrow/txs" - . "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/common/math/integral" + "github.com/hyperledger/burrow/common/sanity" + . "github.com/hyperledger/burrow/manager/burrow-mint/evm/opcodes" + "github.com/hyperledger/burrow/manager/burrow-mint/evm/sha3" + ptypes "github.com/hyperledger/burrow/permission/types" + "github.com/hyperledger/burrow/txs" + . "github.com/hyperledger/burrow/word256" "github.com/tendermint/go-events" ) diff --git a/manager/burrow-mint/evm/vm_test.go b/manager/burrow-mint/evm/vm_test.go index a954115cb..dc316ec68 100644 --- a/manager/burrow-mint/evm/vm_test.go +++ b/manager/burrow-mint/evm/vm_test.go @@ -24,10 +24,10 @@ import ( "errors" - . "github.com/monax/burrow/manager/burrow-mint/evm/opcodes" - ptypes "github.com/monax/burrow/permission/types" - "github.com/monax/burrow/txs" - . "github.com/monax/burrow/word256" + . "github.com/hyperledger/burrow/manager/burrow-mint/evm/opcodes" + ptypes "github.com/hyperledger/burrow/permission/types" + "github.com/hyperledger/burrow/txs" + . "github.com/hyperledger/burrow/word256" "github.com/stretchr/testify/assert" "github.com/tendermint/go-events" ) diff --git a/manager/burrow-mint/namereg.go b/manager/burrow-mint/namereg.go index 3de4ed603..3deedd44e 100644 --- a/manager/burrow-mint/namereg.go +++ b/manager/burrow-mint/namereg.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - sm "github.com/monax/burrow/manager/burrow-mint/state" + sm "github.com/hyperledger/burrow/manager/burrow-mint/state" - core_types "github.com/monax/burrow/core/types" - event "github.com/monax/burrow/event" + core_types "github.com/hyperledger/burrow/core/types" + event "github.com/hyperledger/burrow/event" ) // NameReg is part of the pipe for BurrowMint and provides the implementation diff --git a/manager/burrow-mint/pipe.go b/manager/burrow-mint/pipe.go index 0d7d7653c..ef3beb33e 100644 --- a/manager/burrow-mint/pipe.go +++ b/manager/burrow-mint/pipe.go @@ -25,23 +25,23 @@ import ( wire "github.com/tendermint/go-wire" tm_types "github.com/tendermint/tendermint/types" - "github.com/monax/burrow/account" - blockchain_types "github.com/monax/burrow/blockchain/types" - imath "github.com/monax/burrow/common/math/integral" - "github.com/monax/burrow/config" - consensus_types "github.com/monax/burrow/consensus/types" - core_types "github.com/monax/burrow/core/types" - "github.com/monax/burrow/definitions" - edb_event "github.com/monax/burrow/event" - genesis "github.com/monax/burrow/genesis" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" - vm "github.com/monax/burrow/manager/burrow-mint/evm" - "github.com/monax/burrow/manager/burrow-mint/state" - manager_types "github.com/monax/burrow/manager/types" - rpc_tm_types "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/txs" - "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/account" + blockchain_types "github.com/hyperledger/burrow/blockchain/types" + imath "github.com/hyperledger/burrow/common/math/integral" + "github.com/hyperledger/burrow/config" + consensus_types "github.com/hyperledger/burrow/consensus/types" + core_types "github.com/hyperledger/burrow/core/types" + "github.com/hyperledger/burrow/definitions" + edb_event "github.com/hyperledger/burrow/event" + genesis "github.com/hyperledger/burrow/genesis" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" + vm "github.com/hyperledger/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/manager/burrow-mint/state" + manager_types "github.com/hyperledger/burrow/manager/types" + rpc_tm_types "github.com/hyperledger/burrow/rpc/tendermint/core/types" + "github.com/hyperledger/burrow/txs" + "github.com/hyperledger/burrow/word256" ) type burrowMintPipe struct { diff --git a/manager/burrow-mint/state/block_cache.go b/manager/burrow-mint/state/block_cache.go index e2e8e61dc..3ba8a4564 100644 --- a/manager/burrow-mint/state/block_cache.go +++ b/manager/burrow-mint/state/block_cache.go @@ -19,10 +19,10 @@ import ( "fmt" "sort" - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/common/sanity" - core_types "github.com/monax/burrow/core/types" - . "github.com/monax/burrow/word256" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/common/sanity" + core_types "github.com/hyperledger/burrow/core/types" + . "github.com/hyperledger/burrow/word256" dbm "github.com/tendermint/go-db" "github.com/tendermint/go-merkle" diff --git a/manager/burrow-mint/state/common.go b/manager/burrow-mint/state/common.go index b5b29b0fe..37cf6ca18 100644 --- a/manager/burrow-mint/state/common.go +++ b/manager/burrow-mint/state/common.go @@ -15,9 +15,9 @@ package state import ( - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/manager/burrow-mint/evm" - . "github.com/monax/burrow/word256" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" + . "github.com/hyperledger/burrow/word256" ) type AccountGetter interface { diff --git a/manager/burrow-mint/state/execution.go b/manager/burrow-mint/state/execution.go index cdb6ea228..0302a4da4 100644 --- a/manager/burrow-mint/state/execution.go +++ b/manager/burrow-mint/state/execution.go @@ -19,13 +19,13 @@ import ( "errors" "fmt" - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/common/sanity" - core_types "github.com/monax/burrow/core/types" - "github.com/monax/burrow/manager/burrow-mint/evm" - ptypes "github.com/monax/burrow/permission/types" // for GlobalPermissionAddress ... - "github.com/monax/burrow/txs" - . "github.com/monax/burrow/word256" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/common/sanity" + core_types "github.com/hyperledger/burrow/core/types" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" + ptypes "github.com/hyperledger/burrow/permission/types" // for GlobalPermissionAddress ... + "github.com/hyperledger/burrow/txs" + . "github.com/hyperledger/burrow/word256" "github.com/tendermint/go-events" ) diff --git a/manager/burrow-mint/state/genesis_test.go b/manager/burrow-mint/state/genesis_test.go index 3c5a60f35..d699bc623 100644 --- a/manager/burrow-mint/state/genesis_test.go +++ b/manager/burrow-mint/state/genesis_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/common/random" - genesis "github.com/monax/burrow/genesis" - ptypes "github.com/monax/burrow/permission/types" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/common/random" + genesis "github.com/hyperledger/burrow/genesis" + ptypes "github.com/hyperledger/burrow/permission/types" tdb "github.com/tendermint/go-db" "github.com/tendermint/tendermint/types" diff --git a/manager/burrow-mint/state/permissions_test.go b/manager/burrow-mint/state/permissions_test.go index 92dff5fa1..51d52e4e4 100644 --- a/manager/burrow-mint/state/permissions_test.go +++ b/manager/burrow-mint/state/permissions_test.go @@ -21,13 +21,13 @@ import ( "testing" "time" - acm "github.com/monax/burrow/account" - genesis "github.com/monax/burrow/genesis" - "github.com/monax/burrow/manager/burrow-mint/evm" - . "github.com/monax/burrow/manager/burrow-mint/evm/opcodes" - ptypes "github.com/monax/burrow/permission/types" - "github.com/monax/burrow/txs" - . "github.com/monax/burrow/word256" + acm "github.com/hyperledger/burrow/account" + genesis "github.com/hyperledger/burrow/genesis" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" + . "github.com/hyperledger/burrow/manager/burrow-mint/evm/opcodes" + ptypes "github.com/hyperledger/burrow/permission/types" + "github.com/hyperledger/burrow/txs" + . "github.com/hyperledger/burrow/word256" "github.com/tendermint/go-crypto" dbm "github.com/tendermint/go-db" diff --git a/manager/burrow-mint/state/state.go b/manager/burrow-mint/state/state.go index 3b925be53..ccf68bf34 100644 --- a/manager/burrow-mint/state/state.go +++ b/manager/burrow-mint/state/state.go @@ -21,18 +21,18 @@ import ( "io/ioutil" "time" - acm "github.com/monax/burrow/account" - genesis "github.com/monax/burrow/genesis" - ptypes "github.com/monax/burrow/permission/types" - "github.com/monax/burrow/txs" + acm "github.com/hyperledger/burrow/account" + genesis "github.com/hyperledger/burrow/genesis" + ptypes "github.com/hyperledger/burrow/permission/types" + "github.com/hyperledger/burrow/txs" dbm "github.com/tendermint/go-db" "github.com/tendermint/go-events" "github.com/tendermint/go-merkle" "github.com/tendermint/go-wire" - core_types "github.com/monax/burrow/core/types" - "github.com/monax/burrow/util" + core_types "github.com/hyperledger/burrow/core/types" + "github.com/hyperledger/burrow/util" "github.com/tendermint/tendermint/types" ) diff --git a/manager/burrow-mint/state/state_test.go b/manager/burrow-mint/state/state_test.go index 72b23255a..7c13e2f7e 100644 --- a/manager/burrow-mint/state/state_test.go +++ b/manager/burrow-mint/state/state_test.go @@ -19,10 +19,10 @@ import ( "encoding/hex" "testing" - core_types "github.com/monax/burrow/core/types" - evm "github.com/monax/burrow/manager/burrow-mint/evm" - "github.com/monax/burrow/txs" - "github.com/monax/burrow/word256" + core_types "github.com/hyperledger/burrow/core/types" + evm "github.com/hyperledger/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/txs" + "github.com/hyperledger/burrow/word256" "github.com/tendermint/tendermint/config/tendermint_test" ) diff --git a/manager/burrow-mint/state/tx_cache.go b/manager/burrow-mint/state/tx_cache.go index 43a383032..d892f46e5 100644 --- a/manager/burrow-mint/state/tx_cache.go +++ b/manager/burrow-mint/state/tx_cache.go @@ -17,12 +17,12 @@ package state import ( "fmt" - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/common/sanity" - "github.com/monax/burrow/manager/burrow-mint/evm" - ptypes "github.com/monax/burrow/permission/types" // for GlobalPermissionAddress ... - "github.com/monax/burrow/txs" - . "github.com/monax/burrow/word256" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/common/sanity" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" + ptypes "github.com/hyperledger/burrow/permission/types" // for GlobalPermissionAddress ... + "github.com/hyperledger/burrow/txs" + . "github.com/hyperledger/burrow/word256" "github.com/tendermint/go-crypto" ) diff --git a/manager/burrow-mint/transactor.go b/manager/burrow-mint/transactor.go index 0faa9bd8d..f368f79cf 100644 --- a/manager/burrow-mint/transactor.go +++ b/manager/burrow-mint/transactor.go @@ -21,13 +21,13 @@ import ( "sync" "time" - "github.com/monax/burrow/account" - core_types "github.com/monax/burrow/core/types" - event "github.com/monax/burrow/event" - "github.com/monax/burrow/manager/burrow-mint/evm" - "github.com/monax/burrow/manager/burrow-mint/state" - "github.com/monax/burrow/txs" - "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/account" + core_types "github.com/hyperledger/burrow/core/types" + event "github.com/hyperledger/burrow/event" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/manager/burrow-mint/state" + "github.com/hyperledger/burrow/txs" + "github.com/hyperledger/burrow/word256" "github.com/tendermint/go-crypto" tEvents "github.com/tendermint/go-events" diff --git a/manager/burrow-mint/version.go b/manager/burrow-mint/version.go index d41300fae..93d7a36e9 100644 --- a/manager/burrow-mint/version.go +++ b/manager/burrow-mint/version.go @@ -17,7 +17,7 @@ package burrowmint import ( "fmt" - version "github.com/monax/burrow/version" + version "github.com/hyperledger/burrow/version" ) const ( diff --git a/manager/config.go b/manager/config.go index 41d33712c..27d809795 100644 --- a/manager/config.go +++ b/manager/config.go @@ -15,7 +15,7 @@ package manager import ( - burrowmint "github.com/monax/burrow/manager/burrow-mint" + burrowmint "github.com/hyperledger/burrow/manager/burrow-mint" ) //------------------------------------------------------------------------------ diff --git a/manager/manager.go b/manager/manager.go index d014a1efc..4ec72bd6d 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -19,13 +19,13 @@ import ( events "github.com/tendermint/go-events" - config "github.com/monax/burrow/config" - definitions "github.com/monax/burrow/definitions" - burrowmint "github.com/monax/burrow/manager/burrow-mint" - // types "github.com/monax/burrow/manager/types" + config "github.com/hyperledger/burrow/config" + definitions "github.com/hyperledger/burrow/definitions" + burrowmint "github.com/hyperledger/burrow/manager/burrow-mint" + // types "github.com/hyperledger/burrow/manager/types" - "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging" + "github.com/hyperledger/burrow/logging/loggers" ) // NewApplicationPipe returns an initialised Pipe interface diff --git a/permission/types/permissions.go b/permission/types/permissions.go index 0fd472bbf..c414a85df 100644 --- a/permission/types/permissions.go +++ b/permission/types/permissions.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/monax/burrow/word256" + "github.com/hyperledger/burrow/word256" ) //------------------------------------------------------------------------------------------------ diff --git a/rpc/tendermint/client/client.go b/rpc/tendermint/client/client.go index 8195d58e4..d8ca98009 100644 --- a/rpc/tendermint/client/client.go +++ b/rpc/tendermint/client/client.go @@ -18,10 +18,10 @@ import ( "errors" "fmt" - acm "github.com/monax/burrow/account" - core_types "github.com/monax/burrow/core/types" - rpc_types "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/txs" + acm "github.com/hyperledger/burrow/account" + core_types "github.com/hyperledger/burrow/core/types" + rpc_types "github.com/hyperledger/burrow/rpc/tendermint/core/types" + "github.com/hyperledger/burrow/txs" rpcclient "github.com/tendermint/go-rpc/client" "github.com/tendermint/go-wire" ) diff --git a/rpc/tendermint/core/routes.go b/rpc/tendermint/core/routes.go index e3d010b30..83573742e 100644 --- a/rpc/tendermint/core/routes.go +++ b/rpc/tendermint/core/routes.go @@ -17,10 +17,10 @@ package core import ( "fmt" - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/definitions" - ctypes "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/txs" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/definitions" + ctypes "github.com/hyperledger/burrow/rpc/tendermint/core/types" + "github.com/hyperledger/burrow/txs" rpc "github.com/tendermint/go-rpc/server" rpctypes "github.com/tendermint/go-rpc/types" ) diff --git a/rpc/tendermint/core/types/responses.go b/rpc/tendermint/core/types/responses.go index 180e278a8..33b46d426 100644 --- a/rpc/tendermint/core/types/responses.go +++ b/rpc/tendermint/core/types/responses.go @@ -15,13 +15,13 @@ package types import ( - acm "github.com/monax/burrow/account" - core_types "github.com/monax/burrow/core/types" - genesis "github.com/monax/burrow/genesis" - "github.com/monax/burrow/txs" + acm "github.com/hyperledger/burrow/account" + core_types "github.com/hyperledger/burrow/core/types" + genesis "github.com/hyperledger/burrow/genesis" + "github.com/hyperledger/burrow/txs" tendermint_types "github.com/tendermint/tendermint/types" - consensus_types "github.com/monax/burrow/consensus/types" + consensus_types "github.com/hyperledger/burrow/consensus/types" abcitypes "github.com/tendermint/abci/types" "github.com/tendermint/go-crypto" "github.com/tendermint/go-p2p" diff --git a/rpc/tendermint/core/types/responses_test.go b/rpc/tendermint/core/types/responses_test.go index 616e71d0b..c745017c8 100644 --- a/rpc/tendermint/core/types/responses_test.go +++ b/rpc/tendermint/core/types/responses_test.go @@ -19,7 +19,7 @@ import ( "time" - consensus_types "github.com/monax/burrow/consensus/types" + consensus_types "github.com/hyperledger/burrow/consensus/types" "github.com/tendermint/go-wire" tendermint_types "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/types/responses_util.go b/rpc/tendermint/core/types/responses_util.go index a4eb9483f..cd3e15e8c 100644 --- a/rpc/tendermint/core/types/responses_util.go +++ b/rpc/tendermint/core/types/responses_util.go @@ -15,7 +15,7 @@ package types import ( - "github.com/monax/burrow/core/types" + "github.com/hyperledger/burrow/core/types" ) // UnwrapResultDumpStorage does a deep copy to remove /rpc/tendermint/core/types diff --git a/rpc/tendermint/core/websocket.go b/rpc/tendermint/core/websocket.go index 5ae99ad7d..2a4feffe1 100644 --- a/rpc/tendermint/core/websocket.go +++ b/rpc/tendermint/core/websocket.go @@ -23,8 +23,8 @@ import ( events "github.com/tendermint/go-events" rpcserver "github.com/tendermint/go-rpc/server" - definitions "github.com/monax/burrow/definitions" - server "github.com/monax/burrow/server" + definitions "github.com/hyperledger/burrow/definitions" + server "github.com/hyperledger/burrow/server" ) type TendermintWebsocketServer struct { diff --git a/rpc/tendermint/test/common.go b/rpc/tendermint/test/common.go index 523f3688a..ff618906c 100644 --- a/rpc/tendermint/test/common.go +++ b/rpc/tendermint/test/common.go @@ -18,9 +18,9 @@ package test import ( "fmt" - vm "github.com/monax/burrow/manager/burrow-mint/evm" - rpc_core "github.com/monax/burrow/rpc/tendermint/core" - "github.com/monax/burrow/test/fixtures" + vm "github.com/hyperledger/burrow/manager/burrow-mint/evm" + rpc_core "github.com/hyperledger/burrow/rpc/tendermint/core" + "github.com/hyperledger/burrow/test/fixtures" ) // Needs to be referenced by a *_test.go file to be picked up diff --git a/rpc/tendermint/test/rpc_client_test.go b/rpc/tendermint/test/rpc_client_test.go index 7f44a39e7..fc554ae9a 100644 --- a/rpc/tendermint/test/rpc_client_test.go +++ b/rpc/tendermint/test/rpc_client_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - consensus_types "github.com/monax/burrow/consensus/types" - edbcli "github.com/monax/burrow/rpc/tendermint/client" - "github.com/monax/burrow/txs" - "github.com/monax/burrow/word256" + consensus_types "github.com/hyperledger/burrow/consensus/types" + edbcli "github.com/hyperledger/burrow/rpc/tendermint/client" + "github.com/hyperledger/burrow/txs" + "github.com/hyperledger/burrow/word256" "github.com/stretchr/testify/assert" rpcclient "github.com/tendermint/go-rpc/client" diff --git a/rpc/tendermint/test/runner/main.go b/rpc/tendermint/test/runner/main.go index 903911d36..e17ee5b81 100644 --- a/rpc/tendermint/test/runner/main.go +++ b/rpc/tendermint/test/runner/main.go @@ -20,8 +20,8 @@ package main import ( "fmt" - rpctest "github.com/monax/burrow/rpc/tendermint/test" - "github.com/monax/burrow/util" + rpctest "github.com/hyperledger/burrow/rpc/tendermint/test" + "github.com/hyperledger/burrow/util" ) func main() { diff --git a/rpc/tendermint/test/shared.go b/rpc/tendermint/test/shared.go index c28a9eaa6..40cc976d4 100644 --- a/rpc/tendermint/test/shared.go +++ b/rpc/tendermint/test/shared.go @@ -21,19 +21,19 @@ import ( "strconv" "testing" - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/core" - core_types "github.com/monax/burrow/core/types" - "github.com/monax/burrow/logging/lifecycle" - edbcli "github.com/monax/burrow/rpc/tendermint/client" - rpc_core "github.com/monax/burrow/rpc/tendermint/core" - rpc_types "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/server" - "github.com/monax/burrow/test/fixtures" - "github.com/monax/burrow/txs" - "github.com/monax/burrow/word256" - - genesis "github.com/monax/burrow/genesis" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/core" + core_types "github.com/hyperledger/burrow/core/types" + "github.com/hyperledger/burrow/logging/lifecycle" + edbcli "github.com/hyperledger/burrow/rpc/tendermint/client" + rpc_core "github.com/hyperledger/burrow/rpc/tendermint/core" + rpc_types "github.com/hyperledger/burrow/rpc/tendermint/core/types" + "github.com/hyperledger/burrow/server" + "github.com/hyperledger/burrow/test/fixtures" + "github.com/hyperledger/burrow/txs" + "github.com/hyperledger/burrow/word256" + + genesis "github.com/hyperledger/burrow/genesis" "github.com/spf13/viper" "github.com/tendermint/go-crypto" rpcclient "github.com/tendermint/go-rpc/client" diff --git a/rpc/tendermint/test/websocket_client_test.go b/rpc/tendermint/test/websocket_client_test.go index 9a3cc1f16..046f13ea4 100644 --- a/rpc/tendermint/test/websocket_client_test.go +++ b/rpc/tendermint/test/websocket_client_test.go @@ -23,8 +23,8 @@ import ( "time" - core_types "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/txs" + core_types "github.com/hyperledger/burrow/rpc/tendermint/core/types" + "github.com/hyperledger/burrow/txs" "github.com/stretchr/testify/assert" _ "github.com/tendermint/tendermint/config/tendermint_test" ) diff --git a/rpc/tendermint/test/websocket_helpers.go b/rpc/tendermint/test/websocket_helpers.go index ff219c828..6cb6a2a4f 100644 --- a/rpc/tendermint/test/websocket_helpers.go +++ b/rpc/tendermint/test/websocket_helpers.go @@ -20,11 +20,11 @@ import ( "testing" "time" - ctypes "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/txs" + ctypes "github.com/hyperledger/burrow/rpc/tendermint/core/types" + "github.com/hyperledger/burrow/txs" tm_types "github.com/tendermint/tendermint/types" - edbcli "github.com/monax/burrow/rpc/tendermint/client" + edbcli "github.com/hyperledger/burrow/rpc/tendermint/client" rpcclient "github.com/tendermint/go-rpc/client" "github.com/tendermint/go-wire" ) diff --git a/rpc/v0/codec.go b/rpc/v0/codec.go index c26d19ee4..58bb9ca7f 100644 --- a/rpc/v0/codec.go +++ b/rpc/v0/codec.go @@ -18,9 +18,9 @@ import ( "io" "io/ioutil" - rpc "github.com/monax/burrow/rpc" - wire "github.com/tendermint/go-wire" + + rpc "github.com/hyperledger/burrow/rpc" ) // Codec that uses tendermints 'binary' package for JSON. diff --git a/rpc/v0/json_service.go b/rpc/v0/json_service.go index 98f841ede..c04120714 100644 --- a/rpc/v0/json_service.go +++ b/rpc/v0/json_service.go @@ -18,10 +18,10 @@ import ( "encoding/json" "net/http" - definitions "github.com/monax/burrow/definitions" - event "github.com/monax/burrow/event" - rpc "github.com/monax/burrow/rpc" - server "github.com/monax/burrow/server" + definitions "github.com/hyperledger/burrow/definitions" + event "github.com/hyperledger/burrow/event" + rpc "github.com/hyperledger/burrow/rpc" + server "github.com/hyperledger/burrow/server" "github.com/gin-gonic/gin" ) diff --git a/rpc/v0/json_service_data_test.go b/rpc/v0/json_service_data_test.go index 258226470..bd809698d 100644 --- a/rpc/v0/json_service_data_test.go +++ b/rpc/v0/json_service_data_test.go @@ -18,8 +18,8 @@ import ( "encoding/json" "testing" - "github.com/monax/burrow/rpc" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/rpc" + "github.com/hyperledger/burrow/txs" "github.com/stretchr/testify/assert" ) diff --git a/rpc/v0/json_service_test.go b/rpc/v0/json_service_test.go index 26c7cca45..5428f94a7 100644 --- a/rpc/v0/json_service_test.go +++ b/rpc/v0/json_service_test.go @@ -17,10 +17,10 @@ package v0 import ( "testing" - "github.com/monax/burrow/account" - "github.com/monax/burrow/manager/burrow-mint/evm/opcodes" - "github.com/monax/burrow/rpc" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/manager/burrow-mint/evm/opcodes" + "github.com/hyperledger/burrow/rpc" + "github.com/hyperledger/burrow/txs" "github.com/stretchr/testify/assert" "github.com/tendermint/go-wire" diff --git a/rpc/v0/methods.go b/rpc/v0/methods.go index 6f92b784d..6117dc24b 100644 --- a/rpc/v0/methods.go +++ b/rpc/v0/methods.go @@ -15,13 +15,13 @@ package v0 import ( - "github.com/monax/burrow/blockchain" - core_types "github.com/monax/burrow/core/types" - definitions "github.com/monax/burrow/definitions" - "github.com/monax/burrow/event" - "github.com/monax/burrow/rpc" - "github.com/monax/burrow/rpc/v0/shared" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/blockchain" + core_types "github.com/hyperledger/burrow/core/types" + definitions "github.com/hyperledger/burrow/definitions" + "github.com/hyperledger/burrow/event" + "github.com/hyperledger/burrow/rpc" + "github.com/hyperledger/burrow/rpc/v0/shared" + "github.com/hyperledger/burrow/txs" ) // TODO use the method name definition file. diff --git a/rpc/v0/params.go b/rpc/v0/params.go index f01bd6ff7..868fad767 100644 --- a/rpc/v0/params.go +++ b/rpc/v0/params.go @@ -15,9 +15,9 @@ package v0 import ( - "github.com/monax/burrow/account" - event "github.com/monax/burrow/event" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/account" + event "github.com/hyperledger/burrow/event" + "github.com/hyperledger/burrow/txs" ) type ( diff --git a/rpc/v0/rest_server.go b/rpc/v0/rest_server.go index 1d81e2d64..3f76af204 100644 --- a/rpc/v0/rest_server.go +++ b/rpc/v0/rest_server.go @@ -22,15 +22,15 @@ import ( "github.com/gin-gonic/gin" - "github.com/monax/burrow/blockchain" - core_types "github.com/monax/burrow/core/types" - definitions "github.com/monax/burrow/definitions" - event "github.com/monax/burrow/event" - "github.com/monax/burrow/rpc" - "github.com/monax/burrow/rpc/v0/shared" - server "github.com/monax/burrow/server" - "github.com/monax/burrow/txs" - "github.com/monax/burrow/util" + "github.com/hyperledger/burrow/blockchain" + core_types "github.com/hyperledger/burrow/core/types" + definitions "github.com/hyperledger/burrow/definitions" + event "github.com/hyperledger/burrow/event" + "github.com/hyperledger/burrow/rpc" + "github.com/hyperledger/burrow/rpc/v0/shared" + server "github.com/hyperledger/burrow/server" + "github.com/hyperledger/burrow/txs" + "github.com/hyperledger/burrow/util" ) // Provides a REST-like web-api. Implements server.Server diff --git a/rpc/v0/rest_server_data_test.go b/rpc/v0/rest_server_data_test.go index bbd8b2462..5e0ad038d 100644 --- a/rpc/v0/rest_server_data_test.go +++ b/rpc/v0/rest_server_data_test.go @@ -15,14 +15,13 @@ package v0 import ( - account "github.com/monax/burrow/account" - consensus_types "github.com/monax/burrow/consensus/types" - core_types "github.com/monax/burrow/core/types" - event "github.com/monax/burrow/event" - genesis "github.com/monax/burrow/genesis" - "github.com/monax/burrow/rpc/v0/shared" - transaction "github.com/monax/burrow/txs" - + account "github.com/hyperledger/burrow/account" + consensus_types "github.com/hyperledger/burrow/consensus/types" + core_types "github.com/hyperledger/burrow/core/types" + event "github.com/hyperledger/burrow/event" + genesis "github.com/hyperledger/burrow/genesis" + "github.com/hyperledger/burrow/rpc/v0/shared" + transaction "github.com/hyperledger/burrow/txs" mintTypes "github.com/tendermint/tendermint/types" ) diff --git a/rpc/v0/rest_server_pipe_test.go b/rpc/v0/rest_server_pipe_test.go index be51ca8e3..52b186346 100644 --- a/rpc/v0/rest_server_pipe_test.go +++ b/rpc/v0/rest_server_pipe_test.go @@ -17,17 +17,17 @@ package v0 import ( "fmt" - account "github.com/monax/burrow/account" - core_types "github.com/monax/burrow/core/types" - definitions "github.com/monax/burrow/definitions" - event "github.com/monax/burrow/event" + account "github.com/hyperledger/burrow/account" + core_types "github.com/hyperledger/burrow/core/types" + definitions "github.com/hyperledger/burrow/definitions" + event "github.com/hyperledger/burrow/event" - blockchain_types "github.com/monax/burrow/blockchain/types" - consensus_types "github.com/monax/burrow/consensus/types" - manager_types "github.com/monax/burrow/manager/types" - "github.com/monax/burrow/txs" + blockchain_types "github.com/hyperledger/burrow/blockchain/types" + consensus_types "github.com/hyperledger/burrow/consensus/types" + manager_types "github.com/hyperledger/burrow/manager/types" + "github.com/hyperledger/burrow/txs" - "github.com/monax/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/loggers" abci_types "github.com/tendermint/abci/types" "github.com/tendermint/go-crypto" "github.com/tendermint/go-p2p" diff --git a/rpc/v0/rest_server_test.go b/rpc/v0/rest_server_test.go index 2b4328e68..b488bd25d 100644 --- a/rpc/v0/rest_server_test.go +++ b/rpc/v0/rest_server_test.go @@ -23,16 +23,16 @@ import ( "runtime" "testing" - account "github.com/monax/burrow/account" - consensus_types "github.com/monax/burrow/consensus/types" - core_types "github.com/monax/burrow/core/types" - event "github.com/monax/burrow/event" - rpc "github.com/monax/burrow/rpc" - "github.com/monax/burrow/rpc/v0/shared" - server "github.com/monax/burrow/server" - "github.com/monax/burrow/txs" + account "github.com/hyperledger/burrow/account" + consensus_types "github.com/hyperledger/burrow/consensus/types" + core_types "github.com/hyperledger/burrow/core/types" + event "github.com/hyperledger/burrow/event" + rpc "github.com/hyperledger/burrow/rpc" + server "github.com/hyperledger/burrow/server" + "github.com/hyperledger/burrow/txs" "github.com/gin-gonic/gin" + "github.com/hyperledger/burrow/rpc/v0/shared" "github.com/stretchr/testify/suite" "github.com/tendermint/log15" ) diff --git a/rpc/v0/shared/net.go b/rpc/v0/shared/net.go index 08a898386..0946004b8 100644 --- a/rpc/v0/shared/net.go +++ b/rpc/v0/shared/net.go @@ -15,8 +15,8 @@ package shared import ( - consensus_types "github.com/monax/burrow/consensus/types" - "github.com/monax/burrow/definitions" + consensus_types "github.com/hyperledger/burrow/consensus/types" + "github.com/hyperledger/burrow/definitions" ) // Net is part of the pipe for BurrowMint and provides the implementation diff --git a/rpc/v0/shared/pipes.go b/rpc/v0/shared/pipes.go index a43616442..eea6022af 100644 --- a/rpc/v0/shared/pipes.go +++ b/rpc/v0/shared/pipes.go @@ -17,8 +17,8 @@ package shared // Shared extension methods for Pipe and its derivatives import ( - core_types "github.com/monax/burrow/core/types" - "github.com/monax/burrow/definitions" + core_types "github.com/hyperledger/burrow/core/types" + "github.com/hyperledger/burrow/definitions" tendermint_types "github.com/tendermint/tendermint/types" ) diff --git a/rpc/v0/websocket_service.go b/rpc/v0/websocket_service.go index 5bc67d506..941c9f9c7 100644 --- a/rpc/v0/websocket_service.go +++ b/rpc/v0/websocket_service.go @@ -18,11 +18,11 @@ import ( "encoding/json" "fmt" - definitions "github.com/monax/burrow/definitions" - "github.com/monax/burrow/event" - rpc "github.com/monax/burrow/rpc" - server "github.com/monax/burrow/server" - "github.com/monax/burrow/txs" + definitions "github.com/hyperledger/burrow/definitions" + "github.com/hyperledger/burrow/event" + rpc "github.com/hyperledger/burrow/rpc" + server "github.com/hyperledger/burrow/server" + "github.com/hyperledger/burrow/txs" ) // Used for Burrow. Implements WebSocketService. diff --git a/test/filters/filter_test.go b/test/filters/filter_test.go index 0dbbe59c7..e3cf1052c 100644 --- a/test/filters/filter_test.go +++ b/test/filters/filter_test.go @@ -19,7 +19,7 @@ import ( "sync" "testing" - event "github.com/monax/burrow/event" + event "github.com/hyperledger/burrow/event" "github.com/stretchr/testify/suite" ) diff --git a/test/server/scumbag.go b/test/server/scumbag.go index 8fed7e671..a4d902036 100644 --- a/test/server/scumbag.go +++ b/test/server/scumbag.go @@ -19,8 +19,8 @@ import ( "os" "runtime" - rpc "github.com/monax/burrow/rpc" - "github.com/monax/burrow/server" + rpc "github.com/hyperledger/burrow/rpc" + "github.com/hyperledger/burrow/server" "github.com/gin-gonic/gin" "github.com/tendermint/log15" diff --git a/test/server/ws_burst_test.go b/test/server/ws_burst_test.go index 7e7eea7d2..820e173ab 100644 --- a/test/server/ws_burst_test.go +++ b/test/server/ws_burst_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/monax/burrow/client" - "github.com/monax/burrow/server" + "github.com/hyperledger/burrow/client" + "github.com/hyperledger/burrow/server" "github.com/stretchr/testify/assert" ) diff --git a/test/testdata/filters/testdata_filters.g_ b/test/testdata/filters/testdata_filters.g_ new file mode 100644 index 000000000..e69de29bb diff --git a/test/testdata/helpers.go b/test/testdata/helpers.go index ff2f655dd..b591d858a 100644 --- a/test/testdata/helpers.go +++ b/test/testdata/helpers.go @@ -19,10 +19,10 @@ import ( "os" "path" - "github.com/monax/burrow/files" - "github.com/monax/burrow/server" + "github.com/hyperledger/burrow/files" + "github.com/hyperledger/burrow/server" - stypes "github.com/monax/burrow/manager/burrow-mint/state/types" + stypes "github.com/hyperledger/burrow/manager/burrow-mint/state/types" . "github.com/tendermint/go-common" "github.com/tendermint/go-wire" "github.com/tendermint/tendermint/types" diff --git a/txs/events.go b/txs/events.go index 18f2d994f..6c634d183 100644 --- a/txs/events.go +++ b/txs/events.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - . "github.com/monax/burrow/word256" + . "github.com/hyperledger/burrow/word256" "github.com/tendermint/go-wire" tm_types "github.com/tendermint/tendermint/types" // Block diff --git a/txs/names.go b/txs/names.go index f8e3536b9..6535bf765 100644 --- a/txs/names.go +++ b/txs/names.go @@ -17,7 +17,7 @@ package txs import ( "regexp" - core_types "github.com/monax/burrow/core/types" + core_types "github.com/hyperledger/burrow/core/types" ) var ( diff --git a/txs/tx.go b/txs/tx.go index 55d209667..d7b1c50a8 100644 --- a/txs/tx.go +++ b/txs/tx.go @@ -22,8 +22,8 @@ import ( "golang.org/x/crypto/ripemd160" - acm "github.com/monax/burrow/account" - ptypes "github.com/monax/burrow/permission/types" + acm "github.com/hyperledger/burrow/account" + ptypes "github.com/hyperledger/burrow/permission/types" . "github.com/tendermint/go-common" "github.com/tendermint/go-wire" diff --git a/txs/tx_test.go b/txs/tx_test.go index 23542ab76..1ccef655b 100644 --- a/txs/tx_test.go +++ b/txs/tx_test.go @@ -17,8 +17,8 @@ package txs import ( "testing" - acm "github.com/monax/burrow/account" - ptypes "github.com/monax/burrow/permission/types" + acm "github.com/hyperledger/burrow/account" + ptypes "github.com/hyperledger/burrow/permission/types" "github.com/stretchr/testify/assert" . "github.com/tendermint/go-common" diff --git a/txs/tx_utils.go b/txs/tx_utils.go index 49d3e440d..6e1519b68 100644 --- a/txs/tx_utils.go +++ b/txs/tx_utils.go @@ -17,8 +17,8 @@ package txs import ( "fmt" - acm "github.com/monax/burrow/account" - ptypes "github.com/monax/burrow/permission/types" + acm "github.com/hyperledger/burrow/account" + ptypes "github.com/hyperledger/burrow/permission/types" "github.com/tendermint/go-crypto" ) diff --git a/util/hell/cmd/hell/main.go b/util/hell/cmd/hell/main.go index 2adce10b1..5caa04ac0 100644 --- a/util/hell/cmd/hell/main.go +++ b/util/hell/cmd/hell/main.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/monax/burrow/util/hell" + "github.com/hyperledger/burrow/util/hell" "github.com/Masterminds/glide/action" "github.com/Masterminds/glide/cache" diff --git a/util/snatives/cmd/main.go b/util/snatives/cmd/main.go index 0754ac50d..16711bd03 100644 --- a/util/snatives/cmd/main.go +++ b/util/snatives/cmd/main.go @@ -17,8 +17,8 @@ package main import ( "fmt" - "github.com/monax/burrow/manager/burrow-mint/evm" - "github.com/monax/burrow/util/snatives/templates" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/util/snatives/templates" ) // Dump SNative contracts diff --git a/util/snatives/templates/solidity_templates.go b/util/snatives/templates/solidity_templates.go index 5d4c91030..165a2e6ab 100644 --- a/util/snatives/templates/solidity_templates.go +++ b/util/snatives/templates/solidity_templates.go @@ -20,7 +20,7 @@ import ( "strings" "text/template" - "github.com/monax/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" ) const contractTemplateText = `/** diff --git a/util/snatives/templates/solidity_templates_test.go b/util/snatives/templates/solidity_templates_test.go index 82f73237a..6f77a6a08 100644 --- a/util/snatives/templates/solidity_templates_test.go +++ b/util/snatives/templates/solidity_templates_test.go @@ -16,7 +16,7 @@ package templates import ( "fmt" - "github.com/monax/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" "github.com/stretchr/testify/assert" "testing" )