diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b4abbe9bd1cd21db3023d582cc922ca58973f574..190ffe44756d081a8cb75f12c590b878681cf8dc 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,6 +1,10 @@
# Contributing to `eris-db`:
Forked from Docker's [contributing guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md)
+## Developer Certificate of Origin
+
+Please always include "signed-off-by" in your commit message and note this constitutes a developer certification you are contributing a patch under Apache 2.0. Please find a verbatim copy of the Developer Certificate of Origin in this repository [here](.github/DEVELOPER_CERTIFICATE_OF_ORIGIN.md) or on [developercertificate.org](https://developercertificate.org/).
+
## Bug Reporting
A great way to contribute to the project is to send a detailed report when you encounter an issue. We always appreciate a well-written, thorough bug report, and will thank you for it!
diff --git a/.github/DEVELOPER_CERTIFICATE_OF_ORIGIN.md b/.github/DEVELOPER_CERTIFICATE_OF_ORIGIN.md
new file mode 100644
index 0000000000000000000000000000000000000000..0cdce0c397f01a8749cf6052289e9275ddd8652e
--- /dev/null
+++ b/.github/DEVELOPER_CERTIFICATE_OF_ORIGIN.md
@@ -0,0 +1,37 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+(c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
+
+(d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ab5699c9d45c45fe520221497e62c526f46dcbf..ddb14c99ed147b7a35e68754219dcac339c509d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,28 +5,28 @@ of the architecture across the Eris Platform to support a quicker release
cadence.
#### Features and improvements (among others)
-- [pull-510](https://github.com/eris-ltd/eris-db/pull/510) upgrade consensus engine to Tendermint v0.8.0
-- [pull-507](https://github.com/eris-ltd/eris-db/pull/507) use sha3 for snative addresses for future-proofing
-- [pull-506](https://github.com/eris-ltd/eris-db/pull/506) alignment and consolidation for genesis and config between tooling and chains
-- [pull-504](https://github.com/eris-ltd/eris-db/pull/504) relicense eris-db to Apache 2.0
-- [pull-500](https://github.com/eris-ltd/eris-db/pull/500) introduce more strongly types secure native contracts
-- [pull-499](https://github.com/eris-ltd/eris-db/pull/499) introduce word256 and remove dependency on tendermint/go-common
-- [pull-493](https://github.com/eris-ltd/eris-db/pull/493) re-introduce GenesisTime in GenesisDoc
+- [pull-510](https://github.com/monax/eris-db/pull/510) upgrade consensus engine to Tendermint v0.8.0
+- [pull-507](https://github.com/monax/eris-db/pull/507) use sha3 for snative addresses for future-proofing
+- [pull-506](https://github.com/monax/eris-db/pull/506) alignment and consolidation for genesis and config between tooling and chains
+- [pull-504](https://github.com/monax/eris-db/pull/504) relicense eris-db to Apache 2.0
+- [pull-500](https://github.com/monax/eris-db/pull/500) introduce more strongly types secure native contracts
+- [pull-499](https://github.com/monax/eris-db/pull/499) introduce word256 and remove dependency on tendermint/go-common
+- [pull-493](https://github.com/monax/eris-db/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 an eris blockchain. More to follow.
- Genesis making is improved and moved into eris-db.
- Config templating is moved into eris-db for better synchronisation of server config between the consumer of it (eris-db) and the producers of it (eris cli and other tools).
- Some documentation updates in code and in specs.
-- [pull-462](https://github.com/eris-ltd/eris-db/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/monax/eris-db/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/eris-ltd/eris-db/pull/516) Organize and add unit tests for rpc/v0
-- [pull-453](https://github.com/eris-ltd/eris-db/pull/453) Fix deserialisation for BroadcastTx on rpc/v0
-- [pull-476](https://github.com/eris-ltd/eris-db/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/eris-ltd/eris-db/pull/468) correct specifications for params on unsubscribe on rpc/tendermint
-- [pull-465](https://github.com/eris-ltd/eris-db/pull/465) fix divergence from JSON-RPC spec for Response object
-- [pull-366](https://github.com/eris-ltd/eris-db/pull/366) correction to circle ci script
-- [pull-379](https://github.com/eris-ltd/eris-db/pull/379) more descriptive error message for eris-client
+- [pull-516](https://github.com/monax/eris-db/pull/516) Organize and add unit tests for rpc/v0
+- [pull-453](https://github.com/monax/eris-db/pull/453) Fix deserialisation for BroadcastTx on rpc/v0
+- [pull-476](https://github.com/monax/eris-db/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/eris-db/pull/468) correct specifications for params on unsubscribe on rpc/tendermint
+- [pull-465](https://github.com/monax/eris-db/pull/465) fix divergence from JSON-RPC spec for Response object
+- [pull-366](https://github.com/monax/eris-db/pull/366) correction to circle ci script
+- [pull-379](https://github.com/monax/eris-db/pull/379) more descriptive error message for eris-client
## v0.12.0
This release marks the start of Eris-DB as the full permissioned blockchain node
diff --git a/Dockerfile b/Dockerfile
index b9f5c6430ad7d023af2814299a877a8cf7462d1d..540a0dc8b9f2bee36c3e20c90f1854c36a88ad67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Monax <support@monax.io>
# Install eris-db, a go app that manages relationships
ENV TARGET eris-db
-ENV REPO $GOPATH/src/github.com/eris-ltd/$TARGET
+ENV REPO $GOPATH/src/github.com/monax/$TARGET
ADD ./glide.yaml $REPO/
ADD ./glide.lock $REPO/
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 9f8249d9f14c6386647a55eb62980863fd538e6f..caff84703052021a14d1b8a72ac3fac6f9b65e5a 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -11,7 +11,7 @@ EXPOSE 46657
# install eris-db
# set the source code path and copy the repository in
-ENV ERIS_DB_SRC_PATH $GOPATH/src/github.com/eris-ltd/eris-db
+ENV ERIS_DB_SRC_PATH $GOPATH/src/github.com/monax/eris-db
COPY . $ERIS_DB_SRC_PATH
# fetch and install eris-db and its dependencies
@@ -28,7 +28,7 @@ RUN go get github.com/Masterminds/glide \
#-----------------------------------------------------------------------------
# install mint-client [to be deprecated]
-ENV ERIS_DB_MINT_REPO github.com/eris-ltd/mint-client
+ENV ERIS_DB_MINT_REPO github.com/monax/mint-client
ENV ERIS_DB_MINT_SRC_PATH $GOPATH/src/$ERIS_DB_MINT_REPO
WORKDIR $ERIS_DB_MINT_SRC_PATH
diff --git a/license.md b/LICENSE.md
similarity index 100%
rename from license.md
rename to LICENSE.md
diff --git a/Makefile b/Makefile
index a05fe57e210c74affc132397a405f4cee63813fb..acb6590ffc88b75014ff6c24f0ef41bcdbf08c49 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/eris-ltd/eris-db/... | grep -v /vendor/)
+PACKAGES_NOVENDOR := $(shell go list github.com/monax/eris-db/... | 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/eris-ltd/eris-db
+### Dependency management for github.com/monax/eris-db
# 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/eris-ltd/eris-db
+### Building github.com/monax/eris-db
-# build all targets in github.com/eris-ltd/eris-db
+# build all targets in github.com/monax/eris-db
.PHONY: build
build: check build_db build_client build_keys
-# build all targets in github.com/eris-ltd/eris-db with checks for race conditions
+# build all targets in github.com/monax/eris-db with checks for race conditions
.PHONY: build_race
build_race: check build_race_db build_race_client build_race_keys
@@ -118,7 +118,7 @@ build_race_client:
build_race_keys:
@echo "Marmots need to complete moving repository eris-keys into eris-db."
-### Testing github.com/eris-ltd/eris-db
+### Testing github.com/monax/eris-db
# test eris-db
.PHONY: test
@@ -130,7 +130,7 @@ test: build
test_race: build_race
@go test -race ${PACKAGES_NOVENDOR}
-### Build docker images for github.com/eris-ltd/eris-db
+### Build docker images for github.com/monax/eris-db
# build docker image for eris-db
.PHONY: build_docker_db
@@ -145,7 +145,7 @@ build_docker_db: check
@rm ${REPO}/target/docker/eris-client.dockerartefact
docker rmi ${DOCKER_NAMESPACE}/db:build-${COMMIT_SHA}
-### Test docker images for github.com/eris-ltd/eris-db
+### Test docker images for github.com/monax/eris-db
# test docker image for eris-db
.PHONY: test_docker_db
diff --git a/README.md b/README.md
index 10c36f2c0c5162a225aa65934561b18efafd6c98..ca40c388b11e6742b8c443113f2531bedc3e302c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# Eris-DB v0.16
-|[](https://godoc.org/github.com/eris-ltd/eris-db) | Linux |
+|[](https://godoc.org/github.com/monax/eris-db) | Linux |
|---|-------|
-| Master | [](https://circleci.com/gh/eris-ltd/eris-db/tree/master) |
-| Develop | [](https://circleci.com/gh/eris-ltd/eris-db/tree/develop) |
+| Master | [](https://circleci.com/gh/monax/eris-db/tree/master) |
+| Develop | [](https://circleci.com/gh/monax/eris-db/tree/develop) |
-Eris-db is Monax' permissioned blockchain client. It executes Ethereum smart contracts on a permissioned virtual machine. Eris-db provides transaction finality and high transaction throughput on proof-of-stake Tendermint consensus engine. For smart contract development most functionality is provided by `eris chains`, exposed through [eris](https://monax.io/docs/documentation/cli), the entry point for the Eris Platform.
+Eris-db is Monax' permissioned blockchain client. It executes Ethereum smart contracts on a permissioned virtual machine. Eris-db provides transaction finality and high transaction throughput on proof-of-stake Tendermint consensus engine. For smart contract development most functionality is provided by `eris chains`, exposed through [eris](https://monax.io/docs), the entry point for the Eris Platform.
## Table of Contents
@@ -36,11 +36,9 @@ Eris-db has been architected with a longer term vision on security and data priv
- **Secure Signing:** Monax is a legal engineering company; we partner with expert companies to natively support secure signing solutions going forward.
- **Multi-chain Universe (Step 1 of 3):** from the start the eris platform has been conceived for orchestrating many chains, as exemplified by the command “eris chains make†or by that transactions are only valid on the intended chain. Separating state into different chains is only the first of three steps towards privacy on smart contract chains (see future work below).
-See the [eris-db documentation](https://monax.io/docs/documentation/db/) for more information.
-
## Installation
-`eris-db` is intended to be used by the `eris chains` command via [eris](https://monax.io/docs/documentation/cli/latest/eris_chains). Available commands such as `make | start | stop | logs | inspect | update` are used for chain lifecycle management.
+`eris-db` is intended to be used by the `eris chains` command via [eris](https://monax.io/docs). Available commands such as `make | start | stop | logs | inspect | update` are used for chain lifecycle management.
### For Developers
Dependency management for eris-db is managed with [glide](github.com/Masterminds/glide), and you can build eris-db from source by following
@@ -49,8 +47,8 @@ Dependency management for eris-db 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/eris-ltd/eris-db`
-- `REPO=$($GOPATH/src/github.com/eris-ltd/eris-db)`
+- `go get -d github.com/monax/eris-db`
+- `REPO=$($GOPATH/src/github.com/monax/eris-db)`
- `cd $REPO && glide install`
- `cd $REPO/cmd/eris-db && go install`
@@ -59,15 +57,15 @@ To run `eris-db`, just type `$ eris-db 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 `~/.erisdb`.
-For a Vagrant file see [eris-vagrant](https://github.com/eris-ltd/eris-vagrant) for drafts or soon this repo for [Vagrant](https://github.com/eris-ltd/eris-db/issues/514) and Packer files.
+For a Vagrant file see [eris-vagrant](https://github.com/monax/eris-vagrant) for drafts or soon this repo for [Vagrant](https://github.com/monax/eris-db/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://monax.io/docs/documentation/db.js/), but it is possible to connect directly via HTTP or websocket. The JSON-RPC and web-api reference can be found [here](https://monax.io/docs/documentation/db/latest/specifications/api/).
+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/eris-db.js), but it is possible to connect directly via HTTP or websocket.
## Configuration
-A commented template config will be written as part of the `eris chains make` [process](https://monax.io/docs/documentation/cli/latest/eris_chains_make/) and can be edited prior to the `eris chains start` [process](https://monax.io/docs/documentation/cli/latest/eris_chains_start/).
+A commented template config will be written as part of the `eris chains make` [process](https://monax.io/docs/getting-started) and can be edited prior to the `eris chains start` [process](https://monax.io/docs/getting-started).
## Contribute
@@ -75,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/eris-ltd/eris-db/issues)
+- [here on Github](http://github.com/monax/eris-db/issues)
- [support.monax.io](http://support.monax.io)
- read the [Contributor file](.github/CONTRIBUTING.md)
@@ -85,4 +83,4 @@ Some burrows marmots have already started digging to build the enterprise ecosys
## License
-[Apache 2.0](license.md)
+[Apache 2.0](LICENSE.md)
diff --git a/account/account.go b/account/account.go
index d2f80c97cea0f46799374491247d3fc39524fe42..73ae59748b9454ac4f5e63e9958d79dd908b8675 100644
--- a/account/account.go
+++ b/account/account.go
@@ -23,8 +23,8 @@ import (
"fmt"
"io"
- "github.com/eris-ltd/eris-db/common/sanity"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ "github.com/monax/eris-db/common/sanity"
+ ptypes "github.com/monax/eris-db/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 6a738445b269ae6f1b511ce7c340ecae0ddb259c..41961f208bd43f1a3423a90d596f1434fcc7eaa6 100644
--- a/account/priv_account.go
+++ b/account/priv_account.go
@@ -21,7 +21,7 @@ package account
import (
"fmt"
- "github.com/eris-ltd/eris-db/common/sanity"
+ "github.com/monax/eris-db/common/sanity"
"github.com/tendermint/ed25519"
"github.com/tendermint/go-crypto"
diff --git a/blockchain/filter.go b/blockchain/filter.go
index 26ff58d107ce903a02709820f41e795c2363f0e3..c33ad3ce114e64ae03fcb5b88788238fd3dc9885 100644
--- a/blockchain/filter.go
+++ b/blockchain/filter.go
@@ -21,10 +21,10 @@ import (
"sync"
- blockchain_types "github.com/eris-ltd/eris-db/blockchain/types"
- core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/util/architecture"
+ blockchain_types "github.com/monax/eris-db/blockchain/types"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/util/architecture"
tendermint_types "github.com/tendermint/tendermint/types"
)
diff --git a/circle.yml b/circle.yml
index 12e7160c86c7b8b536bceb55f01f0d5a63246c4b..e27b3135d445f145272a7608737cde8314943ce4 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,7 +7,7 @@ machine:
ERIS_CLI_BRANCH: develop
GO15VENDOREXPERIMENT: 1
post:
- - git config --global user.email "billings@erisindustries.com"
+ - git config --global user.email "billings@monax.io"
- git config --global user.name "Billings the Bot"
- rm -rf ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}
- mkdir -p ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}
@@ -18,7 +18,7 @@ dependencies:
- sudo curl -L -o /usr/bin/docker http://s3-external-1.amazonaws.com/circle-downloads/docker-$DOCKER_VERSION-circleci; sudo chmod 0775 /usr/bin/docker; sudo usermod -a -G docker $USER; true
- sudo service docker start
# - sudo curl -sSL -o /usr/local/bin/docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-linux-x86_64; sudo chmod 0755 /usr/local/bin/docker-machine
- # - "go get github.com/eris-ltd/eris-cli/cmd/eris; cd ${GOPATH%%:*}/src/github.com/eris-ltd/eris-cli && git checkout origin/$ERIS_CLI_BRANCH && go install ./cmd/eris"
+ # - "go get github.com/monax/eris/cmd/eris; cd ${GOPATH%%:*}/src/github.com/monax/eris && git checkout origin/$ERIS_CLI_BRANCH && go install ./cmd/eris"
- "sudo apt-get update && sudo apt-get install -y libgmp3-dev"
# jq and curl is a dependency for the integration framework
- sudo apt-get install jq curl && go get github.com/Masterminds/glide
@@ -44,8 +44,6 @@ deployment:
# build docker image and tag the image with the version
- tests/build_tool.sh
- docker push quay.io/eris/db
- # push the updated documentation
- - docs/build.sh
release-0.16:
branch: release-0.16
commands:
@@ -53,8 +51,6 @@ deployment:
# build docker image and tag the image with the version
- tests/build_tool.sh
- docker push quay.io/eris/db
- # push the updated documentation
- - docs/build.sh
develop:
branch: develop
commands:
@@ -71,8 +67,6 @@ deployment:
# tag to allow for hotfixes
- tests/build_tool.sh latest
- docker push quay.io/eris/db
- # push the updated documentation and replace latest
- - docs/build.sh latest
tagged-releases:
tag: /v[0-9]+(\.[0-9]+)*/
commands:
@@ -82,8 +76,3 @@ deployment:
# considered immutable.
- tests/build_tool.sh
- docker push quay.io/eris/db
- # push the updated documentation
- - docs/build.sh
-
-
-
diff --git a/client/cmd/eris-client.go b/client/cmd/eris-client.go
index 681dc525b3dccfc7806f38e6de9bb256524934d7..d65551173449e900e9b63350f3b0546a2934ac8a 100644
--- a/client/cmd/eris-client.go
+++ b/client/cmd/eris-client.go
@@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/version"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/version"
)
// Global flags for persistent flags
@@ -35,7 +35,7 @@ var ErisClientCmd = &cobra.Command{
Made with <3 by Monax Industries.
-Complete documentation is available at https://monax.io/docs/documentation
+Complete documentation is available at https://monax.io/docs
` + "\nVERSION:\n " + version.VERSION,
Run: func(cmd *cobra.Command, args []string) { cmd.Help() },
}
diff --git a/client/cmd/eris-client/main.go b/client/cmd/eris-client/main.go
index 7dd05955cc42c71affe202f9ba9ece27d10919ac..3f89792603a2a4d6fec6593f24d111ebab3861d4 100644
--- a/client/cmd/eris-client/main.go
+++ b/client/cmd/eris-client/main.go
@@ -15,7 +15,7 @@
package main
import (
- commands "github.com/eris-ltd/eris-db/client/cmd"
+ commands "github.com/monax/eris-db/client/cmd"
)
func main() {
diff --git a/client/cmd/genesis.go b/client/cmd/genesis.go
index 5b480e0818935ecf00d7991759fbbaabf3295a5b..9082eec88185fb9b521eb9c48d7c29784ff9ff74 100644
--- a/client/cmd/genesis.go
+++ b/client/cmd/genesis.go
@@ -17,8 +17,8 @@ package commands
import (
"fmt"
- "github.com/eris-ltd/eris-db/common/sanity"
- "github.com/eris-ltd/eris-db/genesis"
+ "github.com/monax/eris-db/common/sanity"
+ "github.com/monax/eris-db/genesis"
"github.com/spf13/cobra"
)
diff --git a/client/cmd/status.go b/client/cmd/status.go
index 4b5b11afb47105ca3aa506c5e4910ba2f4bacd29..556db5e982c6b9d0472e31e8059b82c911c8315f 100644
--- a/client/cmd/status.go
+++ b/client/cmd/status.go
@@ -17,8 +17,8 @@ package commands
import (
"github.com/spf13/cobra"
- "github.com/eris-ltd/eris-db/client/methods"
- "github.com/eris-ltd/eris-db/util"
+ "github.com/monax/eris-db/client/methods"
+ "github.com/monax/eris-db/util"
)
func buildStatusCommand() *cobra.Command {
diff --git a/client/cmd/transaction.go b/client/cmd/transaction.go
index 28af969f90cde0adff6f2a73abfd3aed4bb62294..d7fcb83fd9419200789e2069ef0b22d54e8f7585 100644
--- a/client/cmd/transaction.go
+++ b/client/cmd/transaction.go
@@ -19,8 +19,8 @@ import (
"github.com/spf13/cobra"
- "github.com/eris-ltd/eris-db/client/methods"
- "github.com/eris-ltd/eris-db/util"
+ "github.com/monax/eris-db/client/methods"
+ "github.com/monax/eris-db/util"
)
func buildTransactionCommand() *cobra.Command {
diff --git a/client/methods/call.go b/client/methods/call.go
index 86c793983fdde5b09b685fd3b939c71d7ad59932..ebfcf25f97eede6587f09be7821cbbeba3c33055 100644
--- a/client/methods/call.go
+++ b/client/methods/call.go
@@ -17,10 +17,10 @@ package methods
import (
"fmt"
- "github.com/eris-ltd/eris-db/client"
- "github.com/eris-ltd/eris-db/client/rpc"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/keys"
+ "github.com/monax/eris-db/client"
+ "github.com/monax/eris-db/client/rpc"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/keys"
)
func Call(do *definitions.ClientDo) error {
diff --git a/client/methods/helpers.go b/client/methods/helpers.go
index a97c92c104bdf3ee08f1d3d99c9d7c281eb21b36..88861be6b9c5dde7b47d5019d37b58d829806557 100644
--- a/client/methods/helpers.go
+++ b/client/methods/helpers.go
@@ -15,12 +15,12 @@
package methods
import (
- "github.com/eris-ltd/eris-db/client/rpc"
- "github.com/eris-ltd/eris-db/core"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/lifecycle"
- "github.com/eris-ltd/eris-db/logging/loggers"
+ "github.com/monax/eris-db/client/rpc"
+ "github.com/monax/eris-db/core"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/lifecycle"
+ "github.com/monax/eris-db/logging/loggers"
)
func unpackSignAndBroadcast(result *rpc.TxResult, logger loggers.InfoTraceLogger) {
diff --git a/client/methods/send.go b/client/methods/send.go
index 8fa10230200098111a282e43696c591118c93e8b..e0c608d8487a16d9ec677d0f59a500733b62dcc5 100644
--- a/client/methods/send.go
+++ b/client/methods/send.go
@@ -17,10 +17,10 @@ package methods
import (
"fmt"
- "github.com/eris-ltd/eris-db/client"
- "github.com/eris-ltd/eris-db/client/rpc"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/keys"
+ "github.com/monax/eris-db/client"
+ "github.com/monax/eris-db/client/rpc"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/keys"
)
func Send(do *definitions.ClientDo) error {
diff --git a/client/methods/status.go b/client/methods/status.go
index f1fb6348495fa962818d8d4dd27e1dab20fe0167..070d8c4bdbb4de1a60303c5878718125db309824 100644
--- a/client/methods/status.go
+++ b/client/methods/status.go
@@ -17,8 +17,8 @@ package methods
import (
"fmt"
- "github.com/eris-ltd/eris-db/client"
- "github.com/eris-ltd/eris-db/definitions"
+ "github.com/monax/eris-db/client"
+ "github.com/monax/eris-db/definitions"
)
func Status(do *definitions.ClientDo) error {
diff --git a/client/mock/client_mock.go b/client/mock/client_mock.go
index f1e80895ff184f0f39ffd9dec3d5004d83afc852..b8d6e55826d156b977f6e8d4b9f80399d3b60994 100644
--- a/client/mock/client_mock.go
+++ b/client/mock/client_mock.go
@@ -17,12 +17,12 @@ package mock
import (
"github.com/tendermint/go-crypto"
- acc "github.com/eris-ltd/eris-db/account"
- . "github.com/eris-ltd/eris-db/client"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/logging/loggers"
- "github.com/eris-ltd/eris-db/txs"
+ acc "github.com/monax/eris-db/account"
+ . "github.com/monax/eris-db/client"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/logging/loggers"
+ "github.com/monax/eris-db/txs"
)
// NOTE [ben] Compiler check to ensure ErisMockClient successfully implements
diff --git a/client/node_client.go b/client/node_client.go
index 56dd425e22498741cb6efae6c6e381111a20e24d..ab71bd678623e8572514b6b3087b358700ee5614 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/eris-ltd/eris-db/account"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
- tendermint_client "github.com/eris-ltd/eris-db/rpc/tendermint/client"
- tendermint_types "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
+ acc "github.com/monax/eris-db/account"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
+ tendermint_client "github.com/monax/eris-db/rpc/tendermint/client"
+ tendermint_types "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/txs"
tmLog15 "github.com/tendermint/log15"
)
diff --git a/client/rpc/client.go b/client/rpc/client.go
index d82a5f9448065f970525b5624ac969b1da8bd4ad..02cf9594c41f1de1902d4b53072cb5e990f4afbb 100644
--- a/client/rpc/client.go
+++ b/client/rpc/client.go
@@ -19,11 +19,11 @@ import (
"fmt"
"strconv"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ ptypes "github.com/monax/eris-db/permission/types"
- "github.com/eris-ltd/eris-db/client"
- "github.com/eris-ltd/eris-db/keys"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/client"
+ "github.com/monax/eris-db/keys"
+ "github.com/monax/eris-db/txs"
)
//------------------------------------------------------------------------------------
diff --git a/client/rpc/client_test.go b/client/rpc/client_test.go
index b0806910fe73f91547a3b15b7d5c1f1163974567..1b32dfeb60f04bea9b14a904c059d9ba2293f78b 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/eris-ltd/eris-db/client/mock"
- mockkeys "github.com/eris-ltd/eris-db/keys/mock"
+ mockclient "github.com/monax/eris-db/client/mock"
+ mockkeys "github.com/monax/eris-db/keys/mock"
)
func Test(t *testing.T) {
diff --git a/client/rpc/client_util.go b/client/rpc/client_util.go
index f086c68b2329866c17f6c5c92a128e5e255cc974..2dd92b5c91e94770ac2b71cf5135ac67e18f4773 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/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/client"
- "github.com/eris-ltd/eris-db/keys"
- "github.com/eris-ltd/eris-db/logging"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- "github.com/eris-ltd/eris-db/txs"
+ acc "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/client"
+ "github.com/monax/eris-db/keys"
+ "github.com/monax/eris-db/logging"
+ ptypes "github.com/monax/eris-db/permission/types"
+ "github.com/monax/eris-db/txs"
)
//------------------------------------------------------------------------------------
diff --git a/client/websocket_client.go b/client/websocket_client.go
index d3949e652f2ab40ee357bdb95910f9032626e938..5d36c483feb6738268c35b3b1983505d2766ed7a 100644
--- a/client/websocket_client.go
+++ b/client/websocket_client.go
@@ -22,10 +22,10 @@ import (
"github.com/tendermint/go-rpc/client"
"github.com/tendermint/go-wire"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
- ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
+ ctypes "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/txs"
)
const (
@@ -121,12 +121,17 @@ func (erisNodeWebsocketClient *erisNodeWebsocketClient) WaitForConfirmation(tx t
continue
}
+ // NOTE: [ben] hotfix on 0.16.1 because NewBlock events to arrive seemingly late
+ // we now miss events because of this redundant check; This check is safely removed
+ // because for CallTx on checking the transaction is not run in the EVM and no false
+ // positive event can be sent; neither is this check a good check for that.
+
// we don't accept events unless they came after a new block (ie. in)
- if latestBlockHash == nil {
- logging.InfoMsg(erisNodeWebsocketClient.logger, "First block has not been registered so ignoring event",
- "event", event.Event)
- continue
- }
+ // if latestBlockHash == nil {
+ // logging.InfoMsg(erisNodeWebsocketClient.logger, "First block has not been registered so ignoring event",
+ // "event", event.Event)
+ // continue
+ // }
if event.Event != eid {
logging.InfoMsg(erisNodeWebsocketClient.logger, "Received unsolicited event",
diff --git a/cmd/eris-db.go b/cmd/eris-db.go
index c0f6e582441b707f9655a4809cca054e4f66c136..0530d7524bbd022bcf0c9a08828f11c9a2f146c2 100644
--- a/cmd/eris-db.go
+++ b/cmd/eris-db.go
@@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/version"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/version"
)
var ErisDbCmd = &cobra.Command{
@@ -34,7 +34,7 @@ your needs.
Made with <3 by Monax Industries.
-Complete documentation is available at https://monax.io/docs/documentation
+Complete documentation is available at https://monax.io/docs
` + "\nVERSION:\n " + version.VERSION,
Run: func(cmd *cobra.Command, args []string) { cmd.Help() },
}
diff --git a/cmd/eris-db/main.go b/cmd/eris-db/main.go
index d293b374f4e5c8919860293a9534e63b576f9bf6..1366258ce126e8a46c9f7b590534ca965df808b4 100644
--- a/cmd/eris-db/main.go
+++ b/cmd/eris-db/main.go
@@ -15,7 +15,7 @@
package main
import (
- commands "github.com/eris-ltd/eris-db/cmd"
+ commands "github.com/monax/eris-db/cmd"
)
func main() {
diff --git a/cmd/serve.go b/cmd/serve.go
index 4eceefc3810603f8fb3e091ce09317a1606b2c1b..ef312702aa80516b12d1399a98b4eea235cb82a9 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -21,11 +21,12 @@ import (
"path"
"syscall"
- "github.com/eris-ltd/eris-db/core"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/lifecycle"
- "github.com/eris-ltd/eris-db/util"
+ "github.com/monax/eris-db/core"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/lifecycle"
+ "github.com/monax/eris-db/util"
+ vm "github.com/monax/eris-db/manager/eris-mint/evm"
"github.com/spf13/cobra"
)
@@ -161,6 +162,8 @@ func ServeRunner(do *definitions.Do) func(*cobra.Command, []string) {
DefaultConfigFilename)
}
+ vm.SetDebug(do.Debug)
+
newCore, err := NewCoreFromDo(do)
if err != nil {
diff --git a/common/random/random.go b/common/random/random.go
index e2a095e2a559980abf7ba3a5ea105c491baaeec8..cfa3b58f94b8e7cdcd959eacd7f7be9cdd5a1912 100644
--- a/common/random/random.go
+++ b/common/random/random.go
@@ -19,7 +19,7 @@ import (
"math/rand"
"time"
- "github.com/eris-ltd/eris-db/common/sanity"
+ "github.com/monax/eris-db/common/sanity"
)
const (
diff --git a/consensus/config.go b/consensus/config.go
index 05cc488f158d93dde57ec0ab46326d29b76b13a5..c5039719dc60b26d43944dd249dcc7e45b8ced34 100644
--- a/consensus/config.go
+++ b/consensus/config.go
@@ -15,8 +15,8 @@
package consensus
import (
- // noops "github.com/eris-ltd/eris-db/consensus/noops"
- tendermint "github.com/eris-ltd/eris-db/consensus/tendermint"
+ // noops "github.com/monax/eris-db/consensus/noops"
+ tendermint "github.com/monax/eris-db/consensus/tendermint"
)
//------------------------------------------------------------------------------
diff --git a/consensus/consensus.go b/consensus/consensus.go
index 77b7ffff3e0b6a9be768bca2f7de5450e7c6bc2b..df94a4580dcd7a1bbac22114b87f66e9b55c29aa 100644
--- a/consensus/consensus.go
+++ b/consensus/consensus.go
@@ -17,9 +17,9 @@ package consensus
import (
"fmt"
- config "github.com/eris-ltd/eris-db/config"
- tendermint "github.com/eris-ltd/eris-db/consensus/tendermint"
- definitions "github.com/eris-ltd/eris-db/definitions"
+ config "github.com/monax/eris-db/config"
+ tendermint "github.com/monax/eris-db/consensus/tendermint"
+ definitions "github.com/monax/eris-db/definitions"
)
func LoadConsensusEngineInPipe(moduleConfig *config.ModuleConfig,
diff --git a/consensus/tendermint/config.go b/consensus/tendermint/config.go
index b8c89d241d175d442b1550b09619b852a37f7b2c..1ee8c13e0bb9f55424dcfaa76c4eee318eaad405 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/eris-ltd/eris-db/config"
+ "github.com/monax/eris-db/config"
)
// NOTE [ben] Compiler check to ensure TendermintConfig successfully implements
diff --git a/consensus/tendermint/tendermint.go b/consensus/tendermint/tendermint.go
index 2eda6171daa4742efe486bb1c958128299fb99e0..89008be0e7a61f1795ae20f4d883f273ebab3792 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/eris-ltd/eris-db/event"
-
- config "github.com/eris-ltd/eris-db/config"
- manager_types "github.com/eris-ltd/eris-db/manager/types"
- // files "github.com/eris-ltd/eris-db/files"
- blockchain_types "github.com/eris-ltd/eris-db/blockchain/types"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
- "github.com/eris-ltd/eris-db/txs"
+ edb_event "github.com/monax/eris-db/event"
+
+ config "github.com/monax/eris-db/config"
+ manager_types "github.com/monax/eris-db/manager/types"
+ // files "github.com/monax/eris-db/files"
+ blockchain_types "github.com/monax/eris-db/blockchain/types"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
+ "github.com/monax/eris-db/txs"
"github.com/tendermint/go-wire"
)
diff --git a/consensus/tendermint/version.go b/consensus/tendermint/version.go
index 78ed5dea5ec3df5e07a19520959e371e8f2ece73..1729a2d19227f23af12a034d64fd3f111ff4a011 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/eris-ltd/eris-db/version"
+ version "github.com/monax/eris-db/version"
)
const (
diff --git a/consensus/types/consensus_engine.go b/consensus/types/consensus_engine.go
index 191bc6e4cbd771803d56d889b8bcc22508ba6386..03de76f7d05305878a31621942c247da799a7459 100644
--- a/consensus/types/consensus_engine.go
+++ b/consensus/types/consensus_engine.go
@@ -15,8 +15,8 @@
package types
import (
- "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/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 9090c28ae91fa7fa79ffaaa997b71afec47672b3..e20166341e7cedb041f47e62504a9be379bd7de0 100644
--- a/core/config.go
+++ b/core/config.go
@@ -23,14 +23,14 @@ import (
"os"
"path"
- "github.com/eris-ltd/eris-db/config"
- "github.com/eris-ltd/eris-db/consensus"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/manager"
- "github.com/eris-ltd/eris-db/server"
- "github.com/eris-ltd/eris-db/util"
- "github.com/eris-ltd/eris-db/version"
+ "github.com/monax/eris-db/config"
+ "github.com/monax/eris-db/consensus"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/manager"
+ "github.com/monax/eris-db/server"
+ "github.com/monax/eris-db/util"
+ "github.com/monax/eris-db/version"
"github.com/spf13/viper"
)
diff --git a/core/core.go b/core/core.go
index 14725b6c2ac137df77f856577f25e897ddc432c2..5efbe8c35a20bfb2b269c9904e40523ff90c4fec 100644
--- a/core/core.go
+++ b/core/core.go
@@ -20,19 +20,19 @@ import (
// TODO: [ben] swap out go-events with eris-db/event (currently unused)
events "github.com/tendermint/go-events"
- "github.com/eris-ltd/eris-db/config"
- "github.com/eris-ltd/eris-db/consensus"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/manager"
+ "github.com/monax/eris-db/config"
+ "github.com/monax/eris-db/consensus"
+ "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/manager"
// rpc_v0 is carried over from Eris-DBv0.11 and before on port 1337
- rpc_v0 "github.com/eris-ltd/eris-db/rpc/v0"
+ rpc_v0 "github.com/monax/eris-db/rpc/v0"
// rpc_tendermint is carried over from Eris-DBv0.11 and before on port 46657
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
- rpc_tendermint "github.com/eris-ltd/eris-db/rpc/tendermint/core"
- "github.com/eris-ltd/eris-db/server"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
+ rpc_tendermint "github.com/monax/eris-db/rpc/tendermint/core"
+ "github.com/monax/eris-db/server"
)
// Core is the high-level structure
diff --git a/core/types/types.go b/core/types/types.go
index abe9fd0c924b8ca2560da4a9365f8de0e5418002..6e970dab7c955cc55be66dfee0bfb30c208345f8 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/eris-ltd/eris-db/account"
+ account "github.com/monax/eris-db/account"
)
type (
diff --git a/definitions/do.go b/definitions/do.go
index e89b69ffb375bd3a255dec6097c60a69591485f7..4a99734afda53bbb7e378f65c4cca8837bab695c 100644
--- a/definitions/do.go
+++ b/definitions/do.go
@@ -20,7 +20,7 @@ import (
viper "github.com/spf13/viper"
- util "github.com/eris-ltd/eris-db/util"
+ util "github.com/monax/eris-db/util"
)
type Do struct {
diff --git a/definitions/pipe.go b/definitions/pipe.go
index e00e46ed80fb10674222a55c29c92f276e814632..d771f3b9f6faac072c62b390db047857a6715a1f 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/eris-ltd/eris-db/account"
- blockchain_types "github.com/eris-ltd/eris-db/blockchain/types"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- core_types "github.com/eris-ltd/eris-db/core/types"
- types "github.com/eris-ltd/eris-db/core/types"
- event "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/logging/loggers"
- manager_types "github.com/eris-ltd/eris-db/manager/types"
- "github.com/eris-ltd/eris-db/txs"
+ account "github.com/monax/eris-db/account"
+ blockchain_types "github.com/monax/eris-db/blockchain/types"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ core_types "github.com/monax/eris-db/core/types"
+ types "github.com/monax/eris-db/core/types"
+ event "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/logging/loggers"
+ manager_types "github.com/monax/eris-db/manager/types"
+ "github.com/monax/eris-db/txs"
)
type Pipe interface {
diff --git a/definitions/tendermint_pipe.go b/definitions/tendermint_pipe.go
index 8fd5a9bb5e3dd75f59336b63825788e10cbe07ba..b36257813d8d56d79f794fc3de934a70566964b6 100644
--- a/definitions/tendermint_pipe.go
+++ b/definitions/tendermint_pipe.go
@@ -15,9 +15,9 @@
package definitions
import (
- "github.com/eris-ltd/eris-db/account"
- rpc_tm_types "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/account"
+ rpc_tm_types "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/txs"
)
// NOTE: [ben] TendermintPipe is the additional pipe to carry over
diff --git a/docs/build.sh b/docs/build.sh
deleted file mode 100755
index ac790cbf584c12877fe8596574a18c8c01c2cd33..0000000000000000000000000000000000000000
--- a/docs/build.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-# -------------------------------------------------------------------
-# Set vars (change if used in another repo)
-
-base_name=eris-db
-user_name=eris-ltd
-docs_site=monax.io
-docs_name=./docs/documentation
-slim_name=db
-
-# -------------------------------------------------------------------
-# Set vars (usually shouldn't be changed)
-
-if [ "$CIRCLE_BRANCH" ]
-then
- repo=`pwd`
-else
- repo=$GOPATH/src/github.com/$user_name/$base_name
-fi
-release_min=$(cat $repo/version/version.go | tail -n 1 | cut -d \ -f 4 | tr -d '"')
-start=`pwd`
-
-# -------------------------------------------------------------------
-# Build
-
-cd $repo
-rm -rf $docs_name
-go run ./docs/generator.go
-
-if [[ "$1" == "latest" ]]
-then
- mkdir -p $docs_name/$slim_name/latest
- rsync -av $docs_name/$slim_name/$release_min/ $docs_name/$slim_name/latest/
- find $docs_name/latest -type f -name "*.md" -exec sed -i "s/$release_min/latest/g" {} +
-fi
-
-tmp_dir=`mktemp -d 2>/dev/null || mktemp -d -t 'tmp_dir'`
-git clone git@github.com:$user_name/$docs_site.git $tmp_dir/$docs_site
-
-rsync -av $docs_name $tmp_dir/$docs_site/content/docs/
-
-# ------------------------------------------------------------------
-# Commit and push if there are changes
-
-cd $tmp_dir/$docs_site
-if [ -z "$(git status --porcelain)" ]; then
- echo "All Good!"
-else
- git add -A :/ &&
- git commit -m "$base_name build number $CIRCLE_BUILD_NUM doc generation" &&
- git push origin master
-fi
-
-# ------------------------------------------------------------------
-# Cleanup
-
-rm -rf $tmp_dir
-cd $start
\ No newline at end of file
diff --git a/docs/generator.go b/docs/generator.go
deleted file mode 100644
index 404b1593fcec1b9bc8cd2c0ba6c679c60854bb71..0000000000000000000000000000000000000000
--- a/docs/generator.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2017 Monax Industries Limited
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
- "fmt"
- "io/ioutil"
- "os"
- "strings"
- "text/template"
-
- commands "github.com/eris-ltd/eris-db/cmd"
- docs "github.com/eris-ltd/eris-db/docs/generator"
-
- clientCommands "github.com/eris-ltd/eris-db/client/cmd"
- "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/version"
- "github.com/spf13/cobra"
-)
-
-// Repository maintainers should customize the next two lines.
-var Description = "Blockchain Client" // should match the docs site name
-var RenderDir = fmt.Sprintf("./docs/documentation/db/%s/", version.VERSION) // should be the "shortversion..."
-
-// The below variables should be updated only if necessary.
-var Specs = []*docs.Entry{}
-var Examples = []*docs.Entry{}
-var SpecsDir = "./docs/specs"
-var ExamplesDir = "./docs/examples"
-
-type Cmd struct {
- Command *cobra.Command
- Entry *docs.Entry
- Description string
-}
-
-func RenderFiles(cmdRaw *cobra.Command, tmpl *template.Template) error {
- this_entry := &docs.Entry{
- Title: cmdRaw.CommandPath(),
- Specifications: Specs,
- Examples: Examples,
- BaseURL: strings.Replace(RenderDir, ".", "", 1),
- Template: tmpl,
- FileName: docs.GenerateFileName(RenderDir, cmdRaw.CommandPath()),
- }
-
- cmd := &Cmd{
- Command: cmdRaw,
- Entry: this_entry,
- Description: Description,
- }
-
- for _, command := range cmd.Command.Commands() {
- RenderFiles(command, tmpl)
- }
-
- if !cmd.Command.HasParent() {
- entries := append(cmd.Entry.Specifications, cmd.Entry.Examples...)
- for _, entry := range entries {
- entry.Specifications = cmd.Entry.Specifications
- entry.Examples = cmd.Entry.Examples
- entry.CmdEntryPoint = cmd.Entry.Title
- entry.BaseURL = cmd.Entry.BaseURL
- if err := docs.RenderEntry(entry); err != nil {
- return err
- }
- }
- }
-
- outFile, err := os.Create(cmd.Entry.FileName)
- if err != nil {
- return err
- }
- defer outFile.Close()
-
- err = cmd.Entry.Template.Execute(outFile, cmd)
- if err != nil {
- return err
- }
-
- return nil
-}
-
-func AddClientToDB(dbCmd, clientCmd *cobra.Command) error {
- // formulate the filenames properly
- dbFile := docs.GenerateFileName(RenderDir, dbCmd.CommandPath())
- clFile := docs.GenerateFileName(RenderDir, clientCmd.CommandPath())
-
- // get the manual additions sorted
- dbAdditions := []byte(fmt.Sprintf("\n# Related Commands\n\n* [%s](%s)", "Eris Client", docs.GenerateURLFromFileName(clFile)))
- clAdditions := []byte(fmt.Sprintf("\n# Related Commands\n\n* [%s](%s)", "Eris DB", docs.GenerateURLFromFileName(dbFile)))
-
- // read and write the db file
- dbTxt, err := ioutil.ReadFile(dbFile)
- if err != nil {
- return err
- }
- dbTxt = append(dbTxt, dbAdditions...)
- err = ioutil.WriteFile(dbFile, dbTxt, 0644)
- if err != nil {
- return err
- }
-
- // read and write the client file
- clTxt, err := ioutil.ReadFile(clFile)
- if err != nil {
- return err
- }
- clTxt = append(clTxt, clAdditions...)
- err = ioutil.WriteFile(clFile, clTxt, 0644)
- if err != nil {
- return err
- }
-
- return nil
-}
-
-func main() {
- // Repository maintainers should populate the top level command object.
- erisDbCommand := commands.ErisDbCmd
- do := definitions.NewDo()
- commands.AddGlobalFlags(do)
- commands.AddCommands(do)
-
- erisClientCommand := clientCommands.ErisClientCmd
- clientCommands.InitErisClientInit()
- clientCommands.AddClientCommands()
-
- // Make the proper directory.
- var err error
- if _, err = os.Stat(RenderDir); os.IsNotExist(err) {
- err = os.MkdirAll(RenderDir, 0755)
- if err != nil {
- panic(err)
- }
- }
-
- // Generate specs and examples files.
- Specs, err = docs.GenerateEntries(SpecsDir, (RenderDir + "specifications/"), Description)
- if err != nil {
- panic(err)
- }
- Examples, err = docs.GenerateEntries(ExamplesDir, (RenderDir + "examples/"), Description)
- if err != nil {
- panic(err)
- }
-
- // Get template from docs generator.
- tmpl, err := docs.GenerateCommandsTemplate()
- if err != nil {
- panic(err)
- }
-
- // Render the templates.
- if err = RenderFiles(erisDbCommand, tmpl); err != nil {
- panic(err)
- }
-
- if err = RenderFiles(erisClientCommand, tmpl); err != nil {
- panic(err)
- }
-
- if err = AddClientToDB(erisDbCommand, erisClientCommand); err != nil {
- panic(err)
- }
-}
diff --git a/docs/generator/generator.go b/docs/generator/generator.go
deleted file mode 100644
index 296704a4841d3a652fc0eb2090088f2c15863a2b..0000000000000000000000000000000000000000
--- a/docs/generator/generator.go
+++ /dev/null
@@ -1,347 +0,0 @@
-// Copyright 2017 Monax Industries Limited
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package generator
-
-import (
- "bufio"
- "fmt"
- "io"
- "io/ioutil"
- "os"
- "path/filepath"
- "regexp"
- "strconv"
- "strings"
- "text/template"
-)
-
-const FrontMatter = `---
-
-layout: single
-type: docs
-title: "Documentation | {{ .Description }} | {{ $name }}"
-
----`
-
-type Entry struct {
- Title string
- Template *template.Template
- Specifications []*Entry
- Examples []*Entry
- Description string
- FileName string
- CmdEntryPoint string
- URL string
- BaseURL string
-}
-
-func GenerateFileName(dir, s string) string {
- return (dir + strings.Replace(strings.ToLower(s), " ", "_", -1) + ".md")
-}
-
-func GenerateTitleFromFileName(file string) string {
- file = strings.Replace(file, "_", " ", -1)
- file = strings.Replace(file, "-", " ", -1)
- return strings.Title(strings.Replace(file, ".md", "", 1))
-}
-
-func GenerateFileNameFromGlob(dir, s string) string {
- return (dir + strings.Replace(filepath.Base(s), " ", "_", -1))
-}
-
-func GenerateURLFromFileName(s string) string {
- s = strings.Replace(s, "./", "/", 1)
- return strings.Replace(s, ".md", "/", -1)
-}
-
-func GenerateCommandsTemplate() (*template.Template, error) {
- handle_link := func(s string) string {
- return (strings.Replace(s, ".md", "/", -1))
- }
-
- handle_file := func(s1, s2 string) string {
- return strings.Replace((s1 + " " + s2 + ".md"), " ", "_", -1)
- }
-
- funcMap := template.FuncMap{
- "title": strings.Title,
- "replace": strings.Replace,
- "chomp": strings.TrimSpace,
- "handle_file": handle_file,
- "handle_link": handle_link,
- }
-
- var templateText = `{{- $name := .Command.CommandPath -}}` + FrontMatter + `
-
-# {{ $name }}
-
-{{ title .Command.Short }}
-
-{{ if .Command.Runnable }}## Usage
-
-` + "```bash\n{{ .Command.UseLine }}\n```" + `{{ end }}
-
-{{ if ne .Command.Long "" }}## Synopsis
-
-{{ .Command.Long }}
-{{ end }}
-{{ $flags := .Command.NonInheritedFlags }}
-{{ if $flags.HasFlags }}## Options
-
-` + "```bash\n {{ $flags.FlagUsages | chomp }}\n```" + `{{ end }}
-{{ $global_flags := .Command.InheritedFlags }}
-{{ if $global_flags.HasFlags }}## Options inherited from parent commands
-
-` + "```bash\n {{ $global_flags.FlagUsages | chomp }}\n```" + `{{ end }}
-
-{{ if .Command.HasSubCommands }}# Subcommands
-{{ range .Command.Commands }}
-{{ if ne .Deprecated "" }}
-* [{{ $name }} {{ .Name }}]({{ .BaseURL }}{{ handle_file $name .Name | handle_link }}) - {{ .Short }}
-{{ end }}
-{{ end }}
-{{ end }}
-
-{{ if .Command.HasParent }}{{ $parent := .Command.Parent }}## See Also
-* [{{ $parent.CommandPath }}]({{ .BaseURL }}{{ handle_file $parent.CommandPath "" | handle_link }}) - {{ $parent.Short }}
-{{ end }}
-
-{{ if ne .Command.Example "" }}# Quick Tips
-
-` + "```bash\n{{ .Command.Example }}\n```" + `{{ end }}
-
-{{ if ne (len .Entry.Examples) 0 }}# Examples
-{{ range .Entry.Examples }}
-* [{{ title .Title }}]({{ .URL }})
-{{- end }}
-{{ end }}
-
-{{ if ne (len .Entry.Specifications) 0 }}# Specifications
-{{ range .Entry.Specifications }}
-* [{{ title .Title }}]({{ .URL }})
-{{- end }}
-{{ end }}
-`
-
- return template.New("docGenerator").Funcs(funcMap).Parse(templateText)
-}
-
-func GenerateEntries(dir, render_dir, description string) ([]*Entry, error) {
- var entries []*Entry
-
- if _, err := os.Stat(render_dir); os.IsNotExist(err) {
- err = os.MkdirAll(render_dir, 0755)
- if err != nil {
- panic(err)
- }
- }
-
- files := CollectEntries(dir)
-
- for _, file := range files {
- this_entry, err := GenerateEntry(file, dir, render_dir, description)
- if err != nil {
- return nil, err
- } else {
- entries = append(entries, this_entry)
- }
- }
-
- return entries, nil
-}
-
-func CollectEntries(dir string) []string {
- var newFiles []string
-
- files, err := filepath.Glob(dir + "/*")
- if err != nil {
- panic(err)
- }
-
- for _, file := range files {
- f_info, err := os.Stat(file)
-
- if err != nil {
- panic(err)
- }
-
- if f_info.IsDir() {
- newFiles = append(newFiles, CollectEntries(file)...)
- } else {
- if filepath.Ext(file) == ".md" {
- newFiles = append(newFiles, file)
- }
- }
- }
-
- return newFiles
-}
-
-func GenerateEntry(file, dir, render_dir, description string) (*Entry, error) {
- var err error
-
- this_entry := &Entry{
- FileName: GenerateFileNameFromGlob(render_dir, file),
- Title: GenerateTitleFromFileName(filepath.Base(file)),
- Description: description,
- }
-
- this_entry.URL = GenerateURLFromFileName(this_entry.FileName)
-
- txt, err := ioutil.ReadFile(file)
- if err != nil {
- return nil, err
- }
-
- // Get template from docs generator
- this_entry.Template, err = GenerateEntriesTemplate(txt)
- if err != nil {
- return nil, err
- }
-
- return this_entry, nil
-}
-
-func GenerateEntriesTemplate(txt []byte) (*template.Template, error) {
- handle_link := func(s string) string {
- return (strings.Replace(s, ".md", "/", -1))
- }
-
- handle_file := func(s1 string) string {
- return strings.Replace((s1 + ".md"), " ", "_", -1)
- }
-
- insert_definition := func(file string, struc string) string {
- txt, err := ioutil.ReadFile(filepath.Join("definitions", file))
- if err != nil {
- panic(err)
- }
- finder := regexp.MustCompile(fmt.Sprintf(`(?ms:^type %s struct {.*?^})`, struc))
- return ("```go\n" + string(finder.Find(txt)) + "\n```")
- }
-
- insert_bash_lines := func(file string, linesToRead string) string {
- var lines []byte
- var line []byte
- var start int
- var stop int
-
- fileInfo, err := os.Open(filepath.Join("docs", "tests", file))
- if err != nil {
- panic(err)
- }
- defer fileInfo.Close()
-
- start, err = strconv.Atoi(strings.Split(linesToRead, "-")[0])
- if strings.Contains(linesToRead, "-") {
- stop, err = strconv.Atoi(strings.Split(linesToRead, "-")[1])
- } else {
- stop = start
- }
- if err != nil {
- panic(err)
- }
-
- r := bufio.NewReader(fileInfo)
- for i := 1; ; i++ {
- line, err = r.ReadBytes('\n')
- if err != nil {
- break
- }
- if i >= start && i <= stop {
- lines = append(lines, line...)
- }
- }
- if err != io.EOF {
- panic(err)
- }
-
- return ("```bash\n" + string(lines) + "```")
- }
-
- insert_file := func(file string) string {
- file = filepath.Join("docs", "tests", file)
- ext := filepath.Ext(file)
- switch ext {
- case ".sol":
- ext = ".javascript"
- case ".yml":
- ext = ".yaml"
- }
-
- ext = strings.Replace(ext, ".", "", 1)
-
- txtB, err := ioutil.ReadFile(file)
- if err != nil {
- panic(err)
- }
-
- txt := string(txtB)
- if !strings.HasSuffix(txt, "\n") {
- txt = txt + "\n"
- }
-
- return ("```" + ext + "\n" + txt + "```") // TODO: add auto-curl text
- }
-
- funcMap := template.FuncMap{
- "title": strings.Title,
- "replace": strings.Replace,
- "chomp": strings.TrimSpace,
- "handle_file": handle_file,
- "handle_link": handle_link,
- "insert_definition": insert_definition,
- "insert_bash_lines": insert_bash_lines,
- "insert_file": insert_file,
- }
-
- var templateText = `{{- $name := .Title -}}` + FrontMatter + `
-
-` + string(txt) + `
-
-## Commands
-
-* [{{ .CmdEntryPoint }}]({{ .BaseURL }}{{ handle_file .CmdEntryPoint | handle_link }})
-
-{{ if ne (len .Examples) 0 }}# Examples
-{{ range .Examples }}
-* [{{ title .Title }}]({{ .URL }})
-{{- end }}
-{{ end }}
-
-{{ if ne (len .Specifications) 0 }}# Specifications
-{{ range .Specifications }}
-* [{{ title .Title }}]({{ .URL }})
-{{- end }}
-{{ end }}
-`
-
- return template.New("entryGenerator").Funcs(funcMap).Parse(templateText)
-}
-
-func RenderEntry(this_entry *Entry) error {
- out_file, err := os.Create(this_entry.FileName)
- if err != nil {
- return err
- }
- defer out_file.Close()
-
- err = this_entry.Template.Execute(out_file, this_entry)
- if err != nil {
- return err
- }
-
- return nil
-}
diff --git a/docs/specs/api.md b/docs/specs/api.md
index 3086958377077bb775733b207e8531299b586d39..4454d792230555361e3a031a121418242dfb978a 100644
--- a/docs/specs/api.md
+++ b/docs/specs/api.md
@@ -2,7 +2,7 @@
### for eris-db version 0.11.x
-Eris DB 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 [erisdb-js](/docs/documentation/db.js/) library.
+Eris DB 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 [erisdb-js](https://github.com/monax/eris-db.js) library.
## TOC
@@ -1755,7 +1755,7 @@ Parameters:
#####Additional info
`code` is a hex-string representation of compiled contract code.
-`data` is a string of data formatted in accordance with the [contract ABI](/docs/documentation/contracts.js/).
+`data` is a string of data formatted in accordance with the [contract ABI](https://github.com/monax/eris-contracts.js).
***
diff --git a/event/event_cache.go b/event/event_cache.go
index 474c892d08161476d5c177ec032226c2bc01ab31..d5cc469c578022974a4dfd51d8727811de48d7b7 100644
--- a/event/event_cache.go
+++ b/event/event_cache.go
@@ -19,7 +19,7 @@ import (
"sync"
"time"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/txs"
)
var (
diff --git a/event/event_cache_test.go b/event/event_cache_test.go
index 573eed113af6fb60306597530a647c437eaef102..56ba5a996a30db63f1e2a93e7882345bc5d7f365 100644
--- a/event/event_cache_test.go
+++ b/event/event_cache_test.go
@@ -23,7 +23,7 @@ import (
"sync"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/txs"
"github.com/stretchr/testify/assert"
)
diff --git a/event/events.go b/event/events.go
index 5ada94a52e994f7497c111300c65205a86894d12..1cb16e61f99cd52b12c0cb49001dcdc48f6ae43c 100644
--- a/event/events.go
+++ b/event/events.go
@@ -21,9 +21,9 @@ import (
"fmt"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
+ "github.com/monax/eris-db/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 af6d9530377eceb4a184ded8e4b6b030458df35e..f516c835bc6ec09604e0ad202ec49fda0c695484 100644
--- a/event/events_test.go
+++ b/event/events_test.go
@@ -20,7 +20,7 @@ import (
"sync"
"time"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/txs"
"github.com/stretchr/testify/assert"
)
diff --git a/genesis/genesis.go b/genesis/genesis.go
index 3ca287e55bc6c214a7032413e665fb85103a1d79..79d679121e53160815ef5dab82a475635a27746b 100644
--- a/genesis/genesis.go
+++ b/genesis/genesis.go
@@ -19,7 +19,7 @@ import (
"encoding/json"
"time"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ ptypes "github.com/monax/eris-db/permission/types"
wire "github.com/tendermint/go-wire"
)
diff --git a/genesis/make_genesis_file.go b/genesis/make_genesis_file.go
index a4dce67bf1f200c23da9055ee6ff1cc028aecc12..a8af9c20d9dad23f287d7f692caec048e4d5d05d 100644
--- a/genesis/make_genesis_file.go
+++ b/genesis/make_genesis_file.go
@@ -24,8 +24,8 @@ import (
"strconv"
"time"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- "github.com/eris-ltd/eris-db/util"
+ ptypes "github.com/monax/eris-db/permission/types"
+ "github.com/monax/eris-db/util"
"github.com/tendermint/go-crypto"
wire "github.com/tendermint/go-wire"
diff --git a/genesis/maker.go b/genesis/maker.go
index 707d8150ee17bbe5c4f8191ba3e2d8018de7ddcd..5deaaed49a2f127f7d02cd74d3d5f498c26da138 100644
--- a/genesis/maker.go
+++ b/genesis/maker.go
@@ -17,7 +17,7 @@ package genesis
import (
"fmt"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ ptypes "github.com/monax/eris-db/permission/types"
"github.com/tendermint/go-crypto"
)
diff --git a/genesis/types.go b/genesis/types.go
index c962a3c316d406f4e1b2cac7fde1bab14c37b2ea..849f6e4dd507239580404cb236547ffee0b39d97 100644
--- a/genesis/types.go
+++ b/genesis/types.go
@@ -19,7 +19,7 @@ import (
"os"
"time"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ ptypes "github.com/monax/eris-db/permission/types"
"github.com/tendermint/go-crypto"
"github.com/tendermint/go-wire"
diff --git a/glide.lock b/glide.lock
index 6887d752d90fc9ab64b4b6d7181b92262ed992d3..697d406e51da1399b2baef709925c2774e1801b6 100644
--- a/glide.lock
+++ b/glide.lock
@@ -29,8 +29,6 @@ imports:
version: 44cc805cf13205b55f69e14bcb69867d1ae92f98
- name: github.com/ebuchman/fail-test
version: c1eddaa09da2b4017351245b0d43234955276798
-- name: github.com/eris-ltd/eris-keys
- version: 114ebc77443db9a153692233294e48bc7e184215
- name: github.com/fsnotify/fsnotify
version: 30411dbcefb7a1da7e84f75530ad3abe4011b4f8
- name: github.com/gin-gonic/gin
diff --git a/glide.yaml b/glide.yaml
index ed8e097c2828278365c0e7d158acd11a5a9fb6f5..684e3a38e2ef810aebb99a90b8582efb2e99d9d1 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,6 +1,5 @@
-package: github.com/eris-ltd/eris-db
+package: github.com/monax/eris-db
import:
-- package: github.com/eris-ltd/eris-keys
- package: github.com/spf13/cobra
- package: github.com/spf13/viper
- package: github.com/gin-gonic/gin
@@ -9,6 +8,7 @@ import:
- package: github.com/stretchr/testify
- package: github.com/tendermint/tendermint
version: ~0.8.0
+- package: github.com/tendermint/ed25519
- package: github.com/tommy351/gin-cors
- package: golang.org/x/crypto
subpackages:
diff --git a/keys/key_client.go b/keys/key_client.go
index edbc451123db1c069033cbce1cad4a1d0b2135b1..42dbafae2b1002217237600cee9437a11af4ea60 100644
--- a/keys/key_client.go
+++ b/keys/key_client.go
@@ -18,8 +18,8 @@ import (
"encoding/hex"
"fmt"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
)
type KeyClient interface {
diff --git a/keys/key_client_util.go b/keys/key_client_util.go
index b59c61f6b37a9a1ffa2b21f6b7982eecd7f3fb12..174523b40223e71d2f5688d5da19adb1cc752a2b 100644
--- a/keys/key_client_util.go
+++ b/keys/key_client_util.go
@@ -21,8 +21,8 @@ import (
"io/ioutil"
"net/http"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
)
// Eris-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 d1ae1bd0917124025d79d6f1c5f7b0d109d9d669..d71e1bdc5f53103b346e97546e9759d6520e7c82 100644
--- a/keys/mock/key_client_mock.go
+++ b/keys/mock/key_client_mock.go
@@ -15,47 +15,84 @@
package mock
import (
+ "crypto/rand"
"encoding/hex"
"fmt"
- // for the mock of key server we explicitly import
- // the keys server to ensure the core components are
- // compatible with eris-db.
- "github.com/eris-ltd/eris-keys/crypto"
+ . "github.com/monax/eris-db/keys"
- . "github.com/eris-ltd/eris-db/keys"
+ // NOTE: prior to building out /crypto, use
+ // tendermint/go-crypto for the mock client
+ "github.com/tendermint/ed25519"
+ "golang.org/x/crypto/ripemd160"
)
+//---------------------------------------------------------------------
+// Mock ed25510 key for mock keys client
+
+// Simple ed25519 key structure for mock purposes with ripemd160 address
+type MockKey struct {
+ Address []byte
+ PrivateKey [ed25519.PrivateKeySize]byte
+ PublicKey []byte
+}
+
+func newMockKey() (*MockKey, error) {
+ key := &MockKey{
+ Address: make([]byte, 20),
+ PublicKey: make([]byte, ed25519.PublicKeySize),
+ }
+ // this is a mock key, so the entropy of the source is purely
+ // for testing
+ publicKey, privateKey, err := ed25519.GenerateKey(rand.Reader)
+ if err != nil {
+ return nil, err
+ }
+ copy(key.PrivateKey[:], privateKey[:])
+ copy(key.PublicKey[:], publicKey[:])
+
+ // prepend 0x01 for ed25519 public key
+ typedPublicKeyBytes := append([]byte{0x01}, key.PublicKey...)
+ hasher := ripemd160.New()
+ hasher.Write(typedPublicKeyBytes)
+ key.Address = hasher.Sum(nil)
+ return key, nil
+}
+
+func (mockKey *MockKey) Sign(message []byte) ([]byte, error) {
+ signatureBytes := make([]byte, ed25519.SignatureSize)
+ signature := ed25519.Sign(&mockKey.PrivateKey, message)
+ copy(signatureBytes[:], signature[:])
+ return signatureBytes, nil
+}
+
//---------------------------------------------------------------------
// Mock client for replacing signing done by eris-keys
-// NOTE [ben] Compiler check to ensure MockKeyClient successfully implements
-// eris-db/keys.KeyClient
+// Implementation assertion
var _ KeyClient = (*MockKeyClient)(nil)
type MockKeyClient struct {
- knownKeys map[string]*crypto.Key
+ knownKeys map[string]*MockKey
}
func NewMockKeyClient() *MockKeyClient {
return &MockKeyClient{
- knownKeys: make(map[string]*crypto.Key),
+ knownKeys: make(map[string]*MockKey),
}
}
func (mock *MockKeyClient) NewKey() (address []byte) {
// Only tests ED25519 curve and ripemd160.
- keyType := crypto.KeyType{crypto.CurveTypeEd25519,
- crypto.AddrTypeRipemd160}
- key, err := crypto.NewKey(keyType)
+ key, err := newMockKey()
if err != nil {
- panic(fmt.Sprintf("Mocked key client failed on key generation (%s): %s", keyType.String(), err))
+ panic(fmt.Sprintf("Mocked key client failed on key generation: %s", err))
}
mock.knownKeys[fmt.Sprintf("%X", key.Address)] = key
return key.Address
}
-func (mock *MockKeyClient) Sign(signBytesString string, signAddress []byte) (signature []byte, err error) {
+func (mock *MockKeyClient) Sign(signBytesString string, signAddress []byte) ([]byte, error) {
key := mock.knownKeys[fmt.Sprintf("%X", signAddress)]
if key == nil {
return nil, fmt.Errorf("Unknown address (%X)", signAddress)
@@ -72,5 +109,5 @@ func (mock *MockKeyClient) PublicKey(address []byte) (publicKey []byte, err erro
if key == nil {
return nil, fmt.Errorf("Unknown address (%X)", address)
}
- return key.Pubkey()
+ return key.PublicKey, nil
}
diff --git a/logging/adapters/stdlib/capture.go b/logging/adapters/stdlib/capture.go
index 3c8a2a88e14b4199b548c6cea441c67d3d1a90e5..5e8670f2266ac08129b02db09d3e3810373ae0d2 100644
--- a/logging/adapters/stdlib/capture.go
+++ b/logging/adapters/stdlib/capture.go
@@ -18,8 +18,8 @@ import (
"io"
"log"
- "github.com/eris-ltd/eris-db/logging/loggers"
kitlog "github.com/go-kit/kit/log"
+ "github.com/monax/eris-db/logging/loggers"
)
func Capture(stdLibLogger log.Logger,
diff --git a/logging/adapters/tendermint_log15/capture.go b/logging/adapters/tendermint_log15/capture.go
index 64f5a139da1860ffc929c7e49c617be51099649b..46053ae4722894a6823cc53a69ab23d475c63625 100644
--- a/logging/adapters/tendermint_log15/capture.go
+++ b/logging/adapters/tendermint_log15/capture.go
@@ -15,8 +15,8 @@
package adapters
import (
- "github.com/eris-ltd/eris-db/logging/loggers"
kitlog "github.com/go-kit/kit/log"
+ "github.com/monax/eris-db/logging/loggers"
"github.com/tendermint/log15"
)
diff --git a/logging/adapters/tendermint_log15/convert.go b/logging/adapters/tendermint_log15/convert.go
index f1668b262ab0dac75948274da43c97c52d12b0e3..f30f36e0e39049f51816ab4d881ee80db9e06ee8 100644
--- a/logging/adapters/tendermint_log15/convert.go
+++ b/logging/adapters/tendermint_log15/convert.go
@@ -17,10 +17,10 @@ package adapters
import (
"time"
- "github.com/eris-ltd/eris-db/logging/loggers"
- "github.com/eris-ltd/eris-db/logging/structure"
- . "github.com/eris-ltd/eris-db/util/slice"
"github.com/go-stack/stack"
+ "github.com/monax/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging/structure"
+ . "github.com/monax/eris-db/util/slice"
"github.com/tendermint/log15"
)
diff --git a/logging/convention.go b/logging/convention.go
index 8dc5b05da97bc2b9bf267ed55e281a47989f32f6..230e4ed9ec5127cc2f6c07da68c4327083f1d72f 100644
--- a/logging/convention.go
+++ b/logging/convention.go
@@ -15,10 +15,10 @@
package logging
import (
- "github.com/eris-ltd/eris-db/logging/loggers"
- "github.com/eris-ltd/eris-db/logging/structure"
- "github.com/eris-ltd/eris-db/util/slice"
kitlog "github.com/go-kit/kit/log"
+ "github.com/monax/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging/structure"
+ "github.com/monax/eris-db/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 81f6a20df8e14b0265ba7017b7115a413cd54863..9d824232eb9bcef6241d7e4cedabd37a27a1a751 100644
--- a/logging/lifecycle/lifecycle.go
+++ b/logging/lifecycle/lifecycle.go
@@ -20,11 +20,11 @@ import (
"time"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/adapters/stdlib"
- tmLog15adapter "github.com/eris-ltd/eris-db/logging/adapters/tendermint_log15"
- "github.com/eris-ltd/eris-db/logging/loggers"
- "github.com/eris-ltd/eris-db/logging/structure"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/adapters/stdlib"
+ tmLog15adapter "github.com/monax/eris-db/logging/adapters/tendermint_log15"
+ "github.com/monax/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging/structure"
kitlog "github.com/go-kit/kit/log"
"github.com/streadway/simpleuuid"
diff --git a/logging/loggers/eris_format_logger.go b/logging/loggers/eris_format_logger.go
index aea07254d4d0356620a40919f8caad7165bb3e43..e311306b1c3b5948198d6696712545aff7dd862d 100644
--- a/logging/loggers/eris_format_logger.go
+++ b/logging/loggers/eris_format_logger.go
@@ -17,7 +17,7 @@ package loggers
import (
"fmt"
- "github.com/eris-ltd/eris-db/logging/structure"
+ "github.com/monax/eris-db/logging/structure"
kitlog "github.com/go-kit/kit/log"
)
diff --git a/logging/loggers/info_trace_logger.go b/logging/loggers/info_trace_logger.go
index e127e10feef184c68b26fa2fe15131e6d17da3ea..9cba501e2df1c556aed194fc94437d51232eeb5e 100644
--- a/logging/loggers/info_trace_logger.go
+++ b/logging/loggers/info_trace_logger.go
@@ -15,8 +15,8 @@
package loggers
import (
- "github.com/eris-ltd/eris-db/logging/structure"
kitlog "github.com/go-kit/kit/log"
+ "github.com/monax/eris-db/logging/structure"
)
const (
diff --git a/logging/loggers/multiple_channel_logger.go b/logging/loggers/multiple_channel_logger.go
index 2e2e344f44bc1a69f7c53ed3608f257a09c9304c..348d2c3cfa917b61c485417db8dea84b9bd979af 100644
--- a/logging/loggers/multiple_channel_logger.go
+++ b/logging/loggers/multiple_channel_logger.go
@@ -17,8 +17,8 @@ package loggers
import (
"fmt"
- "github.com/eris-ltd/eris-db/logging/structure"
kitlog "github.com/go-kit/kit/log"
+ "github.com/monax/eris-db/logging/structure"
)
// This represents a 'SELECT ONE' type logger. When logged to it will search
diff --git a/logging/loggers/multiple_channel_logger_test.go b/logging/loggers/multiple_channel_logger_test.go
index a140420433a6aef95879457e97db8bdbeff7b5f4..de5f779ac5ee96c9e19ac077065505e5fe615b09 100644
--- a/logging/loggers/multiple_channel_logger_test.go
+++ b/logging/loggers/multiple_channel_logger_test.go
@@ -19,8 +19,8 @@ import (
"testing"
"time"
- "github.com/eris-ltd/eris-db/logging/structure"
kitlog "github.com/go-kit/kit/log"
+ "github.com/monax/eris-db/logging/structure"
"github.com/stretchr/testify/assert"
)
diff --git a/logging/loggers/vector_valued_logger.go b/logging/loggers/vector_valued_logger.go
index fa59cdbfaaf48b260cf3b77d592cdad97aa2280d..6d693d48c11149d18ea6ae173bcae23a552f053a 100644
--- a/logging/loggers/vector_valued_logger.go
+++ b/logging/loggers/vector_valued_logger.go
@@ -15,8 +15,8 @@
package loggers
import (
- "github.com/eris-ltd/eris-db/logging/structure"
kitlog "github.com/go-kit/kit/log"
+ "github.com/monax/eris-db/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 157f5bc08fc162d557b295d960aae359a024130c..01dd90c1c500feff15f0dea6c3066b774baa4278 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/eris-ltd/eris-db/util/slice"
+ . "github.com/monax/eris-db/util/slice"
"github.com/stretchr/testify/assert"
)
diff --git a/logging/metadata.go b/logging/metadata.go
index 258ca733c749698d85bc26fca949bc5eed0d5a2b..d82ca2e265e596d0af86a7dfd16561b43c526b29 100644
--- a/logging/metadata.go
+++ b/logging/metadata.go
@@ -17,10 +17,10 @@ package logging
import (
"time"
- "github.com/eris-ltd/eris-db/logging/loggers"
- "github.com/eris-ltd/eris-db/logging/structure"
kitlog "github.com/go-kit/kit/log"
"github.com/go-stack/stack"
+ "github.com/monax/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging/structure"
)
const (
diff --git a/logging/structure/structure.go b/logging/structure/structure.go
index 43a55df87f7cd2f93a859dce5980ada59964e843..19c6f1502f761f024cbdb9e59a63761da6e60b51 100644
--- a/logging/structure/structure.go
+++ b/logging/structure/structure.go
@@ -17,7 +17,7 @@ package structure
import (
"reflect"
- . "github.com/eris-ltd/eris-db/util/slice"
+ . "github.com/monax/eris-db/util/slice"
)
const (
diff --git a/logging/structure/structure_test.go b/logging/structure/structure_test.go
index bbdd0895f348a8c6ceb99dca26470dce1b34e4ca..c5335125c6449320634787472a54ff8dd9412aa4 100644
--- a/logging/structure/structure_test.go
+++ b/logging/structure/structure_test.go
@@ -17,7 +17,7 @@ package structure
import (
"testing"
- . "github.com/eris-ltd/eris-db/util/slice"
+ . "github.com/monax/eris-db/util/slice"
"github.com/stretchr/testify/assert"
)
diff --git a/logging/terminal.go b/logging/terminal.go
index 8a2be393e4ba61152ac58f9d872b5ada94ab2a68..24747c5209233669a8d4c803beeb5e783bfb92dd 100644
--- a/logging/terminal.go
+++ b/logging/terminal.go
@@ -15,8 +15,8 @@
package logging
import (
- "github.com/eris-ltd/eris-db/logging/structure"
"github.com/go-kit/kit/log/term"
+ "github.com/monax/eris-db/logging/structure"
)
func Colors(keyvals ...interface{}) term.FgBgColor {
diff --git a/manager/config.go b/manager/config.go
index 827d25ed5b1fa036628f3b6fc429a12029dada6f..c4eb548e8f876eb790b18677648bc60892b8c7f5 100644
--- a/manager/config.go
+++ b/manager/config.go
@@ -15,7 +15,7 @@
package manager
import (
- erismint "github.com/eris-ltd/eris-db/manager/eris-mint"
+ erismint "github.com/monax/eris-db/manager/eris-mint"
)
//------------------------------------------------------------------------------
diff --git a/manager/eris-mint/accounts.go b/manager/eris-mint/accounts.go
index 9134162940f5f891f886330f71fb3c45ca027c60..a48733dd6e7b0966a88bca208cf28f86ad032743 100644
--- a/manager/eris-mint/accounts.go
+++ b/manager/eris-mint/accounts.go
@@ -23,11 +23,11 @@ import (
"fmt"
"sync"
- account "github.com/eris-ltd/eris-db/account"
- core_types "github.com/eris-ltd/eris-db/core/types"
- definitions "github.com/eris-ltd/eris-db/definitions"
- event "github.com/eris-ltd/eris-db/event"
- word256 "github.com/eris-ltd/eris-db/word256"
+ account "github.com/monax/eris-db/account"
+ core_types "github.com/monax/eris-db/core/types"
+ definitions "github.com/monax/eris-db/definitions"
+ event "github.com/monax/eris-db/event"
+ word256 "github.com/monax/eris-db/word256"
)
// NOTE [ben] Compiler check to ensure Accounts successfully implements
diff --git a/manager/eris-mint/eris-mint.go b/manager/eris-mint/eris-mint.go
index 9ba18441832ecf6bce0b500ba99fca9bc41b3a40..d7d430a12d2f526931241a669139470e930453af 100644
--- a/manager/eris-mint/eris-mint.go
+++ b/manager/eris-mint/eris-mint.go
@@ -24,12 +24,12 @@ import (
tendermint_events "github.com/tendermint/go-events"
wire "github.com/tendermint/go-wire"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
- sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
- manager_types "github.com/eris-ltd/eris-db/manager/types"
- "github.com/eris-ltd/eris-db/txs"
+ sm "github.com/monax/eris-db/manager/eris-mint/state"
+ manager_types "github.com/monax/eris-db/manager/types"
+ "github.com/monax/eris-db/txs"
)
//--------------------------------------------------------------------------------
diff --git a/manager/eris-mint/evm/fake_app_state.go b/manager/eris-mint/evm/fake_app_state.go
index 3c19b0cf27d39df45bae5480ebf40c4ac4898c6e..5b59f076cc8b547c9fa10b9689b76f923cd2af14 100644
--- a/manager/eris-mint/evm/fake_app_state.go
+++ b/manager/eris-mint/evm/fake_app_state.go
@@ -17,8 +17,8 @@ package vm
import (
"fmt"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm/sha3"
- . "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/manager/eris-mint/evm/sha3"
+ . "github.com/monax/eris-db/word256"
)
type FakeAppState struct {
diff --git a/manager/eris-mint/evm/log_event_test.go b/manager/eris-mint/evm/log_event_test.go
index bdb55fb9e39c3a32453b0f5ad989a428c22aa817..7a541477d15fec3bd46eb8e5d3fba4a965023d00 100644
--- a/manager/eris-mint/evm/log_event_test.go
+++ b/manager/eris-mint/evm/log_event_test.go
@@ -19,9 +19,9 @@ import (
"reflect"
"testing"
- . "github.com/eris-ltd/eris-db/manager/eris-mint/evm/opcodes"
- "github.com/eris-ltd/eris-db/txs"
- . "github.com/eris-ltd/eris-db/word256"
+ . "github.com/monax/eris-db/manager/eris-mint/evm/opcodes"
+ "github.com/monax/eris-db/txs"
+ . "github.com/monax/eris-db/word256"
"github.com/tendermint/go-events"
)
diff --git a/manager/eris-mint/evm/native.go b/manager/eris-mint/evm/native.go
index e569474586834661d64d6ba9ee37e2babe90406f..5daf3fc93068a1082404d29fa2c7efb1175dfa87 100644
--- a/manager/eris-mint/evm/native.go
+++ b/manager/eris-mint/evm/native.go
@@ -17,7 +17,7 @@ package vm
import (
"crypto/sha256"
- . "github.com/eris-ltd/eris-db/word256"
+ . "github.com/monax/eris-db/word256"
"golang.org/x/crypto/ripemd160"
)
diff --git a/manager/eris-mint/evm/opcodes/opcodes.go b/manager/eris-mint/evm/opcodes/opcodes.go
index ce064f213d7e94171c23206c6c821f78be1d45f4..bc889091632692a0ce8f1e90b4c214ab03f80710 100644
--- a/manager/eris-mint/evm/opcodes/opcodes.go
+++ b/manager/eris-mint/evm/opcodes/opcodes.go
@@ -17,7 +17,7 @@ package opcodes
import (
"fmt"
- "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/word256"
"gopkg.in/fatih/set.v0"
)
diff --git a/manager/eris-mint/evm/snative.go b/manager/eris-mint/evm/snative.go
index b30858109c1356304b1d46394969c4f82df2479c..64b48b31957d0f934d45d1d5870eb9c756e48d39 100644
--- a/manager/eris-mint/evm/snative.go
+++ b/manager/eris-mint/evm/snative.go
@@ -17,14 +17,14 @@ package vm
import (
"fmt"
- "github.com/eris-ltd/eris-db/common/sanity"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm/sha3"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- . "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/common/sanity"
+ "github.com/monax/eris-db/manager/eris-mint/evm/sha3"
+ ptypes "github.com/monax/eris-db/permission/types"
+ . "github.com/monax/eris-db/word256"
"strings"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm/abi"
+ "github.com/monax/eris-db/manager/eris-mint/evm/abi"
)
//
diff --git a/manager/eris-mint/evm/snative_test.go b/manager/eris-mint/evm/snative_test.go
index a60b62e15678596380769eb8880681517782102f..c0fc286ed0a78ea4fa98be217ff91094174d9cd3 100644
--- a/manager/eris-mint/evm/snative_test.go
+++ b/manager/eris-mint/evm/snative_test.go
@@ -20,11 +20,11 @@ import (
"strings"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm/abi"
- . "github.com/eris-ltd/eris-db/manager/eris-mint/evm/opcodes"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm/sha3"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- . "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/manager/eris-mint/evm/abi"
+ . "github.com/monax/eris-db/manager/eris-mint/evm/opcodes"
+ "github.com/monax/eris-db/manager/eris-mint/evm/sha3"
+ ptypes "github.com/monax/eris-db/permission/types"
+ . "github.com/monax/eris-db/word256"
"github.com/stretchr/testify/assert"
)
diff --git a/manager/eris-mint/evm/stack.go b/manager/eris-mint/evm/stack.go
index 8e5df4327810c1a6d4cbf123484cdf0b47aa226f..f9ed59164b5a2b7160291d56878001dae7ccbaeb 100644
--- a/manager/eris-mint/evm/stack.go
+++ b/manager/eris-mint/evm/stack.go
@@ -17,9 +17,9 @@ package vm
import (
"fmt"
- "github.com/eris-ltd/eris-db/common/math/integral"
- "github.com/eris-ltd/eris-db/common/sanity"
- . "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/common/math/integral"
+ "github.com/monax/eris-db/common/sanity"
+ . "github.com/monax/eris-db/word256"
)
// Not goroutine safe
diff --git a/manager/eris-mint/evm/types.go b/manager/eris-mint/evm/types.go
index cd5d8ce04b3baa011ad58536a54e25da00cb55ff..ad699c9c7a82c78af418030eb8b46e62768f5bbe 100644
--- a/manager/eris-mint/evm/types.go
+++ b/manager/eris-mint/evm/types.go
@@ -17,8 +17,8 @@ package vm
import (
"fmt"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- . "github.com/eris-ltd/eris-db/word256"
+ ptypes "github.com/monax/eris-db/permission/types"
+ . "github.com/monax/eris-db/word256"
)
const (
diff --git a/manager/eris-mint/evm/vm.go b/manager/eris-mint/evm/vm.go
index ea883a63224b0e2dad3a788d2b752db842a7fdab..80ab3693de9ef250be61da8055fabbec68e4e783 100644
--- a/manager/eris-mint/evm/vm.go
+++ b/manager/eris-mint/evm/vm.go
@@ -20,13 +20,13 @@ import (
"fmt"
"math/big"
- "github.com/eris-ltd/eris-db/common/math/integral"
- "github.com/eris-ltd/eris-db/common/sanity"
- . "github.com/eris-ltd/eris-db/manager/eris-mint/evm/opcodes"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm/sha3"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- "github.com/eris-ltd/eris-db/txs"
- . "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/common/math/integral"
+ "github.com/monax/eris-db/common/sanity"
+ . "github.com/monax/eris-db/manager/eris-mint/evm/opcodes"
+ "github.com/monax/eris-db/manager/eris-mint/evm/sha3"
+ ptypes "github.com/monax/eris-db/permission/types"
+ "github.com/monax/eris-db/txs"
+ . "github.com/monax/eris-db/word256"
"github.com/tendermint/go-events"
)
diff --git a/manager/eris-mint/evm/vm_test.go b/manager/eris-mint/evm/vm_test.go
index fe85590b46299b80ca8831545e02e815c926ff7b..724886da8a5ae838377a2a640f5bbad6dfd25b8c 100644
--- a/manager/eris-mint/evm/vm_test.go
+++ b/manager/eris-mint/evm/vm_test.go
@@ -24,10 +24,10 @@ import (
"errors"
- . "github.com/eris-ltd/eris-db/manager/eris-mint/evm/opcodes"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- "github.com/eris-ltd/eris-db/txs"
- . "github.com/eris-ltd/eris-db/word256"
+ . "github.com/monax/eris-db/manager/eris-mint/evm/opcodes"
+ ptypes "github.com/monax/eris-db/permission/types"
+ "github.com/monax/eris-db/txs"
+ . "github.com/monax/eris-db/word256"
"github.com/stretchr/testify/assert"
"github.com/tendermint/go-events"
)
@@ -194,7 +194,7 @@ func TestSendCall(t *testing.T) {
// This test was introduced to cover an issues exposed in our handling of the
// gas limit passed from caller to callee on various forms of CALL
-// this ticket gives some background: https://github.com/eris-ltd/eris-pm/issues/212
+// this ticket gives some background: https://github.com/monax/eris-pm/issues/212
// The idea of this test is to implement a simple DelegateCall in EVM code
// We first run the DELEGATECALL with _just_ enough gas expecting a simple return,
// and then run it with 1 gas unit less, expecting a failure
diff --git a/manager/eris-mint/namereg.go b/manager/eris-mint/namereg.go
index cfc589eba271a126e46e1f4b8faafc57153ed1c7..884e486b7ff5aa9de9daeaaffe444e1f5b3b936c 100644
--- a/manager/eris-mint/namereg.go
+++ b/manager/eris-mint/namereg.go
@@ -20,10 +20,10 @@ import (
"fmt"
"sync"
- sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
+ sm "github.com/monax/eris-db/manager/eris-mint/state"
- core_types "github.com/eris-ltd/eris-db/core/types"
- event "github.com/eris-ltd/eris-db/event"
+ core_types "github.com/monax/eris-db/core/types"
+ event "github.com/monax/eris-db/event"
)
// NameReg is part of the pipe for ErisMint and provides the implementation
diff --git a/manager/eris-mint/pipe.go b/manager/eris-mint/pipe.go
index f900b3f09d07989dbe8bdc8d244b5a8e2f5966b1..9c9ed24f79111ba17371e138ac85a3b6a962da34 100644
--- a/manager/eris-mint/pipe.go
+++ b/manager/eris-mint/pipe.go
@@ -25,23 +25,23 @@ import (
wire "github.com/tendermint/go-wire"
tm_types "github.com/tendermint/tendermint/types"
- "github.com/eris-ltd/eris-db/account"
- blockchain_types "github.com/eris-ltd/eris-db/blockchain/types"
- imath "github.com/eris-ltd/eris-db/common/math/integral"
- "github.com/eris-ltd/eris-db/config"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/definitions"
- edb_event "github.com/eris-ltd/eris-db/event"
- genesis "github.com/eris-ltd/eris-db/genesis"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
- vm "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- "github.com/eris-ltd/eris-db/manager/eris-mint/state"
- manager_types "github.com/eris-ltd/eris-db/manager/types"
- rpc_tm_types "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
- "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/account"
+ blockchain_types "github.com/monax/eris-db/blockchain/types"
+ imath "github.com/monax/eris-db/common/math/integral"
+ "github.com/monax/eris-db/config"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/definitions"
+ edb_event "github.com/monax/eris-db/event"
+ genesis "github.com/monax/eris-db/genesis"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
+ vm "github.com/monax/eris-db/manager/eris-mint/evm"
+ "github.com/monax/eris-db/manager/eris-mint/state"
+ manager_types "github.com/monax/eris-db/manager/types"
+ rpc_tm_types "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/txs"
+ "github.com/monax/eris-db/word256"
)
type erisMintPipe struct {
diff --git a/manager/eris-mint/state/block_cache.go b/manager/eris-mint/state/block_cache.go
index e162ce5c3b185388484e91dca2b7ae7e7916b675..829be52377f89958022551f9949252e1380e6caa 100644
--- a/manager/eris-mint/state/block_cache.go
+++ b/manager/eris-mint/state/block_cache.go
@@ -19,10 +19,10 @@ import (
"fmt"
"sort"
- acm "github.com/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/common/sanity"
- core_types "github.com/eris-ltd/eris-db/core/types"
- . "github.com/eris-ltd/eris-db/word256"
+ acm "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/common/sanity"
+ core_types "github.com/monax/eris-db/core/types"
+ . "github.com/monax/eris-db/word256"
dbm "github.com/tendermint/go-db"
"github.com/tendermint/go-merkle"
diff --git a/manager/eris-mint/state/common.go b/manager/eris-mint/state/common.go
index 4f096d804e6808def4a1e14e97ae8f87b39fb3e3..21d82c9f7fda39cba8beef7879804770d0fe4371 100644
--- a/manager/eris-mint/state/common.go
+++ b/manager/eris-mint/state/common.go
@@ -15,9 +15,9 @@
package state
import (
- acm "github.com/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- . "github.com/eris-ltd/eris-db/word256"
+ acm "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
+ . "github.com/monax/eris-db/word256"
)
type AccountGetter interface {
diff --git a/manager/eris-mint/state/execution.go b/manager/eris-mint/state/execution.go
index 80b5474f5868cd0493bb8f639730dfb3df6d11c5..87fb086a98a91c5b2ed10aed7523086b898d786e 100644
--- a/manager/eris-mint/state/execution.go
+++ b/manager/eris-mint/state/execution.go
@@ -19,13 +19,13 @@ import (
"errors"
"fmt"
- acm "github.com/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/common/sanity"
- core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- ptypes "github.com/eris-ltd/eris-db/permission/types" // for GlobalPermissionAddress ...
- "github.com/eris-ltd/eris-db/txs"
- . "github.com/eris-ltd/eris-db/word256"
+ acm "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/common/sanity"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
+ ptypes "github.com/monax/eris-db/permission/types" // for GlobalPermissionAddress ...
+ "github.com/monax/eris-db/txs"
+ . "github.com/monax/eris-db/word256"
"github.com/tendermint/go-events"
)
diff --git a/manager/eris-mint/state/genesis_test.go b/manager/eris-mint/state/genesis_test.go
index 1aa25bc05bbd580eb33231004e0034d8f5e922b3..477656b200738e2915ae71b113f1a0318f9ba952 100644
--- a/manager/eris-mint/state/genesis_test.go
+++ b/manager/eris-mint/state/genesis_test.go
@@ -22,10 +22,10 @@ import (
"testing"
"time"
- acm "github.com/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/common/random"
- genesis "github.com/eris-ltd/eris-db/genesis"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ acm "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/common/random"
+ genesis "github.com/monax/eris-db/genesis"
+ ptypes "github.com/monax/eris-db/permission/types"
tdb "github.com/tendermint/go-db"
"github.com/tendermint/tendermint/types"
diff --git a/manager/eris-mint/state/permissions_test.go b/manager/eris-mint/state/permissions_test.go
index c8497f1330c4ac88bddfc0b621d0c21081eae7a3..19fb21da7e955798219cb0d0d95e593ca6e500bb 100644
--- a/manager/eris-mint/state/permissions_test.go
+++ b/manager/eris-mint/state/permissions_test.go
@@ -21,13 +21,13 @@ import (
"testing"
"time"
- acm "github.com/eris-ltd/eris-db/account"
- genesis "github.com/eris-ltd/eris-db/genesis"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- . "github.com/eris-ltd/eris-db/manager/eris-mint/evm/opcodes"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- "github.com/eris-ltd/eris-db/txs"
- . "github.com/eris-ltd/eris-db/word256"
+ acm "github.com/monax/eris-db/account"
+ genesis "github.com/monax/eris-db/genesis"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
+ . "github.com/monax/eris-db/manager/eris-mint/evm/opcodes"
+ ptypes "github.com/monax/eris-db/permission/types"
+ "github.com/monax/eris-db/txs"
+ . "github.com/monax/eris-db/word256"
"github.com/tendermint/go-crypto"
dbm "github.com/tendermint/go-db"
diff --git a/manager/eris-mint/state/state.go b/manager/eris-mint/state/state.go
index 3d61775422fe5014a0e961deaf59925843f48728..7ff02042074d3b37eec9a33609d9caeaa1eb2b8a 100644
--- a/manager/eris-mint/state/state.go
+++ b/manager/eris-mint/state/state.go
@@ -21,18 +21,18 @@ import (
"io/ioutil"
"time"
- acm "github.com/eris-ltd/eris-db/account"
- genesis "github.com/eris-ltd/eris-db/genesis"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
- "github.com/eris-ltd/eris-db/txs"
+ acm "github.com/monax/eris-db/account"
+ genesis "github.com/monax/eris-db/genesis"
+ ptypes "github.com/monax/eris-db/permission/types"
+ "github.com/monax/eris-db/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/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/util"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/util"
"github.com/tendermint/tendermint/types"
)
diff --git a/manager/eris-mint/state/state_test.go b/manager/eris-mint/state/state_test.go
index b9d032ed3cadeddf8548603b556f217c68424089..410f84ffff300f792738a691e5fa545855d5e100 100644
--- a/manager/eris-mint/state/state_test.go
+++ b/manager/eris-mint/state/state_test.go
@@ -19,10 +19,10 @@ import (
"encoding/hex"
"testing"
- core_types "github.com/eris-ltd/eris-db/core/types"
- evm "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- "github.com/eris-ltd/eris-db/txs"
- "github.com/eris-ltd/eris-db/word256"
+ core_types "github.com/monax/eris-db/core/types"
+ evm "github.com/monax/eris-db/manager/eris-mint/evm"
+ "github.com/monax/eris-db/txs"
+ "github.com/monax/eris-db/word256"
"github.com/tendermint/tendermint/config/tendermint_test"
)
diff --git a/manager/eris-mint/state/tx_cache.go b/manager/eris-mint/state/tx_cache.go
index 810e85c9765a8dd84a39d0360c82f16dcb002135..d33e6dc4f53a44d863f7ed9907cc1479b7b6f617 100644
--- a/manager/eris-mint/state/tx_cache.go
+++ b/manager/eris-mint/state/tx_cache.go
@@ -17,12 +17,12 @@ package state
import (
"fmt"
- acm "github.com/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/common/sanity"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- ptypes "github.com/eris-ltd/eris-db/permission/types" // for GlobalPermissionAddress ...
- "github.com/eris-ltd/eris-db/txs"
- . "github.com/eris-ltd/eris-db/word256"
+ acm "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/common/sanity"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
+ ptypes "github.com/monax/eris-db/permission/types" // for GlobalPermissionAddress ...
+ "github.com/monax/eris-db/txs"
+ . "github.com/monax/eris-db/word256"
"github.com/tendermint/go-crypto"
)
diff --git a/manager/eris-mint/transactor.go b/manager/eris-mint/transactor.go
index c29f51b59b7b27a31d3346a575827f034a053ae9..2bf4ca1418f0f2ff22bb2acb10c286c95cf172db 100644
--- a/manager/eris-mint/transactor.go
+++ b/manager/eris-mint/transactor.go
@@ -21,13 +21,13 @@ import (
"sync"
"time"
- "github.com/eris-ltd/eris-db/account"
- core_types "github.com/eris-ltd/eris-db/core/types"
- event "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- "github.com/eris-ltd/eris-db/manager/eris-mint/state"
- "github.com/eris-ltd/eris-db/txs"
- "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/account"
+ core_types "github.com/monax/eris-db/core/types"
+ event "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
+ "github.com/monax/eris-db/manager/eris-mint/state"
+ "github.com/monax/eris-db/txs"
+ "github.com/monax/eris-db/word256"
"github.com/tendermint/go-crypto"
tEvents "github.com/tendermint/go-events"
diff --git a/manager/eris-mint/version.go b/manager/eris-mint/version.go
index ac4b5855c68858121b2403c22b8dd0d5fa02f20c..d9f97cc180acf3f14bbf0725d87e593ba8838a85 100644
--- a/manager/eris-mint/version.go
+++ b/manager/eris-mint/version.go
@@ -17,7 +17,7 @@ package erismint
import (
"fmt"
- version "github.com/eris-ltd/eris-db/version"
+ version "github.com/monax/eris-db/version"
)
const (
diff --git a/manager/manager.go b/manager/manager.go
index d9a3b3d548044fbedbcc70ed292fd0eecaed1efe..5abf06f962379a40b0b830f963cd8130cd9c6dc3 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -19,13 +19,13 @@ import (
events "github.com/tendermint/go-events"
- config "github.com/eris-ltd/eris-db/config"
- definitions "github.com/eris-ltd/eris-db/definitions"
- erismint "github.com/eris-ltd/eris-db/manager/eris-mint"
- // types "github.com/eris-ltd/eris-db/manager/types"
+ config "github.com/monax/eris-db/config"
+ definitions "github.com/monax/eris-db/definitions"
+ erismint "github.com/monax/eris-db/manager/eris-mint"
+ // types "github.com/monax/eris-db/manager/types"
- "github.com/eris-ltd/eris-db/logging"
- "github.com/eris-ltd/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging"
+ "github.com/monax/eris-db/logging/loggers"
)
// NewApplicationPipe returns an initialised Pipe interface
diff --git a/net_test/data/init.sh b/net_test/data/init.sh
index 2020d318790c125625815768057158c66ec96baf..cc026c0d4fc25f8db777c367f4eee5d6accdc667 100755
--- a/net_test/data/init.sh
+++ b/net_test/data/init.sh
@@ -3,8 +3,8 @@
BRANCH="fixes"
-go get -d github.com/eris-ltd/eris-db
-cd $GOPATH/src/github.com/eris-ltd/eris-db
+go get -d github.com/monax/eris-db
+cd $GOPATH/src/github.com/monax/eris-db
git fetch origin $BRANCH
git checkout $BRANCH
go install ./cmd/erisdb
diff --git a/net_test/data/net_test_0/init.sh b/net_test/data/net_test_0/init.sh
index 2020d318790c125625815768057158c66ec96baf..cc026c0d4fc25f8db777c367f4eee5d6accdc667 100755
--- a/net_test/data/net_test_0/init.sh
+++ b/net_test/data/net_test_0/init.sh
@@ -3,8 +3,8 @@
BRANCH="fixes"
-go get -d github.com/eris-ltd/eris-db
-cd $GOPATH/src/github.com/eris-ltd/eris-db
+go get -d github.com/monax/eris-db
+cd $GOPATH/src/github.com/monax/eris-db
git fetch origin $BRANCH
git checkout $BRANCH
go install ./cmd/erisdb
diff --git a/net_test/data/net_test_1/init.sh b/net_test/data/net_test_1/init.sh
index 2020d318790c125625815768057158c66ec96baf..cc026c0d4fc25f8db777c367f4eee5d6accdc667 100755
--- a/net_test/data/net_test_1/init.sh
+++ b/net_test/data/net_test_1/init.sh
@@ -3,8 +3,8 @@
BRANCH="fixes"
-go get -d github.com/eris-ltd/eris-db
-cd $GOPATH/src/github.com/eris-ltd/eris-db
+go get -d github.com/monax/eris-db
+cd $GOPATH/src/github.com/monax/eris-db
git fetch origin $BRANCH
git checkout $BRANCH
go install ./cmd/erisdb
diff --git a/net_test/data/net_test_2/init.sh b/net_test/data/net_test_2/init.sh
index 2020d318790c125625815768057158c66ec96baf..cc026c0d4fc25f8db777c367f4eee5d6accdc667 100755
--- a/net_test/data/net_test_2/init.sh
+++ b/net_test/data/net_test_2/init.sh
@@ -3,8 +3,8 @@
BRANCH="fixes"
-go get -d github.com/eris-ltd/eris-db
-cd $GOPATH/src/github.com/eris-ltd/eris-db
+go get -d github.com/monax/eris-db
+cd $GOPATH/src/github.com/monax/eris-db
git fetch origin $BRANCH
git checkout $BRANCH
go install ./cmd/erisdb
diff --git a/net_test/data/net_test_3/init.sh b/net_test/data/net_test_3/init.sh
index 2020d318790c125625815768057158c66ec96baf..cc026c0d4fc25f8db777c367f4eee5d6accdc667 100755
--- a/net_test/data/net_test_3/init.sh
+++ b/net_test/data/net_test_3/init.sh
@@ -3,8 +3,8 @@
BRANCH="fixes"
-go get -d github.com/eris-ltd/eris-db
-cd $GOPATH/src/github.com/eris-ltd/eris-db
+go get -d github.com/monax/eris-db
+cd $GOPATH/src/github.com/monax/eris-db
git fetch origin $BRANCH
git checkout $BRANCH
go install ./cmd/erisdb
diff --git a/permission/types/permissions.go b/permission/types/permissions.go
index 94f31e31888311f1bc21a2b3d9771b8b191d071d..c4d3e51a1eeb803d13fc472c9aeb4ec80d032380 100644
--- a/permission/types/permissions.go
+++ b/permission/types/permissions.go
@@ -18,7 +18,7 @@ import (
"fmt"
"strings"
- "github.com/eris-ltd/eris-db/word256"
+ "github.com/monax/eris-db/word256"
)
//------------------------------------------------------------------------------------------------
diff --git a/rpc/tendermint/client/client.go b/rpc/tendermint/client/client.go
index 978c5a1fd99fcbf28f56e86ed0de3b629d7df656..c5532b7b00aa35b55d49d9e0f7a732c2faa58967 100644
--- a/rpc/tendermint/client/client.go
+++ b/rpc/tendermint/client/client.go
@@ -18,10 +18,10 @@ import (
"errors"
"fmt"
- acm "github.com/eris-ltd/eris-db/account"
- core_types "github.com/eris-ltd/eris-db/core/types"
- rpc_types "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
+ acm "github.com/monax/eris-db/account"
+ core_types "github.com/monax/eris-db/core/types"
+ rpc_types "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/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 76df394f4c144ee0eb41a7fce621a9623c489470..dd22365f30150dc1d4655bce8f6ea93c3662481b 100644
--- a/rpc/tendermint/core/routes.go
+++ b/rpc/tendermint/core/routes.go
@@ -17,10 +17,10 @@ package core
import (
"fmt"
- acm "github.com/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/definitions"
- ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
+ acm "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/definitions"
+ ctypes "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/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 220ace4b49328834bd4393453f3055f03aed4880..8fcdb3f94d722d155b6a4397a2ec554ff76b3b68 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/eris-ltd/eris-db/account"
- core_types "github.com/eris-ltd/eris-db/core/types"
- genesis "github.com/eris-ltd/eris-db/genesis"
- "github.com/eris-ltd/eris-db/txs"
+ acm "github.com/monax/eris-db/account"
+ core_types "github.com/monax/eris-db/core/types"
+ genesis "github.com/monax/eris-db/genesis"
+ "github.com/monax/eris-db/txs"
tendermint_types "github.com/tendermint/tendermint/types"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
+ consensus_types "github.com/monax/eris-db/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 73e5e97d98d603bebe019042cf7992e569121db0..56837167e49756bd874cefdc79c8cdcb58bea87b 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/eris-ltd/eris-db/consensus/types"
+ consensus_types "github.com/monax/eris-db/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 6e0bf52eae97e0795b4f4e4612cea5251e88aaa4..2e49c5586015ee20ad49c8903c60238133b23897 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/eris-ltd/eris-db/core/types"
+ "github.com/monax/eris-db/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 6bc85f4d053a2488357ebd9ff0e8843163637435..da18b456aeb94fa204684bd94f38b13bd9a69fcb 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/eris-ltd/eris-db/definitions"
- server "github.com/eris-ltd/eris-db/server"
+ definitions "github.com/monax/eris-db/definitions"
+ server "github.com/monax/eris-db/server"
)
type TendermintWebsocketServer struct {
diff --git a/rpc/tendermint/test/common.go b/rpc/tendermint/test/common.go
index 8151401f60dfa76dc6108753db7069f4dbdcbf82..efa7a4234d86dcf204230bcd60455d7287f05f4e 100644
--- a/rpc/tendermint/test/common.go
+++ b/rpc/tendermint/test/common.go
@@ -18,9 +18,9 @@ package test
import (
"fmt"
- vm "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- rpc_core "github.com/eris-ltd/eris-db/rpc/tendermint/core"
- "github.com/eris-ltd/eris-db/test/fixtures"
+ vm "github.com/monax/eris-db/manager/eris-mint/evm"
+ rpc_core "github.com/monax/eris-db/rpc/tendermint/core"
+ "github.com/monax/eris-db/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 d53ff9d713ffcee49a4646c7d303fd55a42a51ec..516a0d7c9a84fe47c012c632fe16badd4af76f1f 100644
--- a/rpc/tendermint/test/rpc_client_test.go
+++ b/rpc/tendermint/test/rpc_client_test.go
@@ -24,10 +24,10 @@ import (
"testing"
"time"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- edbcli "github.com/eris-ltd/eris-db/rpc/tendermint/client"
- "github.com/eris-ltd/eris-db/txs"
- "github.com/eris-ltd/eris-db/word256"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ edbcli "github.com/monax/eris-db/rpc/tendermint/client"
+ "github.com/monax/eris-db/txs"
+ "github.com/monax/eris-db/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 a47649dad23f61cb7c4457c3499896984182014b..92dc3b2c110d65882a8533924e1f723ee10769a9 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/eris-ltd/eris-db/rpc/tendermint/test"
- "github.com/eris-ltd/eris-db/util"
+ rpctest "github.com/monax/eris-db/rpc/tendermint/test"
+ "github.com/monax/eris-db/util"
)
func main() {
diff --git a/rpc/tendermint/test/shared.go b/rpc/tendermint/test/shared.go
index 98044412e36986d6cbf302c75b1fc6b21e4d9c9c..8b3e97a0dfa5d276c45b3d8d3156aa4ec69ca865 100644
--- a/rpc/tendermint/test/shared.go
+++ b/rpc/tendermint/test/shared.go
@@ -21,19 +21,19 @@ import (
"strconv"
"testing"
- acm "github.com/eris-ltd/eris-db/account"
- "github.com/eris-ltd/eris-db/core"
- core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/logging/lifecycle"
- edbcli "github.com/eris-ltd/eris-db/rpc/tendermint/client"
- rpc_core "github.com/eris-ltd/eris-db/rpc/tendermint/core"
- rpc_types "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/server"
- "github.com/eris-ltd/eris-db/test/fixtures"
- "github.com/eris-ltd/eris-db/txs"
- "github.com/eris-ltd/eris-db/word256"
-
- genesis "github.com/eris-ltd/eris-db/genesis"
+ acm "github.com/monax/eris-db/account"
+ "github.com/monax/eris-db/core"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/logging/lifecycle"
+ edbcli "github.com/monax/eris-db/rpc/tendermint/client"
+ rpc_core "github.com/monax/eris-db/rpc/tendermint/core"
+ rpc_types "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/server"
+ "github.com/monax/eris-db/test/fixtures"
+ "github.com/monax/eris-db/txs"
+ "github.com/monax/eris-db/word256"
+
+ genesis "github.com/monax/eris-db/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 5f799041f652d2425611c474e78faff6970141ab..acc70e69513dca983d03f417069cba86b0aa0a1d 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/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
+ core_types "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/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 46408e5d42fd1e9ab3d9d27d7cc0bb5d0353a27c..1a66072fa0fe5e82c1d6a63e423b0596d09d73bb 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/eris-ltd/eris-db/rpc/tendermint/core/types"
- "github.com/eris-ltd/eris-db/txs"
+ ctypes "github.com/monax/eris-db/rpc/tendermint/core/types"
+ "github.com/monax/eris-db/txs"
tm_types "github.com/tendermint/tendermint/types"
- edbcli "github.com/eris-ltd/eris-db/rpc/tendermint/client"
+ edbcli "github.com/monax/eris-db/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 344c1c98f12977352419dcd1247659b0de59e4ec..e47ad8746e66484010a4ae0883c7a2d47125ac0f 100644
--- a/rpc/v0/codec.go
+++ b/rpc/v0/codec.go
@@ -20,7 +20,7 @@ import (
wire "github.com/tendermint/go-wire"
- rpc "github.com/eris-ltd/eris-db/rpc"
+ rpc "github.com/monax/eris-db/rpc"
)
// Codec that uses tendermints 'binary' package for JSON.
diff --git a/rpc/v0/json_service.go b/rpc/v0/json_service.go
index 77bc4ffaa32a8c6e6e6f38104ecf440494b5951e..2c2d684c8436cc2d549084ada9660d9e387f05ed 100644
--- a/rpc/v0/json_service.go
+++ b/rpc/v0/json_service.go
@@ -20,10 +20,10 @@ import (
"github.com/gin-gonic/gin"
- definitions "github.com/eris-ltd/eris-db/definitions"
- event "github.com/eris-ltd/eris-db/event"
- rpc "github.com/eris-ltd/eris-db/rpc"
- server "github.com/eris-ltd/eris-db/server"
+ definitions "github.com/monax/eris-db/definitions"
+ event "github.com/monax/eris-db/event"
+ rpc "github.com/monax/eris-db/rpc"
+ server "github.com/monax/eris-db/server"
)
// Server used to handle JSON-RPC 2.0 requests. Implements server.Server
diff --git a/rpc/v0/json_service_data_test.go b/rpc/v0/json_service_data_test.go
index 96be04138a4d5399650a4ae00570049754600b88..12f68b581bde3c69b8edf1d18f32d457a4e6973f 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/eris-ltd/eris-db/rpc"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/rpc"
+ "github.com/monax/eris-db/txs"
"github.com/stretchr/testify/assert"
)
diff --git a/rpc/v0/methods.go b/rpc/v0/methods.go
index 6a26848cc8f3a6cb38afe01b704a19d98f57c611..9592318a983bc31af0079c7b5b737480601f55e2 100644
--- a/rpc/v0/methods.go
+++ b/rpc/v0/methods.go
@@ -15,13 +15,13 @@
package rpc_v0
import (
- "github.com/eris-ltd/eris-db/blockchain"
- core_types "github.com/eris-ltd/eris-db/core/types"
- definitions "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/rpc"
- "github.com/eris-ltd/eris-db/rpc/v0/shared"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/blockchain"
+ core_types "github.com/monax/eris-db/core/types"
+ definitions "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/rpc"
+ "github.com/monax/eris-db/rpc/v0/shared"
+ "github.com/monax/eris-db/txs"
)
// TODO use the method name definition file.
diff --git a/rpc/v0/params.go b/rpc/v0/params.go
index e6f565557ea65247391e8532b282e3fbe80383d8..89d17090b9197f3f13ccde08d8c31b830eeae142 100644
--- a/rpc/v0/params.go
+++ b/rpc/v0/params.go
@@ -15,9 +15,9 @@
package rpc_v0
import (
- "github.com/eris-ltd/eris-db/account"
- event "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/txs"
+ "github.com/monax/eris-db/account"
+ event "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/txs"
)
type (
diff --git a/rpc/v0/restServer.go b/rpc/v0/restServer.go
index 18fb507ec3569df4699af3172eccf7c9d6910471..04d9994eae5541ffb36f1de308f1201783ee93b7 100644
--- a/rpc/v0/restServer.go
+++ b/rpc/v0/restServer.go
@@ -22,15 +22,15 @@ import (
"github.com/gin-gonic/gin"
- "github.com/eris-ltd/eris-db/blockchain"
- core_types "github.com/eris-ltd/eris-db/core/types"
- definitions "github.com/eris-ltd/eris-db/definitions"
- event "github.com/eris-ltd/eris-db/event"
- "github.com/eris-ltd/eris-db/rpc"
- "github.com/eris-ltd/eris-db/rpc/v0/shared"
- server "github.com/eris-ltd/eris-db/server"
- "github.com/eris-ltd/eris-db/txs"
- "github.com/eris-ltd/eris-db/util"
+ "github.com/monax/eris-db/blockchain"
+ core_types "github.com/monax/eris-db/core/types"
+ definitions "github.com/monax/eris-db/definitions"
+ event "github.com/monax/eris-db/event"
+ "github.com/monax/eris-db/rpc"
+ "github.com/monax/eris-db/rpc/v0/shared"
+ server "github.com/monax/eris-db/server"
+ "github.com/monax/eris-db/txs"
+ "github.com/monax/eris-db/util"
)
// Provides a REST-like web-api. Implements server.Server
diff --git a/rpc/v0/restServer_data_test.go b/rpc/v0/restServer_data_test.go
index 31fbaeb3b169dc78bbb76fe6700c4698843b2a4a..92b7b171141a4c7ea4bd4c53394235c2db59e996 100644
--- a/rpc/v0/restServer_data_test.go
+++ b/rpc/v0/restServer_data_test.go
@@ -15,13 +15,13 @@
package rpc_v0
import (
- account "github.com/eris-ltd/eris-db/account"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- core_types "github.com/eris-ltd/eris-db/core/types"
- event "github.com/eris-ltd/eris-db/event"
- genesis "github.com/eris-ltd/eris-db/genesis"
- "github.com/eris-ltd/eris-db/rpc/v0/shared"
- transaction "github.com/eris-ltd/eris-db/txs"
+ account "github.com/monax/eris-db/account"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ core_types "github.com/monax/eris-db/core/types"
+ event "github.com/monax/eris-db/event"
+ genesis "github.com/monax/eris-db/genesis"
+ "github.com/monax/eris-db/rpc/v0/shared"
+ transaction "github.com/monax/eris-db/txs"
mintTypes "github.com/tendermint/tendermint/types"
)
diff --git a/rpc/v0/restServer_pipe_test.go b/rpc/v0/restServer_pipe_test.go
index 6b084b9edb23b07c8976b912cbc25a426559caf6..e4bbeece7ea4e2dc1e5ca802cad7d0251d074864 100644
--- a/rpc/v0/restServer_pipe_test.go
+++ b/rpc/v0/restServer_pipe_test.go
@@ -17,17 +17,17 @@ package rpc_v0
import (
"fmt"
- account "github.com/eris-ltd/eris-db/account"
- core_types "github.com/eris-ltd/eris-db/core/types"
- definitions "github.com/eris-ltd/eris-db/definitions"
- event "github.com/eris-ltd/eris-db/event"
+ account "github.com/monax/eris-db/account"
+ core_types "github.com/monax/eris-db/core/types"
+ definitions "github.com/monax/eris-db/definitions"
+ event "github.com/monax/eris-db/event"
- blockchain_types "github.com/eris-ltd/eris-db/blockchain/types"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- manager_types "github.com/eris-ltd/eris-db/manager/types"
- "github.com/eris-ltd/eris-db/txs"
+ blockchain_types "github.com/monax/eris-db/blockchain/types"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ manager_types "github.com/monax/eris-db/manager/types"
+ "github.com/monax/eris-db/txs"
- "github.com/eris-ltd/eris-db/logging/loggers"
+ "github.com/monax/eris-db/logging/loggers"
abci_types "github.com/tendermint/abci/types"
"github.com/tendermint/go-crypto"
"github.com/tendermint/go-p2p"
diff --git a/rpc/v0/restServer_test.go b/rpc/v0/restServer_test.go
index 7cdf28039bd5fd11bd5d76201961710eb7867963..6519bcf469dd68de3f6c81b1e0f0d09efa041c23 100644
--- a/rpc/v0/restServer_test.go
+++ b/rpc/v0/restServer_test.go
@@ -23,17 +23,17 @@ import (
"runtime"
"testing"
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
+ consensus_types "github.com/monax/eris-db/consensus/types"
- account "github.com/eris-ltd/eris-db/account"
- core_types "github.com/eris-ltd/eris-db/core/types"
- event "github.com/eris-ltd/eris-db/event"
- rpc "github.com/eris-ltd/eris-db/rpc"
- server "github.com/eris-ltd/eris-db/server"
- "github.com/eris-ltd/eris-db/txs"
+ account "github.com/monax/eris-db/account"
+ core_types "github.com/monax/eris-db/core/types"
+ event "github.com/monax/eris-db/event"
+ rpc "github.com/monax/eris-db/rpc"
+ server "github.com/monax/eris-db/server"
+ "github.com/monax/eris-db/txs"
- "github.com/eris-ltd/eris-db/rpc/v0/shared"
"github.com/gin-gonic/gin"
+ "github.com/monax/eris-db/rpc/v0/shared"
"github.com/stretchr/testify/suite"
"github.com/tendermint/log15"
)
diff --git a/rpc/v0/shared/net.go b/rpc/v0/shared/net.go
index 5d1bc85dca44f2a16b709592430d728735bf754b..a5ef06ad2adac0451a2936c04c4d9b6a67a7408a 100644
--- a/rpc/v0/shared/net.go
+++ b/rpc/v0/shared/net.go
@@ -15,8 +15,8 @@
package shared
import (
- consensus_types "github.com/eris-ltd/eris-db/consensus/types"
- "github.com/eris-ltd/eris-db/definitions"
+ consensus_types "github.com/monax/eris-db/consensus/types"
+ "github.com/monax/eris-db/definitions"
)
// Net is part of the pipe for ErisMint and provides the implementation
diff --git a/rpc/v0/shared/pipes.go b/rpc/v0/shared/pipes.go
index 55a27b3fb493c2a3aad54bad996dc842c1073f7a..7775a51ec007c4234297278d021a2186f6df35ee 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/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/definitions"
+ core_types "github.com/monax/eris-db/core/types"
+ "github.com/monax/eris-db/definitions"
tendermint_types "github.com/tendermint/tendermint/types"
)
diff --git a/rpc/v0/wsService.go b/rpc/v0/wsService.go
index daea0d01b75844cf3d19aaba958ed8bff9cf6308..8eb80622c29b396e6ccd8aa9badd97ee7fd92d7f 100644
--- a/rpc/v0/wsService.go
+++ b/rpc/v0/wsService.go
@@ -18,11 +18,11 @@ import (
"encoding/json"
"fmt"
- definitions "github.com/eris-ltd/eris-db/definitions"
- "github.com/eris-ltd/eris-db/event"
- rpc "github.com/eris-ltd/eris-db/rpc"
- server "github.com/eris-ltd/eris-db/server"
- "github.com/eris-ltd/eris-db/txs"
+ definitions "github.com/monax/eris-db/definitions"
+ "github.com/monax/eris-db/event"
+ rpc "github.com/monax/eris-db/rpc"
+ server "github.com/monax/eris-db/server"
+ "github.com/monax/eris-db/txs"
)
// Used for ErisDb. Implements WebSocketService.
diff --git a/test/filters/filter_test.go b/test/filters/filter_test.go
index c27a1eb02c3fb267243bbcd3533057b78b379f82..fb6d06ff953aa31fea410e3cc2549a58f2010e8c 100644
--- a/test/filters/filter_test.go
+++ b/test/filters/filter_test.go
@@ -19,7 +19,7 @@ import (
"sync"
"testing"
- event "github.com/eris-ltd/eris-db/event"
+ event "github.com/monax/eris-db/event"
"github.com/stretchr/testify/suite"
)
diff --git a/test/server/scumbag.go b/test/server/scumbag.go
index 67751442e23b3b5ad948fb0b88ce33a8758ab9f3..4810ba2c88598fd761f44c2fb645ef66ffe1318e 100644
--- a/test/server/scumbag.go
+++ b/test/server/scumbag.go
@@ -19,9 +19,9 @@ import (
"os"
"runtime"
- rpc "github.com/eris-ltd/eris-db/rpc"
- "github.com/eris-ltd/eris-db/server"
"github.com/gin-gonic/gin"
+ rpc "github.com/monax/eris-db/rpc"
+ "github.com/monax/eris-db/server"
"github.com/tendermint/log15"
)
diff --git a/test/server/ws_burst_test.go b/test/server/ws_burst_test.go
index 55dd8e93975f923fbefc79d5e2a2eded08be37fd..2ee1e6c3ea164aedca537c62233301674efd5b54 100644
--- a/test/server/ws_burst_test.go
+++ b/test/server/ws_burst_test.go
@@ -18,8 +18,8 @@ import (
"testing"
"time"
- "github.com/eris-ltd/eris-db/client"
- "github.com/eris-ltd/eris-db/server"
+ "github.com/monax/eris-db/client"
+ "github.com/monax/eris-db/server"
"github.com/stretchr/testify/assert"
)
diff --git a/test/testdata/filters/testdata_filters.g_ b/test/testdata/filters/testdata_filters.g_
index fefc112eb2dc53dd94108d9e8db4cedeaca996e3..e6062a0519c0ccc61a6109b46517c37e66d46a79 100644
--- a/test/testdata/filters/testdata_filters.g_
+++ b/test/testdata/filters/testdata_filters.g_
@@ -1,9 +1,9 @@
package filters
import (
- core_types "github.com/eris-ltd/eris-db/core/types"
+ core_types "github.com/monax/eris-db/core/types"
- stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
+ stypes "github.com/monax/eris-db/manager/eris-mint/state/types"
"github.com/tendermint/tendermint/types"
)
diff --git a/test/testdata/helpers.go b/test/testdata/helpers.go
index 2dbbaed7bbd0c3a31c042b3928ede8c39df16bbb..360d8124248e6415cf4b17c7fa5153de89c12a18 100644
--- a/test/testdata/helpers.go
+++ b/test/testdata/helpers.go
@@ -19,10 +19,10 @@ import (
"os"
"path"
- "github.com/eris-ltd/eris-db/files"
- "github.com/eris-ltd/eris-db/server"
+ "github.com/monax/eris-db/files"
+ "github.com/monax/eris-db/server"
- stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
+ stypes "github.com/monax/eris-db/manager/eris-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 325542e9a71ca09d8ff0ebac7ca8b1af9dee762d..58835773e7b4f01c7ca21fb75b8dcbea4582d1ad 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/eris-ltd/$TARGET
+ REPO=$GOPATH/src/github.com/monax/$TARGET
fi
release_min=$(cat $REPO/version/version.go | tail -n 1 | cut -d \ -f 4 | tr -d '"')
diff --git a/tests/test_client.sh b/tests/test_client.sh
index 162a1a24d4cef93fe02a84ebf0ccdf1eee548cbe..0da999d88de8ffb361626f4707f1339b58b1060c 100755
--- a/tests/test_client.sh
+++ b/tests/test_client.sh
@@ -42,7 +42,7 @@
# Where are the Things?
name=eris-db
-base=github.com/eris-ltd/$name
+base=github.com/monax/$name
repo=`pwd`
if [ "$CIRCLE_BRANCH" ]
then
diff --git a/txs/events.go b/txs/events.go
index 9e15cd3c54b2a3a8c6c5b88dd701f0448da3a9d1..9beaaab20407dd68550523743028bd307fb27da3 100644
--- a/txs/events.go
+++ b/txs/events.go
@@ -18,7 +18,7 @@ import (
"fmt"
"time"
- . "github.com/eris-ltd/eris-db/word256"
+ . "github.com/monax/eris-db/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 41b80b085af1c280cc92eaeed2186508b217be69..4c6b1e38be2f5dcea3ca23e5bb43efb836c256fa 100644
--- a/txs/names.go
+++ b/txs/names.go
@@ -17,7 +17,7 @@ package txs
import (
"regexp"
- core_types "github.com/eris-ltd/eris-db/core/types"
+ core_types "github.com/monax/eris-db/core/types"
)
var (
diff --git a/txs/tx.go b/txs/tx.go
index 0a7430dc193b755eb43745d1484043e5c249bce7..b1e1e80e7d26a0c3ffcc9697314614558271e68e 100644
--- a/txs/tx.go
+++ b/txs/tx.go
@@ -22,8 +22,8 @@ import (
"golang.org/x/crypto/ripemd160"
- acm "github.com/eris-ltd/eris-db/account"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ acm "github.com/monax/eris-db/account"
+ ptypes "github.com/monax/eris-db/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 e4b0653dc9472d329b8bbf61646ba3e0eb260e03..11db5f6e42eba629f8615d80117f8214b2075636 100644
--- a/txs/tx_test.go
+++ b/txs/tx_test.go
@@ -17,8 +17,8 @@ package txs
import (
"testing"
- acm "github.com/eris-ltd/eris-db/account"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ acm "github.com/monax/eris-db/account"
+ ptypes "github.com/monax/eris-db/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 0c6466486c03339ff0b2afd94aed2da3cb5a1d56..bcccf05266f2a38f7cc68920a0f758600b92d33c 100644
--- a/txs/tx_utils.go
+++ b/txs/tx_utils.go
@@ -17,8 +17,8 @@ package txs
import (
"fmt"
- acm "github.com/eris-ltd/eris-db/account"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
+ acm "github.com/monax/eris-db/account"
+ ptypes "github.com/monax/eris-db/permission/types"
"github.com/tendermint/go-crypto"
)
diff --git a/util/hell/cmd/hell/main.go b/util/hell/cmd/hell/main.go
index 427105ba9a77e14ed02efe81e38d2b3f5d3b2739..90a739106214e671bae0a25fd187ce6ea3b74f26 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/eris-ltd/eris-db/util/hell"
+ "github.com/monax/eris-db/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 0b12ba3330329ec4b3c130d5d66b094f971893f8..7ae9ce01c4acd50b6724b450a1bd20be63625c26 100644
--- a/util/snatives/cmd/main.go
+++ b/util/snatives/cmd/main.go
@@ -17,8 +17,8 @@ package main
import (
"fmt"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
- "github.com/eris-ltd/eris-db/util/snatives/templates"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
+ "github.com/monax/eris-db/util/snatives/templates"
)
// Dump SNative contracts
diff --git a/util/snatives/templates/solidity_templates.go b/util/snatives/templates/solidity_templates.go
index eda2c55588632d71677aeadd5c9017bcf05c0bde..b1bc59f3e51f943d10ad91ffab7e34bc526e6429 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/eris-ltd/eris-db/manager/eris-mint/evm"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
)
const contractTemplateText = `/**
diff --git a/util/snatives/templates/solidity_templates_test.go b/util/snatives/templates/solidity_templates_test.go
index c839230ea3bceb141a2e23de0de865b03dd77bae..c7618f28d9e57724adc78ac8dbc569253ac0eeae 100644
--- a/util/snatives/templates/solidity_templates_test.go
+++ b/util/snatives/templates/solidity_templates_test.go
@@ -16,7 +16,7 @@ package templates
import (
"fmt"
- "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
+ "github.com/monax/eris-db/manager/eris-mint/evm"
"github.com/stretchr/testify/assert"
"testing"
)