Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
d1d86e83
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d1d86e83
编写于
9月 17, 2018
作者:
M
Matt Witherspoon
提交者:
GitHub
9月 17, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5478 from EOSIO/secp256k1_as_external
Build secp256k1 as a submodule
上级
49d3596d
9f16ed39
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
4 addition
and
299 deletion
+4
-299
CMakeLists.txt
CMakeLists.txt
+0
-2
CMakeModules/EosioTester.cmake.in
CMakeModules/EosioTester.cmake.in
+0
-1
CMakeModules/EosioTesterBuild.cmake.in
CMakeModules/EosioTesterBuild.cmake.in
+0
-1
Docker/Dockerfile
Docker/Dockerfile
+1
-1
Docker/builder/Dockerfile
Docker/builder/Dockerfile
+0
-7
Docker/dev/Dockerfile
Docker/dev/Dockerfile
+1
-1
eosio_build.sh
eosio_build.sh
+1
-1
libraries/fc
libraries/fc
+1
-1
scripts/eosio_build_amazon.sh
scripts/eosio_build_amazon.sh
+0
-57
scripts/eosio_build_centos.sh
scripts/eosio_build_centos.sh
+0
-57
scripts/eosio_build_darwin.sh
scripts/eosio_build_darwin.sh
+0
-56
scripts/eosio_build_fedora.sh
scripts/eosio_build_fedora.sh
+0
-57
scripts/eosio_build_ubuntu.sh
scripts/eosio_build_ubuntu.sh
+0
-57
未找到文件。
CMakeLists.txt
浏览文件 @
d1d86e83
...
...
@@ -74,8 +74,6 @@ if ("${OPENSSL_ROOT_DIR}" STREQUAL "")
endif
()
endif
()
find_package
(
Secp256k1 REQUIRED
)
if
(
UNIX
)
if
(
APPLE
)
set
(
whole_archive_flag
"-force_load"
)
...
...
CMakeModules/EosioTester.cmake.in
浏览文件 @
d1d86e83
...
...
@@ -59,7 +59,6 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
find_library(libchainbase chainbase @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libbuiltins builtins @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libsecp256k1 secp256k1 @Secp256k1_ROOT_DIR@/lib)
macro(add_eosio_test test_name)
add_executable( ${test_name} ${ARGN} )
...
...
CMakeModules/EosioTesterBuild.cmake.in
浏览文件 @
d1d86e83
...
...
@@ -59,7 +59,6 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase)
find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins)
find_library(libsecp256k1 secp256k1 @Secp256k1_ROOT_DIR@/lib)
macro(add_eosio_test test_name)
add_executable( ${test_name} ${ARGN} )
...
...
Docker/Dockerfile
浏览文件 @
d1d86e83
...
...
@@ -5,7 +5,7 @@ ARG symbol=SYS
RUN
git clone
-b
$branch
https://github.com/EOSIO/eos.git
--recursive
\
&&
cd
eos
&&
echo
"
$branch
:
$(
git rev-parse HEAD
)
"
>
/etc/eosio-version
\
&&
cmake
-H
.
-B
"/tmp/build"
-GNinja
-DCMAKE_BUILD_TYPE
=
Release
-DWASM_ROOT
=
/opt/wasm
-DCMAKE_CXX_COMPILER
=
clang++
\
-DCMAKE_C_COMPILER
=
clang
-DCMAKE_INSTALL_PREFIX
=
/tmp/build
-DSecp256k1_ROOT_DIR
=
/usr/local
-DBUILD_MONGO_DB_PLUGIN
=
true
-DCORE_SYMBOL_NAME
=
$symbol
\
-DCMAKE_C_COMPILER
=
clang
-DCMAKE_INSTALL_PREFIX
=
/tmp/build
-DBUILD_MONGO_DB_PLUGIN
=
true
-DCORE_SYMBOL_NAME
=
$symbol
\
&&
cmake
--build
/tmp/build
--target
install
&&
rm
/tmp/build/bin/eosiocpp
...
...
Docker/builder/Dockerfile
浏览文件 @
d1d86e83
...
...
@@ -56,13 +56,6 @@ RUN wget https://github.com/WebAssembly/binaryen/archive/1.37.21.tar.gz -O - | t
&&
cmake
--build
build
--target
install
\
&&
cd
..
&&
rm
-rf
binaryen-1.37.21
RUN
git clone
--depth
1 https://github.com/cryptonomex/secp256k1-zkp
\
&&
cd
secp256k1-zkp
\
&&
./autogen.sh
\
&&
./configure
--prefix
=
/usr/local
\
&&
make
-j
$(
nproc
)
install
\
&&
cd
..
&&
rm
-rf
secp256k1-zkp
RUN
git clone
--depth
1
-b
releases/v3.3 https://github.com/mongodb/mongo-cxx-driver
\
&&
cd
mongo-cxx-driver/build
\
&&
cmake
-DBUILD_SHARED_LIBS
=
OFF
-DCMAKE_BUILD_TYPE
=
Release
-DCMAKE_INSTALL_PREFIX
=
/usr/local ..
\
...
...
Docker/dev/Dockerfile
浏览文件 @
d1d86e83
...
...
@@ -5,7 +5,7 @@ ARG symbol=SYS
RUN
git clone
-b
$branch
https://github.com/EOSIO/eos.git
--recursive
\
&&
cd
eos
&&
echo
"
$branch
:
$(
git rev-parse HEAD
)
"
>
/etc/eosio-version
\
&&
cmake
-H
.
-B
"/opt/eosio"
-GNinja
-DCMAKE_BUILD_TYPE
=
Release
-DWASM_ROOT
=
/opt/wasm
-DCMAKE_CXX_COMPILER
=
clang++
\
-DCMAKE_C_COMPILER
=
clang
-DCMAKE_INSTALL_PREFIX
=
/opt/eosio
-DSecp256k1_ROOT_DIR
=
/usr/local
-DBUILD_MONGO_DB_PLUGIN
=
true
-DCORE_SYMBOL_NAME
=
$symbol
\
-DCMAKE_C_COMPILER
=
clang
-DCMAKE_INSTALL_PREFIX
=
/opt/eosio
-DBUILD_MONGO_DB_PLUGIN
=
true
-DCORE_SYMBOL_NAME
=
$symbol
\
&&
cmake
--build
/opt/eosio
--target
install
\
&&
cp
/eos/Docker/config.ini /
&&
ln
-s
/opt/eosio/contracts /contracts
&&
cp
/eos/Docker/nodeosd.sh /opt/eosio/bin/nodeosd.sh
&&
ln
-s
/eos/tutorials /tutorials
...
...
eosio_build.sh
浏览文件 @
d1d86e83
...
...
@@ -120,7 +120,7 @@
pushd
"
${
SOURCE_DIR
}
"
&> /dev/null
STALE_SUBMODS
=
$((
$(
git submodule status |
grep
-c
"^[+
\-
]"
)
))
STALE_SUBMODS
=
$((
$(
git submodule status
--recursive
|
grep
-c
"^[+
\-
]"
)
))
if
[
$STALE_SUBMODS
-gt
0
]
;
then
printf
"
\\
n
\\
tgit submodules are not up to date.
\\
n"
printf
"
\\
tPlease run the command 'git submodule update --init --recursive'.
\\
n"
...
...
fc
@
8edb92dd
比较
347f86ff
...
8edb92dd
Subproject commit
347f86ff17013f5010f5ad8142ad99c9bd0cd87a
Subproject commit
8edb92dd2310108b8eb66d010b84ca4fc9dce898
scripts/eosio_build_amazon.sh
浏览文件 @
d1d86e83
...
...
@@ -528,63 +528,6 @@ fi
printf
"
\\
tMongo C++ driver found at /usr/local/lib64/libmongocxx-static.a.
\\
n"
fi
printf
"
\\
n
\\
tChecking secp256k1-zkp installation.
\\
n"
# install secp256k1-zkp (Cryptonomex branch)
if
[
!
-e
"/usr/local/lib/libsecp256k1.a"
]
;
then
printf
"
\\
tInstalling secp256k1-zkp (Cryptonomex branch).
\\
n"
if
!
cd
"
${
TEMP_DIR
}
"
then
printf
"
\\
n
\\
tUnable to enter directory %s.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
git clone https://github.com/cryptonomex/secp256k1-zkp.git
then
printf
"
\\
tUnable to clone repo secp256k1-zkp @ https://github.com/cryptonomex/secp256k1-zkp.git.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
cd
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
n
\\
tUnable to cd into directory %s/secp256k1-zkp.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
./autogen.sh
then
printf
"
\\
tError running autogen for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
./configure
then
printf
"
\\
tError running configure for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
make
-j
"
${
JOBS
}
"
then
printf
"
\\
tError compiling secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
sudo
make
install
then
printf
"
\\
tError installing secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
rm
-rf
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
tError removing directory %s/secp256k1-zkp.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
printf
"
\\
tsecp256k1 successfully installed @ /usr/local/lib/libsecp256k1.a.
\\
n"
else
printf
"
\\
tsecp256k1 found @ /usr/local/lib/libsecp256k1.a.
\\
n"
fi
printf
"
\\
n
\\
tChecking LLVM with WASM support.
\\
n"
if
[
!
-d
"
${
HOME
}
/opt/wasm/bin"
]
;
then
printf
"
\\
tInstalling LLVM & WASM.
\\
n"
...
...
scripts/eosio_build_centos.sh
浏览文件 @
d1d86e83
...
...
@@ -618,63 +618,6 @@ mongodconf
printf
"
\\
tMongo C++ driver found at /usr/local/lib64/libmongocxx-static.a.
\\
n"
fi
printf
"
\\
n
\\
tChecking secp256k1-zkp installation.
\\
n"
# install secp256k1-zkp (Cryptonomex branch)
if
[
!
-e
"/usr/local/lib/libsecp256k1.a"
]
;
then
printf
"
\\
tInstalling secp256k1-zkp (Cryptonomex branch).
\\
n"
if
!
cd
"
${
TEMP_DIR
}
"
then
printf
"
\\
n
\\
tUnable to enter directory %s.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
git clone https://github.com/cryptonomex/secp256k1-zkp.git
then
printf
"
\\
tUnable to clone repo secp256k1-zkp @ https://github.com/cryptonomex/secp256k1-zkp.git.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
cd
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
n
\\
tUnable to cd into directory %s/secp256k1-zkp.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
./autogen.sh
then
printf
"
\\
tError running autogen for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
./configure
then
printf
"
\\
tError running configure for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
make
-j
"
${
JOBS
}
"
then
printf
"
\\
tError compiling secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
sudo
make
install
then
printf
"
\\
tError installing secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
rm
-rf
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
tError removing directory %s/secp256k1-zkp.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
printf
"
\\
n
\\
tsecp256k1 successfully installed @ /usr/local/lib.
\\
n
\\
n"
else
printf
"
\\
tsecp256k1 found @ /usr/local/lib.
\\
n"
fi
printf
"
\\
n
\\
tChecking LLVM with WASM support installation.
\\
n"
if
[
!
-d
"
${
HOME
}
/opt/wasm/bin"
]
;
then
printf
"
\\
n
\\
tInstalling LLVM with WASM
\\
n"
...
...
scripts/eosio_build_darwin.sh
浏览文件 @
d1d86e83
...
...
@@ -396,62 +396,6 @@
printf
"
\\
tMongo C++ driver found at /usr/local/lib/libmongocxx-static.a.
\\
n"
fi
printf
"
\\
n
\\
tChecking secp256k1-zkp installation.
\\
n"
# install secp256k1-zkp (Cryptonomex branch)
if
[
!
-e
"/usr/local/lib/libsecp256k1.a"
]
;
then
if
!
cd
"
${
TEMP_DIR
}
"
then
printf
"
\\
tUnable to enter directory %s.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
git clone https://github.com/cryptonomex/secp256k1-zkp.git
then
printf
"
\\
tUnable to clone repo secp256k1-zkp @ https://github.com/cryptonomex/secp256k1-zkp.git.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
cd
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
tUnable to enter directory %s/secp256k1-zkp.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
./autogen.sh
then
printf
"
\\
tError running autogen.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
./configure
then
printf
"
\\
tConfiguring secp256k1-zkp has returned the above error.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
make
-j
"
${
CPU_CORE
}
"
then
printf
"
\\
tError compiling secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
sudo
make
install
then
printf
"
\\
tInstalling secp256k1-zkp has returned the above error.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
rm
-rf
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
tUnable to remove directory %s/secp256k1-zkp56k1-zkp.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
printf
"
\\
n
\\
n
\\
tSuccessffully installed secp256k1 @ /usr/local/lib/.
\\
n
\\
n"
else
printf
"
\\
tsecp256k1 found at /usr/local/lib/.
\\
n"
fi
printf
"
\\
n
\\
tChecking LLVM with WASM support.
\\
n"
if
[
!
-d
/usr/local/wasm/bin
]
;
then
if
!
cd
"
${
TEMP_DIR
}
"
...
...
scripts/eosio_build_fedora.sh
浏览文件 @
d1d86e83
...
...
@@ -393,63 +393,6 @@
printf
"
\\
tMongo C++ driver found at /usr/local/lib64/libmongocxx-static.a.
\\
n"
fi
printf
"
\\
n
\\
tChecking secp256k1-zkp installation.
\\
n"
# install secp256k1-zkp (Cryptonomex branch)
if
[
!
-e
"/usr/local/lib/libsecp256k1.a"
]
;
then
printf
"
\\
tInstalling secp256k1-zkp (Cryptonomex branch).
\\
n"
if
!
cd
"
${
TEMP_DIR
}
"
then
printf
"
\\
n
\\
tUnable to cd into directory %s.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
git clone https://github.com/cryptonomex/secp256k1-zkp.git
then
printf
"
\\
tUnable to clone repo secp256k1-zkp @ https://github.com/cryptonomex/secp256k1-zkp.git.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
cd
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
n
\\
tUnable to cd into directory %s.
\\
n"
"
${
TEMP_DIR
}
/secp256k1-zkp"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
./autogen.sh
then
printf
"
\\
tError running autogen for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
./configure
then
printf
"
\\
tError running configure for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
make
-j
"
${
JOBS
}
"
then
printf
"
\\
tError compiling secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
sudo
make
install
then
printf
"
\\
tError installing secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
rm
-rf
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
tError removing directory %s.
\\
n"
"
${
TEMP_DIR
}
/secp256k1-zkp"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
printf
"
\\
n
\\
tsecp256k1 successfully installed @ /usr/local/lib.
\\
n
\\
n"
else
printf
"
\\
tsecp256k1 found @ /usr/local/lib.
\\
n"
fi
printf
"
\\
n
\\
tChecking LLVM with WASM support installation.
\\
n"
if
[
!
-d
"
${
HOME
}
/opt/wasm/bin"
]
;
then
printf
"
\\
tInstalling LLVM & WASM
\\
n"
...
...
scripts/eosio_build_ubuntu.sh
浏览文件 @
d1d86e83
...
...
@@ -421,63 +421,6 @@ mongodconf
printf
"
\\
tMongo C++ driver found at /usr/local/lib/libmongocxx-static.a.
\\
n"
fi
printf
"
\\
n
\\
tChecking secp256k1-zkp installation.
\\
n"
# install secp256k1-zkp (Cryptonomex branch)
if
[
!
-e
"/usr/local/lib/libsecp256k1.a"
]
;
then
printf
"
\\
tInstalling secp256k1-zkp (Cryptonomex branch).
\\
n"
if
!
cd
"
${
TEMP_DIR
}
"
then
printf
"
\\
n
\\
tUnable to cd into directory %s.
\\
n"
"
${
TEMP_DIR
}
"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
git clone https://github.com/cryptonomex/secp256k1-zkp.git
then
printf
"
\\
tUnable to clone repo secp256k1-zkp @ https://github.com/cryptonomex/secp256k1-zkp.git.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
cd
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
n
\\
tUnable to cd into directory %s.
\\
n"
"
${
TEMP_DIR
}
/secp256k1-zkp"
printf
"
\\
n
\\
tExiting now.
\\
n"
exit
1
;
fi
if
!
./autogen.sh
then
printf
"
\\
tError running autogen for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
./configure
then
printf
"
\\
tError running configure for secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
make
-j
"
${
JOBS
}
"
then
printf
"
\\
tError compiling secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
sudo
make
install
then
printf
"
\\
tError installing secp256k1-zkp.
\\
n"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
if
!
rm
-rf
"
${
TEMP_DIR
}
/secp256k1-zkp"
then
printf
"
\\
tError removing directory %s.
\\
n"
"
${
TEMP_DIR
}
/secp256k1-zkp"
printf
"
\\
tExiting now.
\\
n
\\
n"
exit
1
;
fi
printf
"
\\
n
\\
tsecp256k1 successfully installed @ /usr/local/lib.
\\
n
\\
n"
else
printf
"
\\
tsecp256k1 found @ /usr/local/lib.
\\
n"
fi
printf
"
\\
n
\\
tChecking for LLVM with WASM support.
\\
n"
if
[
!
-d
"
${
HOME
}
/opt/wasm/bin"
]
;
then
# Build LLVM and clang with WASM support:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录