diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-09-26 18:03:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 18:03:41 +0800 |
| commit | 0398468051068720688199442f53984b4071f4b2 (patch) | |
| tree | 198ed487f20ca1ede8ea8ce804aba2ec81593f13 | |
| parent | fb1a443ea8c527eebcb59bd8f8f52791ace6284b (diff) | |
| download | tangerine-consensus-0398468051068720688199442f53984b4071f4b2.tar.gz tangerine-consensus-0398468051068720688199442f53984b4071f4b2.tar.zst tangerine-consensus-0398468051068720688199442f53984b4071f4b2.zip | |
core: use dexon-foundation/dexon instead of ethereum/go-ethereum (#143)
| -rw-r--r-- | Gopkg.lock | 18 | ||||
| -rw-r--r-- | Gopkg.toml | 18 | ||||
| -rwxr-xr-x | bin/install_eth_dep.sh | 6 | ||||
| -rw-r--r-- | core/crypto/eth/eth.go | 2 | ||||
| -rw-r--r-- | core/crypto/utils.go | 2 |
5 files changed, 23 insertions, 23 deletions
@@ -3,19 +3,19 @@ [[projects]] branch = "dev" - digest = "1:5a9cebf2fc674675971f1ef67a67af7d682f04bd9ce46f19adaed3fb38b8c358" + digest = "1:e1b678344fe7ac9b92facf33893ca3ce4f8e62b00c798c9efdd7e2a2d7b488f8" name = "github.com/Spiderpowa/bls" packages = ["ffi/go/bls"] pruneopts = "UT" - revision = "95f2449c4fb0925fd9206d5b8d7efea118b33398" + revision = "32fbf283dfdcf1224c57fbf7cf9db5f290cda1d1" [[projects]] branch = "master" - digest = "1:2c00f064ba355903866cbfbf3f7f4c0fe64af6638cc7d1b8bdcf3181bc67f1d8" + digest = "1:c0decf632843204d2b8781de7b26e7038584e2dcccc7e2f401e88ae85b1df2b7" name = "github.com/btcsuite/btcd" packages = ["btcec"] pruneopts = "UT" - revision = "92494a5188cd5fb1056d55ce597f38d5db4e343d" + revision = "2a560b2036bee5e3679ec2133eb6520b2f195213" [[projects]] digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" @@ -26,8 +26,9 @@ version = "v1.1.1" [[projects]] - digest = "1:32282b2f1ea5689b7d684abc2f0c3839ddbcb99101f053456f50f33e45106cde" - name = "github.com/ethereum/go-ethereum" + branch = "dev" + digest = "1:2b010a52e574bc0f815d5fdf403a8b36384665ac0923c94a28b99f8537fbf9fe" + name = "github.com/dexon-foundation/dexon" packages = [ "common", "common/hexutil", @@ -38,8 +39,7 @@ "rlp", ] pruneopts = "UT" - revision = "89451f7c382ad2185987ee369f16416f89c28a7d" - version = "v1.8.15" + revision = "abe4e80a8b6cf9dee93652ea36cdc56065a39a0f" [[projects]] branch = "master" @@ -114,7 +114,7 @@ analyzer-version = 1 input-imports = [ "github.com/Spiderpowa/bls/ffi/go/bls", - "github.com/ethereum/go-ethereum/crypto", + "github.com/dexon-foundation/dexon/crypto", "github.com/naoina/toml", "github.com/stretchr/testify/suite", "github.com/syndtr/goleveldb/leveldb", @@ -1,6 +1,6 @@ # Gopkg.toml example # -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md # for detailed Gopkg.toml documentation. # # required = ["github.com/user/thing/cmd/thing"] @@ -26,6 +26,14 @@ [[constraint]] + branch = "dev" + name = "github.com/Spiderpowa/bls" + +[[constraint]] + branch = "dev" + name = "github.com/dexon-foundation/dexon" + +[[constraint]] name = "github.com/naoina/toml" version = "0.1.1" @@ -34,17 +42,9 @@ version = "1.2.2" [[constraint]] - name = "github.com/ethereum/go-ethereum" - version = "1.8.13" - -[[constraint]] branch = "master" name = "github.com/syndtr/goleveldb" -[[constraint]] - branch = "dev" - name = "github.com/Spiderpowa/bls" - [prune] go-tests = true unused-packages = true diff --git a/bin/install_eth_dep.sh b/bin/install_eth_dep.sh index 79ecd0e..2e1b5ff 100755 --- a/bin/install_eth_dep.sh +++ b/bin/install_eth_dep.sh @@ -4,11 +4,11 @@ if [ -e .dep/libsecp256k1 ]; then exit 0 fi -rm -rf vendor/github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1 +rm -rf vendor/github.com/dexon-foundation/dexon/crypto/secp256k1/libsecp256k1 if [ ! -d .dep/libsecp256k1 ]; then git init .dep/libsecp256k1 cd .dep/libsecp256k1 - git remote add origin https://github.com/ethereum/go-ethereum.git + git remote add origin https://github.com/dexon-foundation/dexon.git git config core.sparsecheckout true echo "crypto/secp256k1/libsecp256k1/*" >> .git/info/sparse-checkout cd ../../ @@ -17,4 +17,4 @@ cd .dep/libsecp256k1 git pull --depth=1 origin master cd ../../ cp -r .dep/libsecp256k1/crypto/secp256k1/libsecp256k1 \ - vendor/github.com/ethereum/go-ethereum/crypto/secp256k1 + vendor/github.com/dexon-foundation/dexon/crypto/secp256k1 diff --git a/core/crypto/eth/eth.go b/core/crypto/eth/eth.go index cbf2c7d..41d05eb 100644 --- a/core/crypto/eth/eth.go +++ b/core/crypto/eth/eth.go @@ -20,7 +20,7 @@ package eth import ( "crypto/ecdsa" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon-consensus-core/common" "github.com/dexon-foundation/dexon-consensus-core/core/crypto" diff --git a/core/crypto/utils.go b/core/crypto/utils.go index cb4decd..d56c28a 100644 --- a/core/crypto/utils.go +++ b/core/crypto/utils.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/crypto" + "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon-consensus-core/common" ) |