diff --git a/CHANGELOG.md b/CHANGELOG.md index 52282d50ef337d35df3b62689da8494e1fb949a6..b33fa616533b2196d94c4579b49d79ab89bc23ef 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/Dockerfile b/Dockerfile index 10ca8c7b9310a28235d59f9c834f2429ba007840..e75eb594b4a6ce7fc19ecddc03bc1a585071de97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/monax/build:0.16 MAINTAINER Monax <support@monax.io> ENV TARGET burrow -ENV REPO $GOPATH/src/github.com/monax/$TARGET +ENV REPO $GOPATH/src/github.com/hyperledger/$TARGET ADD ./glide.yaml $REPO/ ADD ./glide.lock $REPO/ diff --git a/Makefile b/Makefile index d24d60488a862314d9e3a4bd45a3bd8d3332848a..06b6400be4523665c4c994f11443c4eaf7299a65 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 dbd177e1c6e796faec04781fe09842389e896e20..957eeb92a34bb1af0f07fbf6e633705a7e4c045d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Burrow v0.16 -|[](https://godoc.org/github.com/monax/burrow) | Linux | +|[](https://godoc.org/github.com/hyperledger/burrow) | Linux | |---|-------| | Master | [](https://circleci.com/gh/monax/burrow/tree/master) | | Develop | [](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 <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 @@ -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 69f0ded86c9323d8ae328e2be138910d77765a2a..b050c9079a16cd61c8153be3129cfbdbdadb3b2b 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 5a57687f7eb2f27f82881a1d2785b665ee2831c7..e2fa762fff0e62ce9162ea68e5dcbd4f6f07def5 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 6e05a27f6f032edbc01dbe163d28458156300f7a..c61f77fb1c7803ef3ef03f3e51f5cea4616804ec 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 9bb113884b14ecdc7ef341b8c0b9e1e672c445c4..788d7fd16b727cf0eb9b2878486c4c32494114a3 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 be211672e3f98795aead6b57e7035777413eef36..dc79298a937e5e1080a3d4515746db46cd02c207 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 43d649e14382d4398d4f16d65536d645ae460fc1..3eb7f4621f6029aa7116369a6e228f29a55153c0 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 910839d45b736bf94e27058838cecb698a486cb4..dac02391fa515adfa01291a3172e598dbfb4a314 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 79152b3ad42a576281f262bd61f9874420a21938..21b97e65795a46ce4cb499e768529f15e7ca43a1 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 76e52b726daccf4ecb4d1413f8ac984d2f4abc64..9df3a51ac5921fd43ae62d52e0fc3c52c499e783 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 e0e4304ded377a81893d166b73e9e59d37b1ab09..2e8bc6fcaddb11eac66c55f8992039a9beec8feb 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" - logging_types "github.com/monax/burrow/logging/types" + "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" + logging_types "github.com/hyperledger/burrow/logging/types" ) func unpackSignAndBroadcast(result *rpc.TxResult, logger logging_types.InfoTraceLogger) { diff --git a/client/methods/send.go b/client/methods/send.go index 77b3ed1e689637be3fce2121b228d2b3c3af0e63..9437a9dfd754826699e2e7c06606da1f4b0f1e2b 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 da74605fc97d5601b5f5ffa08b7c5c2a3e21be08..d14c3290b6367baab80ef5bdc3df3cbb098dcd8b 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 1fe2e8307bea337778689ea653ed46b9f2b54f64..0460d63894f4d13d51ee3c26b1e1ee10f412799e 100644 --- a/client/mock/client_mock.go +++ b/client/mock/client_mock.go @@ -17,13 +17,13 @@ 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" - logging_types "github.com/monax/burrow/logging/types" - "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" + logging_types "github.com/hyperledger/burrow/logging/types" + "github.com/hyperledger/burrow/txs" ) var _ NodeClient = (*MockNodeClient)(nil) diff --git a/client/node_client.go b/client/node_client.go index a4ef450b76ccb786c89c97ca07e8e13592939d73..eb03fd77fb22300419bba16696e8e06f96e17c13 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" - logging_types "github.com/monax/burrow/logging/types" - 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" + logging_types "github.com/hyperledger/burrow/logging/types" + 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 0e3f40582fa600dff330f154185db5dd2b85c1c9..5a3652e368745f33400cf57cced5d8870a20843d 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 5fc4418db6a83e62e47bb26bc9c0c5eb06a1fe1c..a805b99bc8f2040f2cda854554cf132a6adbabb5 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 1025c16837bfcb6212ff0debc17bdfd8f7df4dc2..6711c1ad5cb6cbcd20bb96b43068b0d22ec418b1 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 a4ef9016d0f902a89b685b155583f9b7bef326be..9e6484265e646d72a4d345025c30d70260dc2657 100644 --- a/client/websocket_client.go +++ b/client/websocket_client.go @@ -19,13 +19,13 @@ import ( "fmt" "time" - logging_types "github.com/monax/burrow/logging/types" + logging_types "github.com/hyperledger/burrow/logging/types" "github.com/tendermint/go-rpc/client" "github.com/tendermint/go-wire" - "github.com/monax/burrow/logging" - ctypes "github.com/monax/burrow/rpc/tendermint/core/types" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/logging" + 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 3c101ff6b02467abf8faa420ad44ee6f0a899239..bfa3b264a22ecd1d1d2c30e9c57c49c6cd81d658 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 6a391ea8af7260c9a5b74a26f1efb7b1c500b89f..e5133ab87e40f117e9800aac3834781c175b3afb 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 274d4698179a99d3d61cbfb0c10c72aae0c82c9c..c4373db68d71c555667b91aa3ea38a78890421a6 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 b040189dcee2f0b73c90f0f810b20dbac4a2cb6c..4b1e4e9f02862dd4e815f141791156e5233a7a7a 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/config/config.go b/config/config.go index 4afd56c97dccc57a661582c8063e92e0abb2121d..8d002743fc0c474c50d2c655f2bee568ec7bbb03 100644 --- a/config/config.go +++ b/config/config.go @@ -19,7 +19,7 @@ import ( "fmt" "text/template" - lconfig "github.com/monax/burrow/logging/config" + lconfig "github.com/hyperledger/burrow/logging/config" ) type ConfigServiceGeneral struct { diff --git a/consensus/config.go b/consensus/config.go index 72bb13d6ec82782111411ffd7937c9cb05ded937..1c197b6fc45d75ee50a378fa8f8bc8604b67d0f9 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 bbae9a5c88bde17afee0ba4af47bcb2b171085ce..f94dffb2ef64dc6907257c796dc0844b4861232f 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 4d905e62309081348ca7582d8c1b352178af684c..0ea0a1d546cbcb8e261de919fa03be5c3637ab66 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 cada576e3666ff2ce61caeeae2f90c4f48f44f7e..7029fe0406909ed72941a0027f46c1683ee27c8f 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" - logging_types "github.com/monax/burrow/logging/types" - "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" + logging_types "github.com/hyperledger/burrow/logging/types" + "github.com/hyperledger/burrow/txs" "github.com/tendermint/go-wire" ) diff --git a/consensus/tendermint/version.go b/consensus/tendermint/version.go index 98bc8ddb8d6a39f2c17743171bbee87cedce7d41..7a20ac5c1b5b7bc037d6591ea82164f9b9f3e9a8 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 8bbde159014f27640aa766aa5ebef780530a083b..26754db313609f0b5c30cf7ba6e8b622f18733e1 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 109374023f02501ad933967bd73bbc27cab67c08..0bc07bf8ce5aa185fa83adbcdd5fe2a8dd16abc0 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" - lconfig "github.com/monax/burrow/logging/config" - "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" + lconfig "github.com/hyperledger/burrow/logging/config" + "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 d1475d5bfd488597b67b2ec72d5a453e61cccc7b..b6f515e0f8af69208aa708f569634975929b151a 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" - logging_types "github.com/monax/burrow/logging/types" - rpc_tendermint "github.com/monax/burrow/rpc/tendermint/core" - "github.com/monax/burrow/server" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" + 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 130be6d63f2f0c370dcac25a2b86efbc1a0f0370..5b0934c164e3b90cf3245578ab0c70d6c76dbf9b 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 56ff9e6c5a4d6558cd4079c79aaf07f6f2e1d008..8e31e596f1cb8c203f6cd0c1b64da3aec218e72f 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 d7c10aa02d1bc6b4f30b749602a924115eae1f89..286a0623a000e792e37e32c595f5296cdf02ced2 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" - logging_types "github.com/monax/burrow/logging/types" - 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" + logging_types "github.com/hyperledger/burrow/logging/types" + 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 176a8596f2934be83b9ecef1e1d2ff97c47a26be..600bfbd19232bf078a3c21d560403046f962abca 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 11ec3a644cde70fa0f05027ce88d6cf1fdc6cea2..9290f607b6e79c207d2e2b865dc2430b17341a0a 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 61c39e4833b801e39d6f076dcebd3a9ef395b161..99dc4f3fa98e65f9de8c9cc6fc8f98ea9632912f 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 79846039ee9d1c9040f2db1a2176766036e77c8d..bd1954f6a79359bba214e7c7c366b4f91a0fa73a 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 0eabe0eda0855de2aaf5715e1c8cc8eb5405a7b2..f93b1b643eb56d75af899995f5b732fa964532d1 100644 --- a/event/events.go +++ b/event/events.go @@ -21,9 +21,9 @@ import ( "fmt" - "github.com/monax/burrow/logging" - logging_types "github.com/monax/burrow/logging/types" - "github.com/monax/burrow/txs" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" + "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 129bd54a54baafcf60060260d38c82ec4e52e394..a4dcf84cd2bedd1b0f01b079833661f0e385764c 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 84b1a456cc3e99e62122a72e0ebd3f4c1b5e72d5..4eb99cbbc64c498b45b816386c0295601c905001 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 4ff28c04939417a7f0014707ec36f603823d18c9..624b73d23f351ad1649aecd44287e792d4ebe054 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 89ade705d5504fdc1630f7ab25b4195cedea8309..f30ef3cbd23762ea269475e7ba38d8e328f2903d 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 efa06b8d2316e1ad2a9731f3f8080d183ff134ce..5f1d4ada090dc8465e3b43f76e8fa8414de35390 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 90f84e13b236af1ec5457dc3ccc86f34a7b8f2f6..950556c5aac48bba72c51604d993f4b8c865886b 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/monax/eris-keys - package: github.com/spf13/cobra diff --git a/keys/key_client.go b/keys/key_client.go index c803e295df0ec2000c89d97aead3adbed7e1345c..99046e5e316960de264d56b3041ec9491e136236 100644 --- a/keys/key_client.go +++ b/keys/key_client.go @@ -18,8 +18,8 @@ import ( "encoding/hex" "fmt" - "github.com/monax/burrow/logging" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" ) type KeyClient interface { diff --git a/keys/key_client_util.go b/keys/key_client_util.go index 22e9755f4aeb6dc5e096f5479ec4ab4124047595..c0677f993cb841526a5a3527b028daffe9aef4f0 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" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" ) // 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 7a3619d6fed2973122c367e7bd17afd21b3a3881..291ec748e25ce51e13fcb23b9bf11f986eb2ef7b 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 c9cab9d2cd883cdcaffb691ae926de16918a6955..599a19a70aa36bc2107029ef12df1075055726c3 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/types" + "github.com/hyperledger/burrow/logging/types" ) func Capture(stdLibLogger log.Logger, diff --git a/logging/adapters/tendermint_log15/capture.go b/logging/adapters/tendermint_log15/capture.go index 9a84c83addd4246b0cfdc905d0f3b4abbeda8fbf..3534ca3eeffd61e99ac61acad5fe41e8669733bc 100644 --- a/logging/adapters/tendermint_log15/capture.go +++ b/logging/adapters/tendermint_log15/capture.go @@ -16,7 +16,7 @@ package tendermint_log15 import ( kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging/types" "github.com/tendermint/log15" ) diff --git a/logging/adapters/tendermint_log15/convert.go b/logging/adapters/tendermint_log15/convert.go index 55b14bbfb120182d94742bf109a92429c0eedb6d..d64607628b0a8b22ebfd3b88bbe19aec39db8800 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/structure" - "github.com/monax/burrow/logging/types" - . "github.com/monax/burrow/util/slice" + "github.com/hyperledger/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/types" + . "github.com/hyperledger/burrow/util/slice" "github.com/tendermint/log15" ) diff --git a/logging/config/config.go b/logging/config/config.go index 227d0ccc488af315197596b1f586ec803a886ad3..0bbf51488b6340744263811b45c552e886f70345 100644 --- a/logging/config/config.go +++ b/logging/config/config.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/BurntSushi/toml" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/structure" ) type LoggingConfig struct { diff --git a/logging/config/filter.go b/logging/config/filter.go index 6845db2e58d7823574b5807a30ad3606ec9a631d..1ddf35ff6a1339776f6793c63dc2a7aea19b5a4a 100644 --- a/logging/config/filter.go +++ b/logging/config/filter.go @@ -5,7 +5,7 @@ import ( "regexp" - "github.com/monax/burrow/common/math/integral" + "github.com/hyperledger/burrow/common/math/integral" ) func BuildFilterPredicate(filterConfig *FilterConfig) (func([]interface{}) bool, error) { diff --git a/logging/config/filter_test.go b/logging/config/filter_test.go index b9df24ffdad72a2d43c850c2311431c84d4dd086..3c5edf5ad4df8c54e999c33792c70e10f4a99c62 100644 --- a/logging/config/filter_test.go +++ b/logging/config/filter_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - . "github.com/monax/burrow/util/slice" + . "github.com/hyperledger/burrow/util/slice" "github.com/stretchr/testify/assert" ) diff --git a/logging/config/sinks.go b/logging/config/sinks.go index e4dbc1434a1bcc5e8281b45bfff5b4743d647cbf..7eaea511a39371da16ded5a48b3eb624389b83a5 100644 --- a/logging/config/sinks.go +++ b/logging/config/sinks.go @@ -8,8 +8,8 @@ import ( "github.com/eapache/channels" kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/loggers" - "github.com/monax/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/structure" ) // This file contains definitions for a configurable output graph for the diff --git a/logging/convention.go b/logging/convention.go index dfd7f663d8fe364d9c7ad4324d2839fd8e1d80b5..d470451a9670a480bf47f9d36f6a4b900f5124c2 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/structure" - "github.com/monax/burrow/logging/types" - "github.com/monax/burrow/util/slice" + "github.com/hyperledger/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/types" + "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 ede5b86b8a88dedaa9cda521adab1d3fe80b6877..ab1c4f540fd9c0bcb66cd3ba260d732e40c4b0e4 100644 --- a/logging/lifecycle/lifecycle.go +++ b/logging/lifecycle/lifecycle.go @@ -20,15 +20,15 @@ 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/config" - "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/config" + "github.com/hyperledger/burrow/logging/loggers" + "github.com/hyperledger/burrow/logging/structure" kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging/types" "github.com/streadway/simpleuuid" tmLog15 "github.com/tendermint/log15" ) diff --git a/logging/loggers/burrow_format_logger.go b/logging/loggers/burrow_format_logger.go index 653e1963d1598a156386094f2a8c6f9639872df3..ec522b3d896495e052616007d7eaa578d4c60961 100644 --- a/logging/loggers/burrow_format_logger.go +++ b/logging/loggers/burrow_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/filter_logger_test.go b/logging/loggers/filter_logger_test.go index da298026b304415a26aaf2fb8a71949adfe90ced..f200a8276668fd5d88b7a85586ad6f5a40e2e712 100644 --- a/logging/loggers/filter_logger_test.go +++ b/logging/loggers/filter_logger_test.go @@ -3,7 +3,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/loggers/info_trace_logger.go b/logging/loggers/info_trace_logger.go index 1f87e151f18c76ba669ba14ecf2b5abe5809e4fe..2ad14e1d0fee6b4e56cdc1b2fb46ced58f66e070 100644 --- a/logging/loggers/info_trace_logger.go +++ b/logging/loggers/info_trace_logger.go @@ -16,8 +16,8 @@ package loggers import ( kitlog "github.com/go-kit/kit/log" - "github.com/monax/burrow/logging/structure" - "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/types" ) type infoTraceLogger struct { diff --git a/logging/loggers/tendermint_log15_loggers.go b/logging/loggers/tendermint_log15_loggers.go index ac7a3dded9701e9d709ccee0fdf10da1283637bd..982b232a3c45842b3da28d96654a4aba45dede54 100644 --- a/logging/loggers/tendermint_log15_loggers.go +++ b/logging/loggers/tendermint_log15_loggers.go @@ -7,7 +7,7 @@ import ( "net/url" kitlog "github.com/go-kit/kit/log" - log15a "github.com/monax/burrow/logging/adapters/tendermint_log15" + log15a "github.com/hyperledger/burrow/logging/adapters/tendermint_log15" "github.com/tendermint/log15" ) diff --git a/logging/loggers/vector_valued_logger.go b/logging/loggers/vector_valued_logger.go index dd521e1095a661ee3da7654e75b833cc2704febf..c952aaf65d7c99d753b05fefda40ed96c0ee5fd5 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 e92b8fda807d87286cded4ce909b33a572e846e5..62d85f613d04008ee5036202149855163f65835b 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 fd055be6b98a1733b95a644c7f7e08ac646d9c09..8d8ca1d32b25ecf59d02c2b57a972b9227db2c49 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/structure" - "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging/structure" + "github.com/hyperledger/burrow/logging/types" ) const ( diff --git a/logging/structure/structure.go b/logging/structure/structure.go index dead9099ac5a9dbdbfb7d7e7881b0642a24ba80d..271d8564a5e266ac0eddfe6abed20c9f42a64207 100644 --- a/logging/structure/structure.go +++ b/logging/structure/structure.go @@ -14,7 +14,7 @@ package structure -import . "github.com/monax/burrow/util/slice" +import . "github.com/hyperledger/burrow/util/slice" const ( // Log time (time.Time) diff --git a/logging/structure/structure_test.go b/logging/structure/structure_test.go index c4e47407eaa3376ae4d1da4d04476b34965d87a8..d7e147356460f27cdec71e8c4f30f28df44687f6 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 de4180fbd2fcfd9a24586c66ced09713fbfd738e..156f602d7b2865301b5bbc3b9619944faff3eb52 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 035586ee19b309152f883811cd1f1134ae6b3880..1443a653e92afc4eb44f30790cfb1bfb530598ab 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 790bad39ca164c9e864f3228e255c3e4329217ac..b54f9f3de5a174c2ff7c86daafbae5e9f585c94b 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" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" - 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 828acd2f8881ef194be0cabe5c59a9ecf76225c6..c9b1e7474ec2e077ee0dc3df0d2d7d14cea15832 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 e576c338b1556283dee0a47ceefdec6d859b1c01..91431adc7477fe1a29e77f4dfdf42aaa8e997f60 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 3d788e5e4dff8c43db2265461960d1b691731593..ab4e32074c1eb459da62275a78778d6b01a2c17e 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 02a0441ea58a51a45dfcc154d40c4c2a9edfda32..d633b5e5f717fe034dc5b065d6f4c461a8203a0a 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 7becc614153f17734705da24beab9e3514526d81..37e1031c34ced1480c53a39ccbb26fdec475d42b 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 bc119e577b97c08d83440d9b4f42fa6c3d5b8d90..18006ad65cfa2fb0f51acc601291b4743d47d2f4 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 471ff5792ca4f7922f5395fe42540b261fb9a6b0..e383be25d60d3d479623b6e3b92c7ebbcd674d6e 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 3dfc2b9bcce6ee05f208670e37cbdc0f32ef0d6a..f083812e59884c121e77291b56c5310e0d840c2c 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 f37a6ba2d38d159cccb79d7bfc3e91569d3c2813..b5696651ee32187ca19d632b6ce9e8460802c9ea 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 a954115cb9506521678a8851ca7933920ad52436..dc316ec68856934aed5d7ce37c52d9e6dbc1c6f0 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 3de4ed6031ce0433ea76af90e26bfcb4a534d6bb..3deedd44e1dc0acdec88af4555810ef611e04e69 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 52f2924f32935244cf46137bb16695db0014d88b..3830bd0e88b3f8ff7b6684cefb50c8408734fb21 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" - logging_types "github.com/monax/burrow/logging/types" - 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" + logging_types "github.com/hyperledger/burrow/logging/types" + 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 e2e8e61dc6bc37d899763f677286223c062efa77..3ba8a456447db7e6256e13383ba68f6977297add 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 b5b29b0fe332ff2505d0063650bff1df710087be..37cf6ca18e6ce7dec613448d32a81a2146d2feb6 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 62fb49730cb197aea578bb5b4711287806131461..9fc20e55dcfdfea1d91a4c43ba4ec26e21fb7a28 100644 --- a/manager/burrow-mint/state/execution.go +++ b/manager/burrow-mint/state/execution.go @@ -19,16 +19,16 @@ import ( "errors" "fmt" - acm "github.com/monax/burrow/account" - "github.com/monax/burrow/common/sanity" - core_types "github.com/monax/burrow/core/types" - logging_types "github.com/monax/burrow/logging/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" - - "github.com/monax/burrow/logging" + acm "github.com/hyperledger/burrow/account" + "github.com/hyperledger/burrow/common/sanity" + core_types "github.com/hyperledger/burrow/core/types" + logging_types "github.com/hyperledger/burrow/logging/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/hyperledger/burrow/logging" "github.com/tendermint/go-events" ) diff --git a/manager/burrow-mint/state/genesis_test.go b/manager/burrow-mint/state/genesis_test.go index 3c5a60f35162790fe6e0fc5469ec9711675c10ad..d699bc623150164bd3fb142e94312b4fd20e4ac3 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 4ac30975234d7091283f9f5d3667e2ec744199ef..dd812410f4939715c102e78d4239dd28f72ae978 100644 --- a/manager/burrow-mint/state/permissions_test.go +++ b/manager/burrow-mint/state/permissions_test.go @@ -21,15 +21,15 @@ 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" - - "github.com/monax/burrow/logging/lifecycle" + 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/hyperledger/burrow/logging/lifecycle" "github.com/tendermint/go-crypto" dbm "github.com/tendermint/go-db" "github.com/tendermint/go-events" diff --git a/manager/burrow-mint/state/state.go b/manager/burrow-mint/state/state.go index 3b925be530cc7b86875e190e0e1224f34bad8b65..ccf68bf34841fe4765fc6d785b6da2d6c0d4891e 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 b81b617098377045f116402c1de157df995b6928..c56966b6bdfff4d964ec9885f2a6aa6a871481b7 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 43a38303296f50b681f33df0529be3cd85154771..d892f46e520dd04ffbdc362747124bcb8db9cac1 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 0faa9bd8d125aa8d1377de3f33a5baac171dbcac..f368f79cf3927e4368557911a5602aa258324121 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 d41300fae9957759b55e3fd106eb0219a5c8f513..93d7a36e96d6937d47756738f8a8be3ffe572409 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 41d33712c30f289ea042c013faa4a1cf4a74bb8e..27d80979525f7fa7e75cf7694e3826b8982454b4 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 c05e3c40a4adabaad4e152734937231dc42fada8..eac62048434dc39ff5c16946dd61130585d4587f 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -19,12 +19,12 @@ 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" + config "github.com/hyperledger/burrow/config" + definitions "github.com/hyperledger/burrow/definitions" + burrowmint "github.com/hyperledger/burrow/manager/burrow-mint" - "github.com/monax/burrow/logging" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" ) // NewApplicationPipe returns an initialised Pipe interface diff --git a/permission/types/permissions.go b/permission/types/permissions.go index 0fd472bbf9cd28b8772ca17ad6464c536cd3c490..c414a85dfb18ddeccbfef80553592a231d0f124c 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 8195d58e453d3d6ebaf13efbcc7905dc46d3636c..d8ca980094524562d9e70a8d13b6e7e19c6cd6bf 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 e3d010b3054c3d1973fcca0cf7814ef61af8a118..83573742edc1cfb31083dd3dd5fb6c51a8944b8f 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 180e278a89b669c59408ec27f84c1a337a74718e..33b46d4265e23f7f7831fc2ca74effe45b0a2c15 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 616e71d0bc15ffc25cb2a842733c2fc97d480e78..c745017c8d74a8bc9d695667c5dec01a1abbb983 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 a4eb9483fbc6bb6e580b23e959a3582ce747d331..cd3e15e8c6675dd92aaf19610bc6f52608c87e8c 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 5ae99ad7d18dff796e09d9de315e9c3d572be153..2a4feffe1ff25787d298a4e51c2cd6232782e7ad 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 523f3688a321e59128313468447e1b9c53b659e8..ff618906ca09d88167e6ee883219caff0326cecf 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 beceb5484eaf466cd23673f9a4feac19222d59cc..f7f89827ca4625abaf60ae65eeee8707971aadcf 100644 --- a/rpc/tendermint/test/rpc_client_test.go +++ b/rpc/tendermint/test/rpc_client_test.go @@ -25,10 +25,10 @@ import ( "golang.org/x/crypto/ripemd160" - 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 903911d36a29cb46d6344e62d95db7071c8e917b..e17ee5b8184791e65df67ec8a0ccceac216a0a29 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 c28a9eaa69f9e7c66fcc00f4ef626698576502c3..40cc976d49d4dfdc96fa5b86a3b10ac27f61d1a5 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 9a3cc1f16fafbcb66d49939139e1371b55c830f5..046f13ea44c0d239fcd89655d6cb4c55c6bfca4d 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 ff219c8288af67b6bf682b13db47f9a7c97e6ced..6cb6a2a4f22b343e7b6b11186ac1ebe540602d2a 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 59133df73f07c03e44cf40cf5886b37ce6fadf06..58bb9ca7fc4483dcdead2726f9a29fe5b67c521c 100644 --- a/rpc/v0/codec.go +++ b/rpc/v0/codec.go @@ -18,8 +18,9 @@ import ( "io" "io/ioutil" - "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 9b10cec925aa7d8eee5a6015b65f328853c8f588..6cb9f8ca76a724dd37f99dce677bd718a4bdb9ca 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" - "github.com/monax/burrow/rpc" - server "github.com/monax/burrow/server" + definitions "github.com/hyperledger/burrow/definitions" + event "github.com/hyperledger/burrow/event" + "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 258226470e6a4ae23e1695805bced88c1be80ea2..bd809698da00a3f7d923c89336d44c5d5ed107bc 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 26c7cca45d3086097a8d06e4e18f081bfd589d14..5428f94a727d2593427ea5e65f2c03d6758f4bb6 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 6f92b784d7e175daefed52db9847980f3275df5d..6117dc24b466159b734887d6b779ab2d5a7c086e 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 f01bd6ff7667718286ebcca86565d051bbb0e9b7..868fad767097c8d772a8f45b039dcb17c6c0d2ef 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 1d81e2d642d22faf18018fe98dbd53aeb01b5c24..3f76af2042c5ac47bad6da66ed62e58636c711c0 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 49ccc6c8ee5d7ec7d50a70b1650894760b8d9f93..5e0ad038d8e505eda0afd6744bd03d1f5c49a971 100644 --- a/rpc/v0/rest_server_data_test.go +++ b/rpc/v0/rest_server_data_test.go @@ -15,13 +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 b257bdaa7611e5355da8131766d8b6795c8f1a65..d949c79ebcde608b2bc91b314b5689d0074f5bef 100644 --- a/rpc/v0/rest_server_pipe_test.go +++ b/rpc/v0/rest_server_pipe_test.go @@ -17,18 +17,18 @@ 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" - - blockchain_types "github.com/monax/burrow/blockchain/types" - consensus_types "github.com/monax/burrow/consensus/types" - logging_types "github.com/monax/burrow/logging/types" - manager_types "github.com/monax/burrow/manager/types" - "github.com/monax/burrow/txs" - - "github.com/monax/burrow/logging/loggers" + 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/hyperledger/burrow/blockchain/types" + consensus_types "github.com/hyperledger/burrow/consensus/types" + logging_types "github.com/hyperledger/burrow/logging/types" + manager_types "github.com/hyperledger/burrow/manager/types" + "github.com/hyperledger/burrow/txs" + + "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 cb4fd4d69566ba6a337f64a1f61e9109e7d542c4..b336d3f8e6fc873884a58bdbca76b76b0480b85c 100644 --- a/rpc/v0/rest_server_test.go +++ b/rpc/v0/rest_server_test.go @@ -23,18 +23,18 @@ 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/monax/burrow/logging/lifecycle" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/rpc/v0/shared" + "github.com/hyperledger/burrow/logging/lifecycle" + logging_types "github.com/hyperledger/burrow/logging/types" "github.com/stretchr/testify/suite" "github.com/tendermint/log15" ) diff --git a/rpc/v0/shared/net.go b/rpc/v0/shared/net.go index 08a89838687a290a69cb6f38255fbf94f0f10812..0946004b869598b6723c4ce451ccc1c2b64415f3 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 a43616442d484053f35044f60cfd62a4dbd4d40d..eea6022af374b5cb5ea5eb4281cb13b0faa86f5d 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 5bc67d50657383fe040464382681924716e89fae..941c9f9c705f9dd4b4c43b79f621fbabfd86ba03 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/server/server.go b/server/server.go index d2e8451b376edb0ad874e86703f9aa71df3fc7c5..2a3d7bc7cff5cd21147323b10f1e337021871285 100644 --- a/server/server.go +++ b/server/server.go @@ -22,8 +22,8 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/monax/burrow/logging" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" cors "github.com/tommy351/gin-cors" "gopkg.in/tylerb/graceful.v1" ) diff --git a/server/websocket.go b/server/websocket.go index da337b10fa40d0fa89f44ec2c43fcf6f478b3652..265ac3a47451cb096f854cfcc33373ff70bb3155 100644 --- a/server/websocket.go +++ b/server/websocket.go @@ -22,8 +22,8 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/monax/burrow/logging" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging" + logging_types "github.com/hyperledger/burrow/logging/types" ) // TODO too much fluff. Should probably phase gorilla out and move closer diff --git a/test/filters/filter_test.go b/test/filters/filter_test.go index 0dbbe59c7d3f6c244ff0083437fa7ae10ada178c..e3cf1052c20d0e0d01e8281a935bf6abac2ab350 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_test.go b/test/server/scumbag_test.go index 6031aa94721c09a1d36c79841a060f2648a3c2e9..7fcf23c28e6bf79bd87a8ab7fcbb938026bfe091 100644 --- a/test/server/scumbag_test.go +++ b/test/server/scumbag_test.go @@ -19,12 +19,12 @@ import ( "os" "runtime" - "github.com/monax/burrow/rpc" - "github.com/monax/burrow/server" + "github.com/hyperledger/burrow/rpc" + "github.com/hyperledger/burrow/server" "github.com/gin-gonic/gin" - "github.com/monax/burrow/logging/lifecycle" - logging_types "github.com/monax/burrow/logging/types" + "github.com/hyperledger/burrow/logging/lifecycle" + logging_types "github.com/hyperledger/burrow/logging/types" "github.com/tendermint/log15" ) diff --git a/test/server/ws_burst_test.go b/test/server/ws_burst_test.go index 7e7eea7d280662ceee6dff94503345d85fc3eccd..820e173ab15842380365707b21a228828eb4b155 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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/testdata/helpers.go b/test/testdata/helpers.go index ff2f655dd3038ce7c90b345a6308fd7f0f7b0df6..b591d858a7d7afcd45fd5e10566a8e179c678b15 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/tests/build_tool.sh b/tests/build_tool.sh index bf99cf09b6ff0bfa4b07aba0402b8cb34ca3bb94..1d3c2a3ec9fd63085e2f524d8b3ebcf5ace38586 100755 --- a/tests/build_tool.sh +++ b/tests/build_tool.sh @@ -28,7 +28,7 @@ then REPO=`pwd` CI="true" else - REPO=$GOPATH/src/github.com/monax/$TARGET + REPO=$GOPATH/src/github.com/hyperledger/$TARGET fi release_min=$(cat $REPO/version/version.go | tail -n 1 | cut -d \ -f 4 | tr -d '"') @@ -51,4 +51,9 @@ fi # Cleanup rm $REPO/target/docker/burrow.dockerartefact rm $REPO/target/docker/burrow-client.dockerartefact -docker rmi -f $IMAGE:build + +# CircleCI seems to have an issues removing this build, in any case it is not necessary on CI +if [ ! "$CI" ] +then + docker rmi -f $IMAGE:build +fi diff --git a/txs/events.go b/txs/events.go index 18f2d994fa16d325c97acfb61aa9446b3172a3fc..6c634d18386d41b7596b310483fdf9c7acdb6896 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 f8e3536b93f5736d04181954e7beef87b6d4b339..6535bf7656870219e56dafa106cd254a80756e0d 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 55d2096675da4f10fd5e81fa9df387b8b2b766de..d7b1c50a84832f9b57a3a93f286088df18c260bf 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 23542ab768bc74a7f1df582f1d7900214d0ba91c..1ccef655be3c784226f0e0259073c964fd272f55 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 49d3e440d6c819ab50b936d5585b3fe92d1832cd..6e1519b6850d1594bd7c25497059bd6dcbf80b61 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 2adce10b147672dcafddd4a883eb047c4d8abd36..5caa04ac071d3d4fb34a080da15a18dfbcbca2cb 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 0754ac50d7a67bf5a306f2471f19482b51fb4419..16711bd03645bd57e85c8be9ffcb828e3d1ffa4f 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 5d4c91030351db75dc499c8ad7046883a39bee09..165a2e6ab4b8877f7b6c0d9ef160e5d98cbff283 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 1e77518707a3b0d1dc01f03c59c6200d2241cb0a..58fe37f7e461db87fbd9864263b312a5b6f5c300 100644 --- a/util/snatives/templates/solidity_templates_test.go +++ b/util/snatives/templates/solidity_templates_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/monax/burrow/manager/burrow-mint/evm" + "github.com/hyperledger/burrow/manager/burrow-mint/evm" "github.com/stretchr/testify/assert" )