diff --git a/Dockerfile b/Dockerfile index 5337d52efb..8d945d7bbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN if [ "$SKIP_DEP" != true ] ; \ RUN mkdir -p $GOPATH/src/github.com/CoderZhi/go-ethereum/ && \ mkdir -p $GOPATH/pkg/linux_amd64/github.com/CoderZhi/ && \ + rm -rf $GOPATH/src/github.com/iotexproject/iotex-core/vendor/github.com/CoderZhi/go-ethereum/ && \ cd $GOPATH/src/github.com/iotexproject/iotex-core/pkg/ && \ tar -xzvf go-ethereum.tar.gz && \ cp -r $GOPATH/src/github.com/iotexproject/iotex-core/pkg/go-ethereum/binary_linux/* $GOPATH/pkg/linux_amd64/github.com/CoderZhi/ && \ diff --git a/Gopkg.lock b/Gopkg.lock index 27120ef915..44430ba6ba 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -19,7 +19,7 @@ "params", "rlp" ] - revision = "8e9fa1565edf4f550673ed900e803c774a85ed43" + revision = "704ebf0899c0bc8185cd2b7d933845a18f922cda" [[projects]] name = "github.com/boltdb/bolt" @@ -28,9 +28,10 @@ version = "v1.3.1" [[projects]] + branch = "master" name = "github.com/btcsuite/btcd" packages = ["btcec"] - revision = "2e60448ffcc6bf78332d1fe590260095f554dd78" + revision = "79e00513b1011888b1e675157ab89f527f901cae" [[projects]] branch = "master" @@ -41,8 +42,8 @@ [[projects]] name = "github.com/davecgh/go-spew" packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" + revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" + version = "v1.1.1" [[projects]] branch = "master" @@ -66,8 +67,8 @@ "ptypes/duration", "ptypes/timestamp" ] - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" + revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" + version = "v1.2.0" [[projects]] name = "github.com/inconshreveable/mousetrap" @@ -126,8 +127,8 @@ [[projects]] name = "go.uber.org/atomic" packages = ["."] - revision = "3b8db5e93c4c02efbc313e17b2e796b0914a01fb" - version = "v1.1.0" + revision = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289" + version = "v1.3.2" [[projects]] name = "go.uber.org/config" @@ -152,7 +153,7 @@ "blake2b", "ripemd160" ] - revision = "de0752318171da717af4ce24d0a2e8626afaeb11" + revision = "614d502a4dac94afa3a6ce146bd1736da82514c6" [[projects]] branch = "master" @@ -166,7 +167,7 @@ "internal/timeseries", "trace" ] - revision = "f9ce57c11b242f0f1599cf25c89d8cb02c45295a" + revision = "8a410e7b638dca158bf9e766925842f6651ff828" [[projects]] branch = "master" @@ -181,7 +182,7 @@ "cpu", "unix" ] - revision = "904bdc257025c7b3f43c19360ad3ab85783fad78" + revision = "d99a578cf41bfccdeaf48b0845c823a4b8b0ad5e" [[projects]] name = "golang.org/x/text" @@ -208,7 +209,7 @@ branch = "master" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] - revision = "383e8b2c3b9e36c4076b235b32537292176bae20" + revision = "c66870c02cf823ceb633bcd05be3c7cda29976f4" [[projects]] name = "google.golang.org/grpc" diff --git a/Gopkg.toml b/Gopkg.toml index 0a3ec8a7b6..d2dd403385 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,3 +1,7 @@ +[[constraint]] + branch = "master" + name = "github.com/CoderZhi/go-ethereum" + [[constraint]] name = "github.com/boltdb/bolt" version = "^1.3.1"