aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Hu <jimmy.hu@dexon.org>2019-04-18 19:00:14 +0800
committerJimmy Hu <jimmy.hu@dexon.org>2019-04-18 19:00:14 +0800
commit7ba4eb6eb78ec3ca431b216603987aaa8ce7df48 (patch)
treef55121ea2cc68469a7f8dcc6123ec6051c9733f5
parentccba7be9105c01eba0617e5ec0a791436200a132 (diff)
downloaddexon-consensus-7ba4eb6eb78ec3ca431b216603987aaa8ce7df48.tar
dexon-consensus-7ba4eb6eb78ec3ca431b216603987aaa8ce7df48.tar.gz
dexon-consensus-7ba4eb6eb78ec3ca431b216603987aaa8ce7df48.tar.bz2
dexon-consensus-7ba4eb6eb78ec3ca431b216603987aaa8ce7df48.tar.lz
dexon-consensus-7ba4eb6eb78ec3ca431b216603987aaa8ce7df48.tar.xz
dexon-consensus-7ba4eb6eb78ec3ca431b216603987aaa8ce7df48.tar.zst
dexon-consensus-7ba4eb6eb78ec3ca431b216603987aaa8ce7df48.zip
misc: fix dep
-rw-r--r--Gopkg.lock23
-rw-r--r--Gopkg.toml2
-rwxr-xr-xbin/install_eth_dep.sh6
3 files changed, 19 insertions, 12 deletions
diff --git a/Gopkg.lock b/Gopkg.lock
index 602b10b..56b7d8d 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -26,20 +26,27 @@
revision = "b0a83abe7389df7f4c45adc3b52d957f3996322d"
[[projects]]
- branch = "dev"
- digest = "1:8fc72b5a0372267ae68d203aef3e1108eb7274050c7ded516ea1af71a8a09b77"
+ branch = "master"
+ digest = "1:e42fe948f1217b0c47b482f08e99ebcb66d5eaf02a1048128708a0156edea8f5"
name = "github.com/dexon-foundation/dexon"
packages = [
"common",
"common/hexutil",
"common/math",
"crypto",
- "crypto/secp256k1",
"log",
"rlp",
]
pruneopts = "UT"
- revision = "f1ed7d074fe1d574a84c308c6ad878dc2d153654"
+ revision = "31d2950d993b00d743fb61c887752d25adfd6703"
+
+[[projects]]
+ digest = "1:fed20bf7f0da387c96d4cfc140a95572e5aba4bb984beb7de910e090ae39849b"
+ name = "github.com/ethereum/go-ethereum"
+ packages = ["crypto/secp256k1"]
+ pruneopts = "UT"
+ revision = "4bcc0a37ab70cb79b16893556cffdaad6974e7d8"
+ version = "v1.8.27"
[[projects]]
digest = "1:586ea76dbd0374d6fb649a91d70d652b7fe0ccffb8910a77468e7702e7901f3d"
@@ -130,22 +137,22 @@
[[projects]]
branch = "master"
- digest = "1:d193d0292355f8fada46cf77967d64df52ce6e0a757f81a3a1b2626ac77d649d"
+ digest = "1:1e44db5e6902b7d1b1d24eac5753ecf43ff6f54e847353470eb539dbf9d3768e"
name = "golang.org/x/crypto"
packages = ["sha3"]
pruneopts = "UT"
- revision = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"
+ revision = "f416ebab96af27ca70b6e5c23d6a0747530da626"
[[projects]]
branch = "master"
- digest = "1:13917c3d8b9b6c14a941d66af59444b7ce53a859a8b86e24891a713186f42c65"
+ digest = "1:38aa494d309ed1454312b7c19f869ce99edcc5a4ee61f599090a8d15b6c2d4e6"
name = "golang.org/x/sys"
packages = [
"cpu",
"unix",
]
pruneopts = "UT"
- revision = "0ad05ae3009d6413d3363aa09b350b2ec37daf09"
+ revision = "12500544f89f9420afe9529ba8940bf72d294972"
[solve-meta]
analyzer-name = "dep"
diff --git a/Gopkg.toml b/Gopkg.toml
index 0ad7fbb..0e46d5f 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -30,7 +30,7 @@
name = "github.com/dexon-foundation/bls"
[[constraint]]
- branch = "dev"
+ branch = "master"
name = "github.com/dexon-foundation/dexon"
[[constraint]]
diff --git a/bin/install_eth_dep.sh b/bin/install_eth_dep.sh
index 2e1b5ff..79ecd0e 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/dexon-foundation/dexon/crypto/secp256k1/libsecp256k1
+rm -rf vendor/github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1
if [ ! -d .dep/libsecp256k1 ]; then
git init .dep/libsecp256k1
cd .dep/libsecp256k1
- git remote add origin https://github.com/dexon-foundation/dexon.git
+ git remote add origin https://github.com/ethereum/go-ethereum.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/dexon-foundation/dexon/crypto/secp256k1
+ vendor/github.com/ethereum/go-ethereum/crypto/secp256k1